From 7d0642f9708586f0e6af042240e503642678ea2b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 26 Feb 2025 10:40:58 +0800
Subject: [PATCH] init

---
 src/api/accounts_receivable.ts                |  28 -
 src/api/activity_zone.ts                      |  31 -
 src/api/activity_zone_form.ts                 |  31 -
 src/api/beforehand_order.ts                   | 131 ---
 src/api/beforehand_order_cart_info.ts         |  75 --
 src/api/change_log.ts                         |  26 -
 src/api/delivery_service.ts                   |  26 -
 src/api/financial_transfers.ts                |  15 -
 src/api/inventory_store.ts                    |  30 -
 src/api/inventory_transfer.ts                 |  26 -
 src/api/inventory_transfer_order.ts           |  26 -
 src/api/inventory_warehouse.ts                |  29 -
 src/api/label.ts                              |  26 -
 src/api/public.ts                             |  22 -
 src/api/purchase_order.ts                     |  37 -
 src/api/purchase_order_info.ts                |  26 -
 src/api/purchase_product_offer.ts             |  65 --
 src/api/store_branch_product.ts               |  37 -
 src/api/store_branch_product_attr_value.ts    |  48 --
 src/api/store_cash_finance_flow.ts            |  26 -
 src/api/store_category.ts                     |  26 -
 src/api/store_extract.ts                      |  31 -
 src/api/store_finance_bill.ts                 |  16 -
 src/api/store_finance_flow.ts                 |  30 -
 src/api/store_order.ts                        |  94 --
 src/api/store_product.ts                      |  39 -
 src/api/store_product_attr_value.ts           |  26 -
 src/api/store_product_group_price.ts          |  26 -
 src/api/store_product_low_stock.ts            |  26 -
 src/api/store_product_price.ts                |  34 -
 src/api/store_product_price_list.ts           |  26 -
 src/api/store_product_unit.ts                 |  26 -
 src/api/supplier.ts                           |  26 -
 src/api/system_store.ts                       |  66 --
 src/api/system_store_storage.ts               |  35 -
 src/api/user_bill.ts                          |  26 -
 src/api/user_label.ts                         |  26 -
 src/api/user_product_storage.ts               |  26 -
 src/api/user_product_storage_log.ts           |  26 -
 src/api/user_recharge.ts                      |  31 -
 src/api/user_ship.ts                          |  26 -
 src/api/warehouse.ts                          |  26 -
 src/api/warehouse_order.ts                    |  46 -
 src/api/warehouse_product.ts                  |  43 -
 src/api/warehouse_product_return.ts           |  26 -
 src/api/warehouse_product_storege.ts          |  41 -
 src/api/wechat_query.ts                       |   6 -
 src/api/workbench.ts                          |  57 --
 .../activity_zone/component/productPop.vue    |  80 --
 src/views/activity_zone/details.vue           | 111 ---
 src/views/activity_zone/edit.vue              | 164 ----
 src/views/activity_zone/index.vue             | 142 ---
 src/views/change_log/details.vue              | 110 ---
 src/views/change_log/edit.vue                 | 132 ---
 src/views/change_log/index.vue                | 149 ----
 src/views/delivery_service/details.vue        | 103 ---
 src/views/delivery_service/edit.vue           | 139 ---
 src/views/delivery_service/index.vue          | 154 ----
 src/views/entryRecord/index.vue               |  95 --
 src/views/finance/commission/index.vue        | 232 -----
 src/views/finance/receivable/details.vue      |  91 --
 src/views/finance/receivable/edit.vue         | 130 ---
 src/views/finance/receivable/index.vue        | 208 -----
 .../store_cash_finance_flow/details.vue       |  95 --
 .../finance/store_cash_finance_flow/edit.vue  | 130 ---
 .../finance/store_cash_finance_flow/index.vue | 253 ------
 src/views/finance/store_extract/details.vue   |  81 --
 src/views/finance/store_extract/edit.vue      | 103 ---
 src/views/finance/store_extract/index.vue     | 171 ----
 .../components/billTable.vue                  | 146 ----
 .../finance/store_finance_bill/details.vue    |  81 --
 src/views/finance/store_finance_bill/edit.vue | 103 ---
 .../finance/store_finance_bill/index.vue      | 112 ---
 .../finance/store_finance_flow/details.vue    |  88 --
 src/views/finance/store_finance_flow/edit.vue | 103 ---
 .../finance/store_finance_flow/index.vue      | 246 ------
 src/views/finance/user_bill/details.vue       |  81 --
 src/views/finance/user_bill/edit.vue          | 103 ---
 src/views/finance/user_bill/index.vue         | 136 ---
 src/views/finance/user_recharge/details.vue   |  81 --
 src/views/finance/user_recharge/edit.vue      | 103 ---
 src/views/finance/user_recharge/index.vue     | 187 ----
 src/views/fnancial_transfers/index.vue        | 164 ----
 src/views/inventory_store/details.vue         |  81 --
 src/views/inventory_store/edit.vue            | 141 ---
 src/views/inventory_store/index.vue           | 271 ------
 src/views/inventory_transfer/details.vue      | 107 ---
 src/views/inventory_transfer/edit.vue         | 277 ------
 src/views/inventory_transfer/index.vue        | 129 ---
 src/views/inventory_transfer/warehousing.vue  | 245 ------
 .../components/orderInfo.vue                  |  59 --
 .../inventory_transfer_order/details.vue      |  67 --
 src/views/inventory_transfer_order/edit.vue   | 335 --------
 src/views/inventory_transfer_order/index.vue  | 147 ----
 src/views/inventory_warehouse/details.vue     |  81 --
 src/views/inventory_warehouse/edit.vue        |  99 ---
 src/views/inventory_warehouse/index.vue       | 178 ----
 src/views/label/edit.vue                      | 109 ---
 src/views/label/index.vue                     | 131 ---
 src/views/order/beforehand_order/add.vue      | 808 ------------------
 .../beforehand_order/component/copyPop.vue    |  77 --
 .../beforehand_order/component/damage.vue     | 170 ----
 .../beforehand_order/component/drawer.vue     | 151 ----
 .../component/editProduct.vue                 | 141 ---
 .../beforehand_order/component/goodsOffer.vue | 547 ------------
 .../component/orderCartInfo.vue               | 370 --------
 .../beforehand_order/component/outbound.vue   | 315 -------
 .../component/returnSupplier.vue              |  56 --
 .../component/returnWarehouse.vue             | 125 ---
 .../component/warehousing.vue                 | 114 ---
 src/views/order/beforehand_order/details.vue  | 680 ---------------
 src/views/order/beforehand_order/edit.vue     | 264 ------
 src/views/order/beforehand_order/index.vue    | 492 -----------
 .../template-files/template1.js               | 641 --------------
 .../beforehand_order_cart_info/index.vue      | 134 ---
 .../purchase_order/component/details.vue      | 227 -----
 .../purchase_order/component/goodsOffer.vue   | 208 -----
 .../purchase_order/component/putStorage.vue   | 156 ----
 .../purchase_order/component/storeTable.vue   |  79 --
 .../purchase_order/component/subOrder.vue     |  80 --
 .../component/warehouseEdit.vue               | 306 -------
 src/views/order/purchase_order/details.vue    | 100 ---
 src/views/order/purchase_order/edit.vue       | 194 -----
 src/views/order/purchase_order/index.vue      | 142 ---
 .../order/purchase_product_offer/index.vue    | 503 -----------
 .../sort_list/components/deliverTable.vue     |  48 --
 .../order/sort_list/components/orderInfo.vue  |  46 -
 .../order/sort_list/components/orderTable.vue |  43 -
 .../order/sort_list/components/storeTable.vue |  73 --
 src/views/order/sort_list/details.vue         | 114 ---
 src/views/order/sort_list/edit.vue            | 103 ---
 src/views/order/sort_list/index.vue           | 134 ---
 src/views/order/store_order/add.vue           | 252 ------
 src/views/order/store_order/addBeforehand.vue | 195 -----
 .../store_order/components/deliverTable.vue   |  48 --
 .../store_order/components/editProduct.vue    | 103 ---
 .../store_order/components/orderInfo.vue      |  54 --
 .../store_order/components/orderTable.vue     |  43 -
 .../components/refundOrderProduct.vue         | 134 ---
 .../store_order/components/storeTable.vue     | 239 ------
 src/views/order/store_order/details.vue       | 287 -------
 src/views/order/store_order/edit.vue          |  99 ---
 src/views/order/store_order/index.vue         | 505 -----------
 src/views/order/store_order/refund.vue        | 163 ----
 .../order/store_order_cart_info/index.vue     | 293 -------
 .../components/deliverTable.vue               |  48 --
 .../components/orderInfo.vue                  |  46 -
 .../components/orderTable.vue                 |  43 -
 .../components/storeTable.vue                 |  73 --
 .../store_order_transshipment/details.vue     | 114 ---
 .../order/store_order_transshipment/edit.vue  | 103 ---
 .../order/store_order_transshipment/index.vue | 151 ----
 .../order/user_product_storage/details.vue    |  82 --
 src/views/order/user_product_storage/edit.vue | 104 ---
 .../order/user_product_storage/index.vue      | 188 ----
 .../user_product_storage_log/details.vue      |  82 --
 .../order/user_product_storage_log/edit.vue   | 104 ---
 .../order/user_product_storage_log/index.vue  | 112 ---
 src/views/statistics/negative/index.vue       | 238 ------
 src/views/statistics/order_product/index.vue  | 240 ------
 src/views/statistics/product/index copy.vue   | 316 -------
 src/views/statistics/product/index.vue        | 247 ------
 .../statistics/statistics_user/index.vue      | 342 --------
 src/views/statistics/stock/details.vue        |  75 --
 src/views/statistics/stock/index.vue          | 462 ----------
 src/views/statistics/stock/stockDetails.vue   |  86 --
 .../statistics/stock/warehouseProduct.vue     |  73 --
 src/views/statistics/transaction/index.vue    | 470 ----------
 src/views/store/statistics/index.vue          | 381 ---------
 .../store/store_branch_product/details.vue    | 111 ---
 .../store_branch_product/details_aaaaa.vue    | 134 ---
 .../store_branch_product/details_stock.vue    |  97 ---
 src/views/store/store_branch_product/edit.vue | 146 ----
 .../store/store_branch_product/editStock.vue  | 119 ---
 .../store/store_branch_product/index.vue      | 375 --------
 .../store/store_branch_product/index2.vue     | 244 ------
 src/views/store/store_category/edit.vue       | 194 -----
 src/views/store/store_category/index.vue      | 149 ----
 src/views/store/store_product/copy.vue        | 166 ----
 src/views/store/store_product/details.vue     | 383 ---------
 src/views/store/store_product/details11.vue   | 184 ----
 src/views/store/store_product/edit.vue        | 527 ------------
 src/views/store/store_product/edit11.vue      | 558 ------------
 src/views/store/store_product/import.vue      | 226 -----
 src/views/store/store_product/index.vue       | 362 --------
 src/views/store/store_product_unit/detail.vue | 103 ---
 src/views/store/store_product_unit/edit.vue   | 121 ---
 src/views/store/store_product_unit/index.vue  | 152 ----
 .../store/system_store_storage/details.vue    | 103 ---
 src/views/store/system_store_storage/edit.vue | 112 ---
 .../store/system_store_storage/index.vue      | 206 -----
 .../store_product_group_price/details.vue     |  96 ---
 src/views/store_product_group_price/edit.vue  | 103 ---
 src/views/store_product_group_price/index.vue | 125 ---
 src/views/store_product_low_stock/details.vue |  91 --
 src/views/store_product_low_stock/edit.vue    | 113 ---
 src/views/store_product_low_stock/index.vue   | 141 ---
 src/views/store_product_price/details.vue     |  81 --
 src/views/store_product_price/edit.vue        | 151 ----
 src/views/store_product_price/index.vue       | 200 -----
 .../store_product_price_list/details.vue      |  96 ---
 src/views/store_product_price_list/edit.vue   | 103 ---
 src/views/store_product_price_list/index.vue  |  86 --
 src/views/supplier/details.vue                | 111 ---
 src/views/supplier/edit.vue                   | 171 ----
 src/views/supplier/index.vue                  | 187 ----
 src/views/supplier/warehouseProduct.vue       |  92 --
 src/views/system_store/details.vue            |  96 ---
 src/views/system_store/edit.vue               | 357 --------
 src/views/system_store/index.vue              | 194 -----
 src/views/user/components/balance.vue         |  57 --
 src/views/user/components/freeze.vue          |  56 --
 src/views/user/components/merchandise.vue     |  57 --
 src/views/user/components/now_money.vue       |  72 --
 src/views/user/components/purchase.vue        |  56 --
 src/views/user/components/purchase_funds.vue  |  72 --
 src/views/user/components/receiveGifts.vue    |  59 --
 src/views/user/components/returnMoney.vue     |  57 --
 src/views/user/details.vue                    | 176 ----
 src/views/user/edit.vue                       | 123 ---
 src/views/user/indexList.vue                  | 329 -------
 src/views/user/setting.vue                    | 156 ----
 src/views/user_label/details.vue              |  83 --
 src/views/user_label/edit.vue                 | 109 ---
 src/views/user_label/index.vue                | 126 ---
 src/views/user_ship/details.vue               |  91 --
 src/views/user_ship/edit.vue                  | 127 ---
 src/views/user_ship/index.vue                 | 129 ---
 src/views/warehouse/details.vue               | 107 ---
 src/views/warehouse/edit.vue                  | 133 ---
 src/views/warehouse/import.vue                | 280 ------
 src/views/warehouse/indexs.vue                | 167 ----
 src/views/warehouse/product_import.vue        | 332 -------
 src/views/warehouse_order/details.vue         | 479 -----------
 src/views/warehouse_order/edit.vue            | 151 ----
 src/views/warehouse_order/editProduct.vue     | 207 -----
 src/views/warehouse_order/index.vue           | 274 ------
 src/views/warehouse_order/outbound_order.vue  | 277 ------
 src/views/warehouse_product/edit.vue          | 358 --------
 src/views/warehouse_product/index.vue         | 326 -------
 src/views/warehouse_product/outbound_list.vue | 281 ------
 src/views/warehouse_product/warehousing.vue   | 288 -------
 .../warehouse_product_return/details.vue      |  81 --
 src/views/warehouse_product_return/edit.vue   | 103 ---
 src/views/warehouse_product_return/index.vue  | 166 ----
 245 files changed, 36305 deletions(-)
 delete mode 100644 src/api/accounts_receivable.ts
 delete mode 100644 src/api/activity_zone.ts
 delete mode 100644 src/api/activity_zone_form.ts
 delete mode 100644 src/api/beforehand_order.ts
 delete mode 100644 src/api/beforehand_order_cart_info.ts
 delete mode 100644 src/api/change_log.ts
 delete mode 100644 src/api/delivery_service.ts
 delete mode 100644 src/api/financial_transfers.ts
 delete mode 100644 src/api/inventory_store.ts
 delete mode 100644 src/api/inventory_transfer.ts
 delete mode 100644 src/api/inventory_transfer_order.ts
 delete mode 100644 src/api/inventory_warehouse.ts
 delete mode 100644 src/api/label.ts
 delete mode 100644 src/api/public.ts
 delete mode 100644 src/api/purchase_order.ts
 delete mode 100644 src/api/purchase_order_info.ts
 delete mode 100644 src/api/purchase_product_offer.ts
 delete mode 100644 src/api/store_branch_product.ts
 delete mode 100644 src/api/store_branch_product_attr_value.ts
 delete mode 100644 src/api/store_cash_finance_flow.ts
 delete mode 100644 src/api/store_category.ts
 delete mode 100644 src/api/store_extract.ts
 delete mode 100644 src/api/store_finance_bill.ts
 delete mode 100644 src/api/store_finance_flow.ts
 delete mode 100644 src/api/store_order.ts
 delete mode 100644 src/api/store_product.ts
 delete mode 100644 src/api/store_product_attr_value.ts
 delete mode 100644 src/api/store_product_group_price.ts
 delete mode 100644 src/api/store_product_low_stock.ts
 delete mode 100644 src/api/store_product_price.ts
 delete mode 100644 src/api/store_product_price_list.ts
 delete mode 100644 src/api/store_product_unit.ts
 delete mode 100644 src/api/supplier.ts
 delete mode 100644 src/api/system_store.ts
 delete mode 100644 src/api/system_store_storage.ts
 delete mode 100644 src/api/user_bill.ts
 delete mode 100644 src/api/user_label.ts
 delete mode 100644 src/api/user_product_storage.ts
 delete mode 100644 src/api/user_product_storage_log.ts
 delete mode 100644 src/api/user_recharge.ts
 delete mode 100644 src/api/user_ship.ts
 delete mode 100644 src/api/warehouse.ts
 delete mode 100644 src/api/warehouse_order.ts
 delete mode 100644 src/api/warehouse_product.ts
 delete mode 100644 src/api/warehouse_product_return.ts
 delete mode 100644 src/api/warehouse_product_storege.ts
 delete mode 100644 src/api/wechat_query.ts
 delete mode 100644 src/views/activity_zone/component/productPop.vue
 delete mode 100644 src/views/activity_zone/details.vue
 delete mode 100644 src/views/activity_zone/edit.vue
 delete mode 100644 src/views/activity_zone/index.vue
 delete mode 100644 src/views/change_log/details.vue
 delete mode 100644 src/views/change_log/edit.vue
 delete mode 100644 src/views/change_log/index.vue
 delete mode 100644 src/views/delivery_service/details.vue
 delete mode 100644 src/views/delivery_service/edit.vue
 delete mode 100644 src/views/delivery_service/index.vue
 delete mode 100644 src/views/entryRecord/index.vue
 delete mode 100644 src/views/finance/commission/index.vue
 delete mode 100644 src/views/finance/receivable/details.vue
 delete mode 100644 src/views/finance/receivable/edit.vue
 delete mode 100644 src/views/finance/receivable/index.vue
 delete mode 100644 src/views/finance/store_cash_finance_flow/details.vue
 delete mode 100644 src/views/finance/store_cash_finance_flow/edit.vue
 delete mode 100644 src/views/finance/store_cash_finance_flow/index.vue
 delete mode 100644 src/views/finance/store_extract/details.vue
 delete mode 100644 src/views/finance/store_extract/edit.vue
 delete mode 100644 src/views/finance/store_extract/index.vue
 delete mode 100644 src/views/finance/store_finance_bill/components/billTable.vue
 delete mode 100644 src/views/finance/store_finance_bill/details.vue
 delete mode 100644 src/views/finance/store_finance_bill/edit.vue
 delete mode 100644 src/views/finance/store_finance_bill/index.vue
 delete mode 100644 src/views/finance/store_finance_flow/details.vue
 delete mode 100644 src/views/finance/store_finance_flow/edit.vue
 delete mode 100644 src/views/finance/store_finance_flow/index.vue
 delete mode 100644 src/views/finance/user_bill/details.vue
 delete mode 100644 src/views/finance/user_bill/edit.vue
 delete mode 100644 src/views/finance/user_bill/index.vue
 delete mode 100644 src/views/finance/user_recharge/details.vue
 delete mode 100644 src/views/finance/user_recharge/edit.vue
 delete mode 100644 src/views/finance/user_recharge/index.vue
 delete mode 100644 src/views/fnancial_transfers/index.vue
 delete mode 100644 src/views/inventory_store/details.vue
 delete mode 100644 src/views/inventory_store/edit.vue
 delete mode 100644 src/views/inventory_store/index.vue
 delete mode 100644 src/views/inventory_transfer/details.vue
 delete mode 100644 src/views/inventory_transfer/edit.vue
 delete mode 100644 src/views/inventory_transfer/index.vue
 delete mode 100644 src/views/inventory_transfer/warehousing.vue
 delete mode 100644 src/views/inventory_transfer_order/components/orderInfo.vue
 delete mode 100644 src/views/inventory_transfer_order/details.vue
 delete mode 100644 src/views/inventory_transfer_order/edit.vue
 delete mode 100644 src/views/inventory_transfer_order/index.vue
 delete mode 100644 src/views/inventory_warehouse/details.vue
 delete mode 100644 src/views/inventory_warehouse/edit.vue
 delete mode 100644 src/views/inventory_warehouse/index.vue
 delete mode 100644 src/views/label/edit.vue
 delete mode 100644 src/views/label/index.vue
 delete mode 100644 src/views/order/beforehand_order/add.vue
 delete mode 100644 src/views/order/beforehand_order/component/copyPop.vue
 delete mode 100644 src/views/order/beforehand_order/component/damage.vue
 delete mode 100644 src/views/order/beforehand_order/component/drawer.vue
 delete mode 100644 src/views/order/beforehand_order/component/editProduct.vue
 delete mode 100644 src/views/order/beforehand_order/component/goodsOffer.vue
 delete mode 100644 src/views/order/beforehand_order/component/orderCartInfo.vue
 delete mode 100644 src/views/order/beforehand_order/component/outbound.vue
 delete mode 100644 src/views/order/beforehand_order/component/returnSupplier.vue
 delete mode 100644 src/views/order/beforehand_order/component/returnWarehouse.vue
 delete mode 100644 src/views/order/beforehand_order/component/warehousing.vue
 delete mode 100644 src/views/order/beforehand_order/details.vue
 delete mode 100644 src/views/order/beforehand_order/edit.vue
 delete mode 100644 src/views/order/beforehand_order/index.vue
 delete mode 100644 src/views/order/beforehand_order/template-files/template1.js
 delete mode 100644 src/views/order/beforehand_order_cart_info/index.vue
 delete mode 100644 src/views/order/purchase_order/component/details.vue
 delete mode 100644 src/views/order/purchase_order/component/goodsOffer.vue
 delete mode 100644 src/views/order/purchase_order/component/putStorage.vue
 delete mode 100644 src/views/order/purchase_order/component/storeTable.vue
 delete mode 100644 src/views/order/purchase_order/component/subOrder.vue
 delete mode 100644 src/views/order/purchase_order/component/warehouseEdit.vue
 delete mode 100644 src/views/order/purchase_order/details.vue
 delete mode 100644 src/views/order/purchase_order/edit.vue
 delete mode 100644 src/views/order/purchase_order/index.vue
 delete mode 100644 src/views/order/purchase_product_offer/index.vue
 delete mode 100644 src/views/order/sort_list/components/deliverTable.vue
 delete mode 100644 src/views/order/sort_list/components/orderInfo.vue
 delete mode 100644 src/views/order/sort_list/components/orderTable.vue
 delete mode 100644 src/views/order/sort_list/components/storeTable.vue
 delete mode 100644 src/views/order/sort_list/details.vue
 delete mode 100644 src/views/order/sort_list/edit.vue
 delete mode 100644 src/views/order/sort_list/index.vue
 delete mode 100644 src/views/order/store_order/add.vue
 delete mode 100644 src/views/order/store_order/addBeforehand.vue
 delete mode 100644 src/views/order/store_order/components/deliverTable.vue
 delete mode 100644 src/views/order/store_order/components/editProduct.vue
 delete mode 100644 src/views/order/store_order/components/orderInfo.vue
 delete mode 100644 src/views/order/store_order/components/orderTable.vue
 delete mode 100644 src/views/order/store_order/components/refundOrderProduct.vue
 delete mode 100644 src/views/order/store_order/components/storeTable.vue
 delete mode 100644 src/views/order/store_order/details.vue
 delete mode 100644 src/views/order/store_order/edit.vue
 delete mode 100644 src/views/order/store_order/index.vue
 delete mode 100644 src/views/order/store_order/refund.vue
 delete mode 100644 src/views/order/store_order_cart_info/index.vue
 delete mode 100644 src/views/order/store_order_transshipment/components/deliverTable.vue
 delete mode 100644 src/views/order/store_order_transshipment/components/orderInfo.vue
 delete mode 100644 src/views/order/store_order_transshipment/components/orderTable.vue
 delete mode 100644 src/views/order/store_order_transshipment/components/storeTable.vue
 delete mode 100644 src/views/order/store_order_transshipment/details.vue
 delete mode 100644 src/views/order/store_order_transshipment/edit.vue
 delete mode 100644 src/views/order/store_order_transshipment/index.vue
 delete mode 100644 src/views/order/user_product_storage/details.vue
 delete mode 100644 src/views/order/user_product_storage/edit.vue
 delete mode 100644 src/views/order/user_product_storage/index.vue
 delete mode 100644 src/views/order/user_product_storage_log/details.vue
 delete mode 100644 src/views/order/user_product_storage_log/edit.vue
 delete mode 100644 src/views/order/user_product_storage_log/index.vue
 delete mode 100644 src/views/statistics/negative/index.vue
 delete mode 100644 src/views/statistics/order_product/index.vue
 delete mode 100644 src/views/statistics/product/index copy.vue
 delete mode 100644 src/views/statistics/product/index.vue
 delete mode 100644 src/views/statistics/statistics_user/index.vue
 delete mode 100644 src/views/statistics/stock/details.vue
 delete mode 100644 src/views/statistics/stock/index.vue
 delete mode 100644 src/views/statistics/stock/stockDetails.vue
 delete mode 100644 src/views/statistics/stock/warehouseProduct.vue
 delete mode 100644 src/views/statistics/transaction/index.vue
 delete mode 100644 src/views/store/statistics/index.vue
 delete mode 100644 src/views/store/store_branch_product/details.vue
 delete mode 100644 src/views/store/store_branch_product/details_aaaaa.vue
 delete mode 100644 src/views/store/store_branch_product/details_stock.vue
 delete mode 100644 src/views/store/store_branch_product/edit.vue
 delete mode 100644 src/views/store/store_branch_product/editStock.vue
 delete mode 100644 src/views/store/store_branch_product/index.vue
 delete mode 100644 src/views/store/store_branch_product/index2.vue
 delete mode 100644 src/views/store/store_category/edit.vue
 delete mode 100644 src/views/store/store_category/index.vue
 delete mode 100644 src/views/store/store_product/copy.vue
 delete mode 100644 src/views/store/store_product/details.vue
 delete mode 100644 src/views/store/store_product/details11.vue
 delete mode 100644 src/views/store/store_product/edit.vue
 delete mode 100644 src/views/store/store_product/edit11.vue
 delete mode 100644 src/views/store/store_product/import.vue
 delete mode 100644 src/views/store/store_product/index.vue
 delete mode 100644 src/views/store/store_product_unit/detail.vue
 delete mode 100644 src/views/store/store_product_unit/edit.vue
 delete mode 100644 src/views/store/store_product_unit/index.vue
 delete mode 100644 src/views/store/system_store_storage/details.vue
 delete mode 100644 src/views/store/system_store_storage/edit.vue
 delete mode 100644 src/views/store/system_store_storage/index.vue
 delete mode 100644 src/views/store_product_group_price/details.vue
 delete mode 100644 src/views/store_product_group_price/edit.vue
 delete mode 100644 src/views/store_product_group_price/index.vue
 delete mode 100644 src/views/store_product_low_stock/details.vue
 delete mode 100644 src/views/store_product_low_stock/edit.vue
 delete mode 100644 src/views/store_product_low_stock/index.vue
 delete mode 100644 src/views/store_product_price/details.vue
 delete mode 100644 src/views/store_product_price/edit.vue
 delete mode 100644 src/views/store_product_price/index.vue
 delete mode 100644 src/views/store_product_price_list/details.vue
 delete mode 100644 src/views/store_product_price_list/edit.vue
 delete mode 100644 src/views/store_product_price_list/index.vue
 delete mode 100644 src/views/supplier/details.vue
 delete mode 100644 src/views/supplier/edit.vue
 delete mode 100644 src/views/supplier/index.vue
 delete mode 100644 src/views/supplier/warehouseProduct.vue
 delete mode 100644 src/views/system_store/details.vue
 delete mode 100644 src/views/system_store/edit.vue
 delete mode 100644 src/views/system_store/index.vue
 delete mode 100644 src/views/user/components/balance.vue
 delete mode 100644 src/views/user/components/freeze.vue
 delete mode 100644 src/views/user/components/merchandise.vue
 delete mode 100644 src/views/user/components/now_money.vue
 delete mode 100644 src/views/user/components/purchase.vue
 delete mode 100644 src/views/user/components/purchase_funds.vue
 delete mode 100644 src/views/user/components/receiveGifts.vue
 delete mode 100644 src/views/user/components/returnMoney.vue
 delete mode 100644 src/views/user/details.vue
 delete mode 100644 src/views/user/edit.vue
 delete mode 100644 src/views/user/indexList.vue
 delete mode 100644 src/views/user/setting.vue
 delete mode 100644 src/views/user_label/details.vue
 delete mode 100644 src/views/user_label/edit.vue
 delete mode 100644 src/views/user_label/index.vue
 delete mode 100644 src/views/user_ship/details.vue
 delete mode 100644 src/views/user_ship/edit.vue
 delete mode 100644 src/views/user_ship/index.vue
 delete mode 100644 src/views/warehouse/details.vue
 delete mode 100644 src/views/warehouse/edit.vue
 delete mode 100644 src/views/warehouse/import.vue
 delete mode 100644 src/views/warehouse/indexs.vue
 delete mode 100644 src/views/warehouse/product_import.vue
 delete mode 100644 src/views/warehouse_order/details.vue
 delete mode 100644 src/views/warehouse_order/edit.vue
 delete mode 100644 src/views/warehouse_order/editProduct.vue
 delete mode 100644 src/views/warehouse_order/index.vue
 delete mode 100644 src/views/warehouse_order/outbound_order.vue
 delete mode 100644 src/views/warehouse_product/edit.vue
 delete mode 100644 src/views/warehouse_product/index.vue
 delete mode 100644 src/views/warehouse_product/outbound_list.vue
 delete mode 100644 src/views/warehouse_product/warehousing.vue
 delete mode 100644 src/views/warehouse_product_return/details.vue
 delete mode 100644 src/views/warehouse_product_return/edit.vue
 delete mode 100644 src/views/warehouse_product_return/index.vue

diff --git a/src/api/accounts_receivable.ts b/src/api/accounts_receivable.ts
deleted file mode 100644
index 997d69e0a..000000000
--- a/src/api/accounts_receivable.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import request from '@/utils/request'
-
-export function apiAccountsReceivableLists(params: any) {
-    return request.get({ url: '/accounts_receivable/accountsreceivable/lists', params })
-}
-
-export function apiAccountsReceivableAdd(params: any) {
-    return request.post({ url: '/accounts_receivable/accountsreceivable/add', params })
-}
-
-export function apiAccountsReceivableEdit(params: any) {
-    return request.post({ url: '/accounts_receivable/accountsreceivable/edit', params })
-}
-
-export function apiAccountsReceivableDelete(params: any) {
-    return request.post({ url: '/accounts_receivable/accountsreceivable/delete', params })
-}
-
-export function apiAccountsReceivableDetail(params: any) {
-    return request.get({ url: '/accounts_receivable/accountsreceivable/detail', params })
-}
-export function apiAccountsReceivableRecord(params: any) {
-    return request.get({ url: '/accounts_receivable/accountsreceivable/record', params })
-}
-export function apiAccountsReceivableStatistics(params: any) {
-    return request.get({ url: '/accounts_receivable/accountsreceivable/statistics', params })
-}
-
diff --git a/src/api/activity_zone.ts b/src/api/activity_zone.ts
deleted file mode 100644
index e10d4438e..000000000
--- a/src/api/activity_zone.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import request from '@/utils/request'
-
-// 活动专区列表
-export function apiActivityZoneLists(params: any) {
-    return request.get({ url: '/activityzone/lists', params })
-}
-
-// 添加活动专区
-export function apiActivityZoneAdd(params: any) {
-    return request.post({ url: '/activityzone/add', params })
-}
-
-// 编辑活动专区
-export function apiActivityZoneEdit(params: any) {
-    return request.post({ url: '/activityzone/edit', params })
-}
-
-// 删除活动专区
-export function apiActivityZoneDelete(params: any) {
-    return request.post({ url: '/activityzone/delete', params })
-}
-
-// 活动专区详情
-export function apiActivityZoneDetail(params: any) {
-    return request.get({ url: '/activityzone/detail', params })
-}
-
-// 活动专区详情
-export function apiActivityZoneExport(params: any) {
-    return request.get({ url: '/activityzone/export', params })
-}
\ No newline at end of file
diff --git a/src/api/activity_zone_form.ts b/src/api/activity_zone_form.ts
deleted file mode 100644
index 7fccdf452..000000000
--- a/src/api/activity_zone_form.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import request from '@/utils/request'
-
-// 活动专区列表
-export function apiActivityZoneFormLists(params: any) {
-    return request.get({ url: '/activityzoneform/lists', params })
-}
-
-// 添加活动专区
-export function apiActivityZoneFormAdd(params: any) {
-    return request.post({ url: '/activityzoneform/add', params })
-}
-
-// 编辑活动专区
-export function apiActivityZoneFormEdit(params: any) {
-    return request.post({ url: '/activityzoneform/edit', params })
-}
-
-// 删除活动专区
-export function apiActivityZoneFormDelete(params: any) {
-    return request.post({ url: '/activityzoneform/delete', params })
-}
-
-// 活动专区详情
-export function apiActivityZoneFormDetail(params: any) {
-    return request.get({ url: '/activityzoneform/detail', params })
-}
-
-// 活动专区详情
-export function apiActivityZoneFormExport(params: any) {
-    return request.get({ url: '/activityzoneform/export', params })
-}
\ No newline at end of file
diff --git a/src/api/beforehand_order.ts b/src/api/beforehand_order.ts
deleted file mode 100644
index 0112fbb26..000000000
--- a/src/api/beforehand_order.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import request from '@/utils/request'
-
-// 预订单表列表
-export function apiBeforehandOrderLists(params: any) {
-    return request.get({ url: '/beforehand_order/beforehandorder/lists', params })
-}
-export function apiBeforehandOrderStatisticsCount(params: any) {
-    return request.get({ url: '/beforehand_order/beforehandorder/statistics_count', params })
-}
-
-// 添加预订单表
-export function apiBeforehandOrderAdd(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/add', params })
-}
-
-// 编辑预订单表
-export function apiBeforehandOrderEdit(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/edit', params })
-}
-// 一键出库
-export function apiBeforehandOrderCreateOutboundOrder(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/createOutboundOrder', params })
-}
-
-// 一键复制预订单
-export function apiBeforehandOrderCopy(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/copy', params })
-}
-
-// 一键复制预订单
-export function apiBeforehandOrderTransfer(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/transfer', params })
-}
-
-// 删除预订单表
-export function apiBeforehandOrderDelete(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/delete', params })
-}
-
-//结算预订单
-export function apiBeforehandOrderSettle(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/settle', params })
-}
-
-//确认预订单
-export function apiBeforehandOrderConfirm(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/confirm', params })
-}
-
-
-// 预订单表详情
-export function apiBeforehandOrderDetail(params: any) {
-    return request.get({ url: '/beforehand_order/beforehandorder/detail', params })
-}
-
-// 入库列表
-export function apiBeforehandOrderWarehousingLists(params: any) {
-    return request.get({ url: '/beforehand_order/beforehandorder/warehousing_lists', params })
-}
-// 出库列表
-export function apiBeforehandOrderOutboundLists(params: any) {
-    return request.get({ url: '/beforehand_order/beforehandorder/outbound_lists', params })
-}
-// 订单转预订单
-export function apiPurchaseOrderTransferAdvanceOrder(params: any) {
-    return request.post({
-        url: '/beforehand_order/beforehandorder/orderTransferAdvanceOrder',
-        params
-    })
-}
-
-// 打印出库标签
-export function apiPurchaseOrderExport(params: any) {
-    return request.post({
-        url: '/beforehand_order/beforehandorder/export',
-        params
-    })
-}
-/**
- * 生成支付订单
- */
-export function apiPurchaseOrderGenerateOrder(params: any) {
-    return request.post({
-        url: '/beforehand_order/beforehandorder/generateOrder',
-        params
-    })
-}
-
-//导出清单
-export function apiPurchaseOrderExportOrderList(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/export_order_list', params })
-}
-//导出分单
-export function apiPurchaseOrderOrderAllocation(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/order_allocation', params })
-}
-//采购信息
-export function apiPurchaseOrderOrderInfo(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/order_info', params })
-}
-//导出出库
-export function apiPurchaseOrderOrderOutbound(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/order_outbound', params })
-}
-//导出出库
-export function apiPurchaseOrderOrderOutbound3(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/order_outbound3', params })
-}
-//导出退库
-export function apiPurchaseOrderStockReturn(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/stock_return', params })
-}
-//导出退供应商
-export function apiPurchaseOrderReturnSupplier(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/return_supplier', params })
-}
-
-// 预订单日志列表
-export function apiBeforehandOrderLogLists(params: any) {
-    return request.get({ url: '/beforehand_order/beforehandorder/logList', params })
-}
-
-//保存预订单日志
-export function apiBeforehandOrderLogSave(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/saveLog', params })
-}
-
-//确认预订单日志
-export function apiBeforehandOrderLogConfirm(params: any) {
-    return request.post({ url: '/beforehand_order/beforehandorder/confirmLog', params })
-}
diff --git a/src/api/beforehand_order_cart_info.ts b/src/api/beforehand_order_cart_info.ts
deleted file mode 100644
index b94ee86b7..000000000
--- a/src/api/beforehand_order_cart_info.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import request from '@/utils/request'
-
-// 预订单购物详情表列表
-export function apiBeforehandOrderCartInfoLists(params: any) {
-    return request.get({ url: '/beforehand_order_cart_info/beforehandordercartinfo/lists', params })
-}
-
-// 添加预订单购物详情表
-export function apiBeforehandOrderCartInfoAdd(params: any) {
-    return request.post({ url: '/beforehand_order_cart_info/beforehandordercartinfo/add', params })
-}
-
-// 编辑预订单购物详情表
-export function apiBeforehandOrderCartInfoEdit(params: any) {
-    return request.post({ url: '/beforehand_order_cart_info/beforehandordercartinfo/edit', params })
-}
-export function apiBeforehandOrderCartInfoAppendAdd(params: any) {
-    return request.post({
-        url: '/beforehand_order_cart_info/beforehandordercartinfo/append_add',
-        params
-    })
-}
-
-// 删除预订单购物详情表
-export function apiBeforehandOrderCartInfoDelete(params: any) {
-    return request.post({
-        url: '/beforehand_order_cart_info/beforehandordercartinfo/delete',
-        params
-    })
-}
-// 编辑预订单购物详情无需采购
-export function apiBeforehandOrderCartInfoProcurementStatus(params: any) {
-    return request.post({
-        url: '/beforehand_order_cart_info/beforehandordercartinfo/procurement_status',
-        params
-    })
-}
-// 一键入库
-export function apiBeforehandOrderCartInfoOneClickStorage(params: any) {
-    return request.post({
-        url: '/beforehand_order_cart_info/beforehandordercartinfo/one_click_storage',
-        params
-    })
-}
-
-// 预订单购物详情表详情
-export function apiBeforehandOrderCartInfoDetail(params: any) {
-    return request.get({
-        url: '/beforehand_order_cart_info/beforehandordercartinfo/detail',
-        params
-    })
-}
-
-// 预订单购物详情表详情
-export function apiBeforehandOrderCartInfoFix(params: any) {
-    return request.get({
-        url: '/beforehand_order_cart_info/beforehandordercartinfo/fix',
-        params
-    })
-}
-
-// 同步商品价格
-export function apiBeforehandOrderCartInfoSyncPrice(params: any) {
-    return request.get({ url: '/beforehand_order_cart_info/beforehandordercartinfo/syncPrice', params })
-}
-
-// 设置门店出货
-export function apiBeforehandOrderCartInfoSetStoreSale(params: any) {
-    return request.post({ url: '/beforehand_order_cart_info/beforehandordercartinfo/setStoreSale', params })
-}
-
-// 单个商品入库
-export function apiBeforehandOrderCartInfoPutInStorage(params: any) {
-    return request.post({ url: '/beforehand_order_cart_info/beforehandordercartinfo/putInStorage', params })
-}
\ No newline at end of file
diff --git a/src/api/change_log.ts b/src/api/change_log.ts
deleted file mode 100644
index fedf7689e..000000000
--- a/src/api/change_log.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 数据变更记录列表
-export function apiChangeLogLists(params: any) {
-    return request.get({ url: '/changelog/lists', params })
-}
-
-// 添加数据变更记录
-export function apiChangeLogAdd(params: any) {
-    return request.post({ url: '/changelog/add', params })
-}
-
-// 编辑数据变更记录
-export function apiChangeLogEdit(params: any) {
-    return request.post({ url: '/changelog/edit', params })
-}
-
-// 删除数据变更记录
-export function apiChangeLogDelete(params: any) {
-    return request.post({ url: '/changelog/delete', params })
-}
-
-// 数据变更记录详情
-export function apiChangeLogDetail(params: any) {
-    return request.get({ url: '/changelog/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/delivery_service.ts b/src/api/delivery_service.ts
deleted file mode 100644
index 1645b9a77..000000000
--- a/src/api/delivery_service.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 配送员表列表
-export function apiDeliveryServiceLists(params: any) {
-    return request.get({ url: '/delivery_service/deliveryservice/lists', params })
-}
-
-// 添加配送员表
-export function apiDeliveryServiceAdd(params: any) {
-    return request.post({ url: '/delivery_service/deliveryservice/add', params })
-}
-
-// 编辑配送员表
-export function apiDeliveryServiceEdit(params: any) {
-    return request.post({ url: '/delivery_service/deliveryservice/edit', params })
-}
-
-// 删除配送员表
-export function apiDeliveryServiceDelete(params: any) {
-    return request.post({ url: '/delivery_service/deliveryservice/delete', params })
-}
-
-// 配送员表详情
-export function apiDeliveryServiceDetail(params: any) {
-    return request.get({ url: '/delivery_service/deliveryservice/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/financial_transfers.ts b/src/api/financial_transfers.ts
deleted file mode 100644
index d8a7d5eb5..000000000
--- a/src/api/financial_transfers.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import request from '@/utils/request'
-
-// 财务转账表列表
-export function apiFinancialTransfersLists(params: any) {
-    return request.get({ url: '/financial_transfers/financialtransfers/lists', params })
-}
-
-// 发送
-export function apiFinancialTransfersSend(params: any) {
-    return request.post({ url: '/financial_transfers/FinancialTransfers/send_transfers', params })
-}
-
-export function apiFinancialTransfersConfirm(params: any) {
-    return request.post({ url: '/financial_transfers/FinancialTransfers/success_send', params })
-}
diff --git a/src/api/inventory_store.ts b/src/api/inventory_store.ts
deleted file mode 100644
index 3645986d8..000000000
--- a/src/api/inventory_store.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import request from '@/utils/request'
-
-// 门店盘存列表
-export function apiInventoryStoreLists(params: any) {
-    return request.get({ url: '/inventory_store/inventorystore/lists', params })
-}
-
-// 添加门店盘存
-export function apiInventoryStoreAdd(params: any) {
-    return request.post({ url: '/inventory_store/inventorystore/add', params })
-}
-
-// 编辑门店盘存
-export function apiInventoryStoreEdit(params: any) {
-    return request.post({ url: '/inventory_store/inventorystore/edit', params })
-}
-
-// 删除门店盘存
-export function apiInventoryStoreDelete(params: any) {
-    return request.post({ url: '/inventory_store/inventorystore/delete', params })
-}
-
-// 门店盘存详情
-export function apiInventoryStoreDetail(params: any) {
-    return request.get({ url: '/inventory_store/inventorystore/detail', params })
-}
-
-export function apiInventoryStoreEnterNums(params: any) {
-    return request.post({ url: '/inventory_store/inventorystore/enter_nums', params })
-}
diff --git a/src/api/inventory_transfer.ts b/src/api/inventory_transfer.ts
deleted file mode 100644
index 358b5d78d..000000000
--- a/src/api/inventory_transfer.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 商品调拨列表
-export function apiInventoryTransferLists(params: any) {
-    return request.get({ url: '/inventory_transfer/inventorytransfer/lists', params })
-}
-
-// 添加商品调拨
-export function apiInventoryTransferAdd(params: any) {
-    return request.post({ url: '/inventory_transfer/inventorytransfer/add', params })
-}
-
-// 编辑商品调拨
-export function apiInventoryTransferEdit(params: any) {
-    return request.post({ url: '/inventory_transfer/inventorytransfer/edit', params })
-}
-
-// 删除商品调拨
-export function apiInventoryTransferDelete(params: any) {
-    return request.post({ url: '/inventory_transfer/inventorytransfer/delete', params })
-}
-
-// 商品调拨详情
-export function apiInventoryTransferDetail(params: any) {
-    return request.get({ url: '/inventory_transfer/inventorytransfer/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/inventory_transfer_order.ts b/src/api/inventory_transfer_order.ts
deleted file mode 100644
index 8624f2e0f..000000000
--- a/src/api/inventory_transfer_order.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 商品调拨订单列表
-export function apiInventoryTransferOrderLists(params: any) {
-    return request.get({ url: '/inventory_transfer_order/inventorytransferorder/lists', params })
-}
-
-// 添加商品调拨订单
-export function apiInventoryTransferOrderAdd(params: any) {
-    return request.post({ url: '/inventory_transfer_order/inventorytransferorder/add', params })
-}
-
-// 编辑商品调拨订单
-export function apiInventoryTransferOrderEdit(params: any) {
-    return request.post({ url: '/inventory_transfer_order/inventorytransferorder/edit', params })
-}
-
-// 删除商品调拨订单
-export function apiInventoryTransferOrderDelete(params: any) {
-    return request.post({ url: '/inventory_transfer_order/inventorytransferorder/delete', params })
-}
-
-// 商品调拨订单详情
-export function apiInventoryTransferOrderDetail(params: any) {
-    return request.get({ url: '/inventory_transfer_order/inventorytransferorder/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/inventory_warehouse.ts b/src/api/inventory_warehouse.ts
deleted file mode 100644
index 66ce582bf..000000000
--- a/src/api/inventory_warehouse.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import request from '@/utils/request'
-
-// 仓库盘存列表
-export function apiInventoryWarehouseLists(params: any) {
-    return request.get({ url: '/inventory_warehouse/inventorywarehouse/lists', params })
-}
-
-// 添加仓库盘存
-export function apiInventoryWarehouseAdd(params: any) {
-    return request.post({ url: '/inventory_warehouse/inventorywarehouse/add', params })
-}
-
-// 编辑仓库盘存
-export function apiInventoryWarehouseEdit(params: any) {
-    return request.post({ url: '/inventory_warehouse/inventorywarehouse/edit', params })
-}
-
-// 删除仓库盘存
-export function apiInventoryWarehouseDelete(params: any) {
-    return request.post({ url: '/inventory_warehouse/inventorywarehouse/delete', params })
-}
-
-// 仓库盘存详情
-export function apiInventoryWarehouseDetail(params: any) {
-    return request.get({ url: '/inventory_warehouse/inventorywarehouse/detail', params })
-}
-export function apiInventoryWarehouseEnterNums(params: any) {
-    return request.post({ url: '/inventory_warehouse/inventorywarehouse/enter_nums', params })
-}
diff --git a/src/api/label.ts b/src/api/label.ts
deleted file mode 100644
index 6838a4b73..000000000
--- a/src/api/label.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 标签列表
-export function apiLabelLists(params: any) {
-    return request.get({ url: '/setting/label/lists', params })
-}
-
-// 添加标签
-export function apiLabelAdd(params: any) {
-    return request.post({ url: '/setting/label/add', params })
-}
-
-// 编辑标签
-export function apiLabelEdit(params: any) {
-    return request.post({ url: '/setting/label/edit', params })
-}
-
-// 删除标签
-export function apiLabelDelete(params: any) {
-    return request.post({ url: '/setting/label/delete', params })
-}
-
-// 标签详情
-export function apiLabelDetail(params: any) {
-    return request.get({ url: '/setting/label/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/public.ts b/src/api/public.ts
deleted file mode 100644
index 34552d65d..000000000
--- a/src/api/public.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import request from '@/utils/request'
-
-// 省
-export function apiProvince() {
-    return request.get({ url: '/config/province' })
-}
-
-// 市
-export function apiCity(params: any) {
-    return request.get({ url: '/config/city', params })
-}
-
-// 区
-export function apiArea(params: any) {
-    return request.get({ url: '/config/area', params })
-}
-
-// 街道
-export function apiStreet(params: any) {
-    return request.get({ url: '/config/street', params })
-}
-
diff --git a/src/api/purchase_order.ts b/src/api/purchase_order.ts
deleted file mode 100644
index 79ec23399..000000000
--- a/src/api/purchase_order.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 采购订单列表
-export function apiPurchaseOrderLists(params: any) {
-    return request.get({ url: '/purchase_order/purchaseorder/lists', params })
-}
-// 采购订单详情列表
-export function apiPurchaseOrderInfoLists(params: any) {
-    return request.get({ url: '/purchase_order/purchaseorder/info_lists', params })
-}
-// 采购订单详情列表
-export function apiPurchaseStoreOrderLists(params: any) {
-    return request.get({ url: '/purchase_order/purchaseorder/order_lists', params })
-}
-
-// 添加采购订单
-export function apiPurchaseOrderAdd(params: any) {
-    return request.post({ url: '/purchase_order/purchaseorder/add', params })
-}
-// 添加采购订单平台
-export function apiPurchaseOrderPlatform(params: any) {
-    return request.post({ url: '/purchase_order/purchaseorder/platform', params })
-}
-// 编辑采购订单
-export function apiPurchaseOrderEdit(params: any) {
-    return request.post({ url: '/purchase_order/purchaseorder/edit', params })
-}
-
-// 删除采购订单
-export function apiPurchaseOrderDelete(params: any) {
-    return request.post({ url: '/purchase_order/purchaseorder/delete', params })
-}
-
-// 采购订单详情
-export function apiPurchaseOrderDetail(params: any) {
-    return request.get({ url: '/purchase_order/purchaseorder/detail', params })
-}
diff --git a/src/api/purchase_order_info.ts b/src/api/purchase_order_info.ts
deleted file mode 100644
index 20a1e71a5..000000000
--- a/src/api/purchase_order_info.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 采购订单详情表列表
-export function apiPurchaseOrderInfoLists(params: any) {
-    return request.get({ url: '/purchase_order_info/purchaseorderinfo/lists', params })
-}
-
-// 添加采购订单详情表
-export function apiPurchaseOrderInfoAdd(params: any) {
-    return request.post({ url: '/purchase_order_info/purchaseorderinfo/add', params })
-}
-
-// 编辑采购订单详情表
-export function apiPurchaseOrderInfoEdit(params: any) {
-    return request.post({ url: '/purchase_order_info/purchaseorderinfo/edit', params })
-}
-
-// 删除采购订单详情表
-export function apiPurchaseOrderInfoDelete(params: any) {
-    return request.post({ url: '/purchase_order_info/purchaseorderinfo/delete', params })
-}
-
-// 采购订单详情表详情
-export function apiPurchaseOrderInfoDetail(params: any) {
-    return request.get({ url: '/purchase_order_info/purchaseorderinfo/detail', params })
-}
diff --git a/src/api/purchase_product_offer.ts b/src/api/purchase_product_offer.ts
deleted file mode 100644
index ca339d45e..000000000
--- a/src/api/purchase_product_offer.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import request from '@/utils/request'
-
-// 采购供应链商品列表
-export function apiPurchaseProductOfferLists(params: any) {
-    return request.get({ url: '/purchase_product_offer/purchaseproductoffer/lists', params })
-}
-
-// 添加采购供应链商品
-export function apiPurchaseProductOfferAdd(params: any) {
-    return request.post({ url: '/purchase_product_offer/purchaseproductoffer/add', params })
-}
-
-// 编辑采购供应链商品
-export function apiPurchaseProductOfferEdit(params: any) {
-    return request.post({ url: '/purchase_product_offer/purchaseproductoffer/edit', params })
-}
-
-// 删除采购供应链商品
-export function apiPurchaseProductOfferDelete(params: any) {
-    return request.post({ url: '/purchase_product_offer/purchaseproductoffer/delete', params })
-}
-/**
- * 一键往期采购
- * @param params
- * @returns
- */
-export function apiPurchaseProductOfferAddPurchasesOneClick(params: any) {
-    return request.post({
-        url: '/purchase_product_offer/purchaseproductoffer/add_purchases_one_click',
-        params
-    })
-}
-// 设置采购信息
-export function apiPurchaseProductOfferSetProcureInfo(params: any) {
-    return request.post({
-        url: '/purchase_product_offer/purchaseproductoffer/setProcureInfo',
-        params
-    })
-}
-// 设置批量采购信息
-
-export function apiPurchaseProductOfferSetBatchProcureInfo(params: any) {
-    return request.post({
-        url: '/purchase_product_offer/purchaseproductoffer/setBatchProcureInfo',
-        params
-    })
-}
-// 仓库验收信息设置
-export function apiPurchaseProductOffersetStoreroomInfo(params: any) {
-    return request.post({
-        url: '/purchase_product_offer/purchaseproductoffer/setStoreroomInfo',
-        params
-    })
-}
-// 仓库验收信息设置
-export function apiPurchaseProductOffersetStoreroomInfoTwo(params: any) {
-    return request.post({
-        url: '/purchase_product_offer/purchaseproductoffer/setStoreroomInfoTwo',
-        params
-    })
-}
-// 采购供应链商品详情
-export function apiPurchaseProductOfferDetail(params: any) {
-    return request.get({ url: '/purchase_product_offer/purchaseproductoffer/detail', params })
-}
diff --git a/src/api/store_branch_product.ts b/src/api/store_branch_product.ts
deleted file mode 100644
index b4a4d06ea..000000000
--- a/src/api/store_branch_product.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 门店商品辅助表列表
-export function apiStoreBranchProductLists(params: any) {
-    return request.get({ url: '/store_branch_product/storebranchproduct/lists', params })
-}
-
-// 添加门店商品辅助表
-export function apiStoreBranchProductAdd(params: any) {
-    return request.post({ url: '/store_branch_product/storebranchproduct/add', params })
-}
-
-// 编辑门店商品辅助表
-export function apiStoreBranchProductEdit(params: any) {
-    return request.post({ url: '/store_branch_product/storebranchproduct/edit', params })
-}
-
-// 编辑门店商品
-export function apiStoreBranchProductUpdate(params: any) {
-    return request.post({ url: '/store_branch_product/storebranchproduct/update', params })
-}
-
-// 删除门店商品辅助表
-export function apiStoreBranchProductDelete(params: any) {
-    return request.post({ url: '/store_branch_product/storebranchproduct/delete', params })
-}
-export function apiStoreBranchProductEditStock(params: any) {
-    return request.post({
-        url: '/store_branch_product/storebranchproduct/edit_stock',
-        params
-    })
-}
-
-// 门店商品辅助表详情
-export function apiStoreBranchProductDetail(params: any) {
-    return request.get({ url: '/store_branch_product/storebranchproduct/detail', params })
-}
diff --git a/src/api/store_branch_product_attr_value.ts b/src/api/store_branch_product_attr_value.ts
deleted file mode 100644
index 8a820a588..000000000
--- a/src/api/store_branch_product_attr_value.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import request from '@/utils/request'
-
-// 门店商品属性值辅助表列表
-export function apiStoreBranchProductAttrValueLists(params: any) {
-    return request.get({
-        url: '/store_branch_product_attr_value/storebranchproductattrvalue/lists',
-        params
-    })
-}
-
-// 添加门店商品属性值辅助表
-export function apiStoreBranchProductAttrValueAdd(params: any) {
-    return request.post({
-        url: '/store_branch_product_attr_value/storebranchproductattrvalue/add',
-        params
-    })
-}
-
-// 编辑门店商品属性值辅助表
-export function apiStoreBranchProductAttrValueEdit(params: any) {
-    return request.post({
-        url: '/store_branch_product_attr_value/storebranchproductattrvalue/edit',
-        params
-    })
-}
-//更新状态
-export function apiStoreBranchProductAttrValueStatus(params: any) {
-    return request.post({
-        url: '/store_branch_product_attr_value/storebranchproductattrvalue/status',
-        params
-    })
-}
-
-// 删除门店商品属性值辅助表
-export function apiStoreBranchProductAttrValueDelete(params: any) {
-    return request.post({
-        url: '/store_branch_product_attr_value/storebranchproductattrvalue/delete',
-        params
-    })
-}
-
-// 门店商品属性值辅助表详情
-export function apiStoreBranchProductAttrValueDetail(params: any) {
-    return request.get({
-        url: '/store_branch_product_attr_value/storebranchproductattrvalue/detail',
-        params
-    })
-}
diff --git a/src/api/store_cash_finance_flow.ts b/src/api/store_cash_finance_flow.ts
deleted file mode 100644
index a7b15515a..000000000
--- a/src/api/store_cash_finance_flow.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 门店现金流水列表
-export function apiStoreCashFinanceFlowLists(params: any) {
-    return request.get({ url: '/store_cash_finance_flow/storecashfinanceflow/lists', params })
-}
-
-// 添加门店现金流水
-export function apiStoreCashFinanceFlowAdd(params: any) {
-    return request.post({ url: '/store_cash_finance_flow/storecashfinanceflow/add', params })
-}
-
-// 编辑门店现金流水
-export function apiStoreCashFinanceFlowEdit(params: any) {
-    return request.post({ url: '/store_cash_finance_flow/storecashfinanceflow/edit', params })
-}
-
-// 删除门店现金流水
-export function apiStoreCashFinanceFlowDelete(params: any) {
-    return request.post({ url: '/store_cash_finance_flow/storecashfinanceflow/delete', params })
-}
-
-// 门店现金流水详情
-export function apiStoreCashFinanceFlowDetail(params: any) {
-    return request.get({ url: '/store_cash_finance_flow/storecashfinanceflow/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/store_category.ts b/src/api/store_category.ts
deleted file mode 100644
index 6a11579f3..000000000
--- a/src/api/store_category.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 商品分类表列表
-export function apiStoreCategoryLists(params: any) {
-    return request.get({ url: '/store_category/storecategory/lists', params })
-}
-
-// 添加商品分类表
-export function apiStoreCategoryAdd(params: any) {
-    return request.post({ url: '/store_category/storecategory/add', params })
-}
-
-// 编辑商品分类表
-export function apiStoreCategoryEdit(params: any) {
-    return request.post({ url: '/store_category/storecategory/edit', params })
-}
-
-// 删除商品分类表
-export function apiStoreCategoryDelete(params: any) {
-    return request.post({ url: '/store_category/storecategory/delete', params })
-}
-
-// 商品分类表详情
-export function apiStoreCategoryDetail(params: any) {
-    return request.get({ url: '/store_category/storecategory/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/store_extract.ts b/src/api/store_extract.ts
deleted file mode 100644
index 3739d718b..000000000
--- a/src/api/store_extract.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import request from '@/utils/request'
-
-// 门店提现表列表
-export function apiStoreExtractLists(params: any) {
-    return request.get({ url: '/store_extract/storeextract/lists', params })
-}
-
-// 添加门店提现表
-export function apiStoreExtractAdd(params: any) {
-    return request.post({ url: '/store_extract/storeextract/add', params })
-}
-
-// 确认提现
-export function apiStoreExtractEnter(params: any) {
-    return request.post({ url: '/store_extract/storeextract/enter', params })
-}
-
-// 编辑门店提现表
-export function apiStoreExtractEdit(params: any) {
-    return request.post({ url: '/store_extract/storeextract/edit', params })
-}
-
-// 删除门店提现表
-export function apiStoreExtractDelete(params: any) {
-    return request.post({ url: '/store_extract/storeextract/delete', params })
-}
-
-// 门店提现表详情
-export function apiStoreExtractDetail(params: any) {
-    return request.get({ url: '/store_extract/storeextract/detail', params })
-}
diff --git a/src/api/store_finance_bill.ts b/src/api/store_finance_bill.ts
deleted file mode 100644
index e09ab9e2d..000000000
--- a/src/api/store_finance_bill.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import request from '@/utils/request'
-
-// 门店财务-日账单
-export function apiDayBillLists(params: any) {
-    return request.get({ url: '/store_finance_flow/StoreFinanceFlow/day_bill_lists', params })
-}
-
-// 门店财务-周账单
-export function apiWeekBillLists(params: any) {
-    return request.get({ url: '/store_finance_flow/StoreFinanceFlow/week_bill_lists', params })
-}
-
-// 门店财务-月账单
-export function apiMonthBillLists(params: any) {
-    return request.get({ url: '/store_finance_flow/StoreFinanceFlow/month_bill_lists', params })
-}
\ No newline at end of file
diff --git a/src/api/store_finance_flow.ts b/src/api/store_finance_flow.ts
deleted file mode 100644
index 5683b7c79..000000000
--- a/src/api/store_finance_flow.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import request from '@/utils/request'
-
-// 门店资金流水表列表
-export function apiStoreFinanceFlowLists(params: any) {
-    return request.get({ url: '/store_finance_flow/storefinanceflow/lists', params })
-}
-
-// 添加门店资金流水表
-export function apiStoreFinanceFlowAdd(params: any) {
-    return request.post({ url: '/store_finance_flow/storefinanceflow/add', params })
-}
-
-// 编辑门店资金流水表
-export function apiStoreFinanceFlowEdit(params: any) {
-    return request.post({ url: '/store_finance_flow/storefinanceflow/edit', params })
-}
-
-// 删除门店资金流水表
-export function apiStoreFinanceFlowDelete(params: any) {
-    return request.post({ url: '/store_finance_flow/storefinanceflow/delete', params })
-}
-
-// 门店资金流水表详情
-export function apiStoreFinanceFlowDetail(params: any) {
-    return request.get({ url: '/store_finance_flow/storefinanceflow/detail', params })
-}
-// 导出
-export function apiStoreFinanceFlowExport(params: any) {
-    return request.post({ url: '/store_finance_flow/storefinanceflow/export', params })
-}
\ No newline at end of file
diff --git a/src/api/store_order.ts b/src/api/store_order.ts
deleted file mode 100644
index c51eacddf..000000000
--- a/src/api/store_order.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import request from '@/utils/request'
-
-// 订单表列表
-export function apiStoreOrderLists(params: any) {
-    return request.get({ url: '/store_order/storeorder/lists', params })
-}
-
-// 添加订单表
-export function apiStoreOrderAdd(params: any) {
-    return request.post({ url: '/store_order/storeorder/add', params })
-}
-
-// 编辑订单表
-export function apiStoreOrderEdit(params: any) {
-    return request.post({ url: '/store_order/storeorder/edit', params })
-}
-
-// 删除订单表
-export function apiStoreOrderDelete(params: any) {
-    return request.post({ url: '/store_order/storeorder/delete', params })
-}
-
-// 订单表详情
-export function apiStoreOrderDetail(params: any) {
-    return request.get({ url: '/store_order/storeorder/detail', params })
-}
-
-// 订单商品详情
-export function apiStoreOrderCartInfo(params: any) {
-    return request.get({ url: '/store_order_cart_info/StoreOrderCartInfo/lists', params })
-}
-// 订单商品详情
-export function apiStoreOrderCartInfoTwo(params: any) {
-    return request.get({ url: '/store_order_cart_info/StoreOrderCartInfo/listsTwo', params })
-}
-
-export function apiStoreOrderTitle() {
-    return request.get({ url: '/store_order/storeOrder/title' })
-}
-
-// 退款订单列表
-export function apiStoreRefundOrderLists(params: any) {
-    return request.get({ url: '/store_order/StoreOrder/refund_order', params })
-}
-
-// 退款订单详情
-export function apiStoreRefundOrderDetail(params: any) {
-    return request.get({ url: '/store_order/storeRefundOrder/detail', params })
-}
-
-// 订单退款
-export function apiStoreOrderRefund(params: any) {
-    return request.post({ url: '/store_order/storeOrder/refund', params })
-}
-// 订单核销
-export function apiStoreOrderWriteoffOrder(params: any) {
-    return request.post({ url: '/store_order/storeOrder/writeoff_order', params })
-}
-// 设置配送员
-export function apiStoreOrderSetDelivery(params: any) {
-    return request.post({ url: '/store_order/storeorder/set_delivery', params })
-}
-// 导出配送表格
-export function apiStoreOrderExport(params: any) {
-    return request.post({ url: '/store_order/storeorder/export', params })
-}
-// 导出标签
-export function apiStoreOrderExportTags(params: any) {
-    return request.post({ url: '/store_order/storeorder/export_tags', params })
-}
-// 导出配送表格2
-export function apiStoreOrderInfoExport(params: any) {
-    return request.post({ url: '/store_order_cart_info/storeordercartinfo/export', params })
-}
-// 生成出库表单
-export function createOutboundOrder(params: any) {
-    return request.post({ url: '/store_order/storeorder/createOutboundOrder', params })
-}
-
-// 编辑订单商品
-export function apiStoreOrderCartInfoEdit(params: any) {
-    return request.post({ url: '/store_order_cart_info/StoreOrderCartInfo/edit', params })
-}
-// 添加订单商品
-export function apiStoreOrderCartInfoAdd(params: any) {
-    return request.post({ url: '/store_order_cart_info/StoreOrderCartInfo/add', params })
-}
-// 删除订单商品
-export function apiStoreOrderCartInfoDel(params: any) {
-    return request.post({ url: '/store_order_cart_info/StoreOrderCartInfo/del', params })
-}
-export function apiStoreOrderSetSystemStore(params: any) {
-    return request.post({ url: '/store_order/storeorder/setSystemStore', params })
-}
diff --git a/src/api/store_product.ts b/src/api/store_product.ts
deleted file mode 100644
index e705c058f..000000000
--- a/src/api/store_product.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import request from '@/utils/request'
-
-// 商品表列表
-export function apiStoreProductLists(params: any) {
-    return request.get({ url: '/store_product/storeproduct/lists', params })
-}
-
-// 添加商品表
-export function apiStoreProductAdd(params: any) {
-    return request.post({ url: '/store_product/storeproduct/add', params })
-}
-
-// 编辑商品表
-export function apiStoreProductEdit(params: any) {
-    return request.post({ url: '/store_product/storeproduct/edit', params })
-}
-// 商品状态
-export function apiStoreProductStatus(params: any) {
-    return request.post({ url: '/store_product/storeproduct/status', params })
-}
-
-// 删除商品表
-export function apiStoreProductDelete(params: any) {
-    return request.post({ url: '/store_product/storeproduct/delete', params })
-}
-
-// 商品表详情
-export function apiStoreProductDetail(params: any) {
-    return request.get({ url: '/store_product/storeproduct/detail', params })
-}
-
-// 复制商品到门店
-export function apiStoreProductImport(params: any) {
-    return request.post({ url: '/store_product/storeproduct/import', params })
-}
-// 复制商品到门店
-export function apiStoreProductCopy(params: any) {
-    return request.post({ url: '/store_product/storeproduct/copy', params })
-}
diff --git a/src/api/store_product_attr_value.ts b/src/api/store_product_attr_value.ts
deleted file mode 100644
index 25cfb5e08..000000000
--- a/src/api/store_product_attr_value.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 商品属性值表列表
-export function apiStoreProductAttrValueLists(params: any) {
-    return request.get({ url: '/store_product_attr_value/storeproductattrvalue/lists', params })
-}
-
-// 添加商品属性值表
-export function apiStoreProductAttrValueAdd(params: any) {
-    return request.post({ url: '/store_product_attr_value/storeproductattrvalue/add', params })
-}
-
-// 编辑商品属性值表
-export function apiStoreProductAttrValueEdit(params: any) {
-    return request.post({ url: '/store_product_attr_value/storeproductattrvalue/edit', params })
-}
-
-// 删除商品属性值表
-export function apiStoreProductAttrValueDelete(params: any) {
-    return request.post({ url: '/store_product_attr_value/storeproductattrvalue/delete', params })
-}
-
-// 商品属性值表详情
-export function apiStoreProductAttrValueDetail(params: any) {
-    return request.get({ url: '/store_product_attr_value/storeproductattrvalue/detail', params })
-}
diff --git a/src/api/store_product_group_price.ts b/src/api/store_product_group_price.ts
deleted file mode 100644
index cb4ed8d1b..000000000
--- a/src/api/store_product_group_price.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 分组报价列表
-export function apiStoreProductGroupPriceLists(params: any) {
-    return request.get({ url: '/store_product_group_price/storeproductgroupprice/lists', params })
-}
-
-// 添加分组报价
-export function apiStoreProductGroupPriceAdd(params: any) {
-    return request.post({ url: '/store_product_group_price/storeproductgroupprice/add', params })
-}
-
-// 编辑分组报价
-export function apiStoreProductGroupPriceEdit(params: any) {
-    return request.post({ url: '/store_product_group_price/storeproductgroupprice/edit', params })
-}
-
-// 删除分组报价
-export function apiStoreProductGroupPriceDelete(params: any) {
-    return request.post({ url: '/store_product_group_price/storeproductgroupprice/delete', params })
-}
-
-// 分组报价详情
-export function apiStoreProductGroupPriceDetail(params: any) {
-    return request.get({ url: '/store_product_group_price/storeproductgroupprice/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/store_product_low_stock.ts b/src/api/store_product_low_stock.ts
deleted file mode 100644
index 591c4bfda..000000000
--- a/src/api/store_product_low_stock.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 商品缺库存表列表
-export function apiStoreProductLowStockLists(params: any) {
-    return request.get({ url: '/store_product_low_stock/storeproductlowstock/lists', params })
-}
-
-// 添加商品缺库存表
-export function apiStoreProductLowStockAdd(params: any) {
-    return request.post({ url: '/store_product_low_stock/storeproductlowstock/add', params })
-}
-
-// 编辑商品缺库存表
-export function apiStoreProductLowStockEdit(params: any) {
-    return request.post({ url: '/store_product_low_stock/storeproductlowstock/edit', params })
-}
-
-// 删除商品缺库存表
-export function apiStoreProductLowStockDelete(params: any) {
-    return request.post({ url: '/store_product_low_stock/storeproductlowstock/delete', params })
-}
-
-// 商品缺库存表详情
-export function apiStoreProductLowStockDetail(params: any) {
-    return request.get({ url: '/store_product_low_stock/storeproductlowstock/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/store_product_price.ts b/src/api/store_product_price.ts
deleted file mode 100644
index ad09d9da7..000000000
--- a/src/api/store_product_price.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-// 商品价格更改列表
-export function apiStoreProductPriceLists(params: any) {
-    return request.get({ url: '/store_product_price/storeproductprice/lists', params })
-}
-
-// 添加商品价格更改
-export function apiStoreProductPriceAdd(params: any) {
-    return request.post({ url: '/store_product_price/storeproductprice/add', params })
-}
-
-// 编辑商品价格更改
-export function apiStoreProductPriceEdit(params: any) {
-    return request.post({ url: '/store_product_price/storeproductprice/edit', params })
-}
-
-// 删除商品价格更改
-export function apiStoreProductPriceDelete(params: any) {
-    return request.post({ url: '/store_product_price/storeproductprice/delete', params })
-}
-// 确认改价
-export function apiStoreProductPriceEnterPrice(params: any) {
-    return request.post({ url: '/store_product_price/storeproductprice/enterPrice', params })
-}
-
-// 商品价格更改详情
-export function apiStoreProductPriceDetail(params: any) {
-    return request.get({ url: '/store_product_price/storeproductprice/detail', params })
-}
-
-export function apiStoreProductPriceExport(params: any) {
-    return request.post({ url: '/store_product_price/storeproductprice/export', params })
-}
diff --git a/src/api/store_product_price_list.ts b/src/api/store_product_price_list.ts
deleted file mode 100644
index 7afa34ab1..000000000
--- a/src/api/store_product_price_list.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 分组报价列表
-export function apiStoreProductPriceListLists(params: any) {
-    return request.get({ url: '/store_product_price_list/storeproductpricelist/lists', params })
-}
-
-// 添加分组报价
-export function apiStoreProductPriceListAdd(params: any) {
-    return request.post({ url: '/store_product_price_list/storeproductpricelist/add', params })
-}
-
-// 编辑分组报价
-export function apiStoreProductPriceListEdit(params: any) {
-    return request.post({ url: '/store_product_price_list/storeproductpricelist/edit', params })
-}
-
-// 删除分组报价
-export function apiStoreProductPriceListDelete(params: any) {
-    return request.post({ url: '/store_product_price_list/storeproductpricelist/delete', params })
-}
-
-// 分组报价详情
-export function apiStoreProductPriceListDetail(params: any) {
-    return request.get({ url: '/store_product_price_list/storeproductpricelist/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/store_product_unit.ts b/src/api/store_product_unit.ts
deleted file mode 100644
index 2a9a16ce7..000000000
--- a/src/api/store_product_unit.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 计量单位列表
-export function apiStoreProductUnitLists(params: any) {
-    return request.get({ url: '/store_product_unit/storeproductunit/lists', params })
-}
-
-// 添加计量单位
-export function apiStoreProductUnitAdd(params: any) {
-    return request.post({ url: '/store_product_unit/storeproductunit/add', params })
-}
-
-// 编辑计量单位
-export function apiStoreProductUnitEdit(params: any) {
-    return request.post({ url: '/store_product_unit/storeproductunit/edit', params })
-}
-
-// 删除计量单位
-export function apiStoreProductUnitDelete(params: any) {
-    return request.post({ url: '/store_product_unit/storeproductunit/delete', params })
-}
-
-// 计量单位详情
-export function apiStoreProductUnitDetail(params: any) {
-    return request.get({ url: '/store_product_unit/storeproductunit/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/supplier.ts b/src/api/supplier.ts
deleted file mode 100644
index 01c7448bf..000000000
--- a/src/api/supplier.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 供应商户表列表
-export function apiSupplierLists(params: any) {
-    return request.get({ url: '/supplier/supplier/lists', params })
-}
-
-// 添加供应商户表
-export function apiSupplierAdd(params: any) {
-    return request.post({ url: '/supplier/supplier/add', params })
-}
-
-// 编辑供应商户表
-export function apiSupplierEdit(params: any) {
-    return request.post({ url: '/supplier/supplier/edit', params })
-}
-
-// 删除供应商户表
-export function apiSupplierDelete(params: any) {
-    return request.post({ url: '/supplier/supplier/delete', params })
-}
-
-// 供应商户表详情
-export function apiSupplierDetail(params: any) {
-    return request.get({ url: '/supplier/supplier/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/system_store.ts b/src/api/system_store.ts
deleted file mode 100644
index 0db3cb939..000000000
--- a/src/api/system_store.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import request from '@/utils/request'
-
-// 门店列表列表
-export function apiSystemStoreLists(params: any) {
-    return request.get({ url: '/system_store/systemstore/lists', params })
-}
-
-// 添加门店列表
-export function apiSystemStoreAdd(params: any) {
-    return request.post({ url: '/system_store/systemstore/add', params })
-}
-
-// 编辑门店列表
-export function apiSystemStoreEdit(params: any) {
-    return request.post({ url: '/system_store/systemstore/edit', params })
-}
-
-// 删除门店列表
-export function apiSystemStoreDelete(params: any) {
-    return request.post({ url: '/system_store/systemstore/delete', params })
-}
-
-// 门店列表详情
-export function apiSystemStoreDetail(params: any) {
-    return request.get({ url: '/system_store/systemstore/detail', params })
-}
-
-// 根据商品来源获取门店
-export function apiSourceProductStoreLists(params: any) {
-    return request.get({ url: '/system_store/systemstore/source_product_store_lists', params })
-}
-
-// 根据商品编辑门店库存
-export function apiStoreBranchProductEdit(params: any) {
-    return request.post({ url: '/store_branch_product/StoreBranchProduct/edit', params })
-}
-
-// 根据商品编辑门店库存
-export function apiStoreBranchProductEditPrice(params: any) {
-    return request.post({ url: '/store_branch_product/StoreBranchProduct/edit_price', params })
-}
-
-// 运营概况-头部统计
-export function apiSystemStoreStatisticsHeader(params: any) {
-    return request.get({ url: '/system_store/SystemStoreStatistics/header', params })
-}
-
-// 运营概况-营业趋势
-export function apiSystemStoreStatisticsOperate(params: any) {
-    return request.get({ url: '/system_store/SystemStoreStatistics/operate', params })
-}
-
-// 运营概况-交易/类型数据
-export function apiSystemStoreStatisticsOrderChart(params: any) {
-    return request.get({ url: '/system_store/SystemStoreStatistics/orderChart', params })
-}
-
-// 运营概况-门店业绩
-export function apiSystemStoreStatisticsStore(params: any) {
-    return request.get({ url: '/system_store/SystemStoreStatistics/store', params })
-}
-
-// 门店交易统计
-export function apiWorkbenchStoreIndex(params: any) {
-    return request.get({ url: '/workbench/store_index', params })
-}
diff --git a/src/api/system_store_storage.ts b/src/api/system_store_storage.ts
deleted file mode 100644
index 975d02fcb..000000000
--- a/src/api/system_store_storage.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import request from '@/utils/request'
-
-// 门店入库操作列表
-export function apiSystemStoreStorageLists(params: any) {
-    return request.get({ url: '/system_store_storage/systemstorestorage/lists', params })
-}
-
-// 添加门店入库操作
-export function apiSystemStoreStorageAdd(params: any) {
-    return request.post({ url: '/system_store_storage/systemstorestorage/add', params })
-}
-
-// 编辑门店入库操作
-export function apiSystemStoreStorageEdit(params: any) {
-    return request.post({ url: '/system_store_storage/systemstorestorage/edit', params })
-}
-
-// 删除门店入库操作
-export function apiSystemStoreStorageDelete(params: any) {
-    return request.post({ url: '/system_store_storage/systemstorestorage/delete', params })
-}
-
-// 门店入库操作详情
-export function apiSystemStoreStorageDetail(params: any) {
-    return request.get({ url: '/system_store_storage/systemstorestorage/detail', params })
-}
-
-// 门店一键确认入库
-export function apiSystemStoreStorageBatchConfirm(params: any) {
-    return request.post({ url: '/system_store_storage/systemstorestorage/batchConfirm', params })
-}
-
-export function apiSystemStoreStorageRollback(params: any) {
-    return request.post({ url: '/system_store_storage/systemstorestorage/rollback', params })
-}
\ No newline at end of file
diff --git a/src/api/user_bill.ts b/src/api/user_bill.ts
deleted file mode 100644
index d2f7b803f..000000000
--- a/src/api/user_bill.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 用户账单表列表
-export function apiUserBillLists(params: any) {
-    return request.get({ url: '/user_bill/userbill/lists', params })
-}
-
-// 添加用户账单表
-export function apiUserBillAdd(params: any) {
-    return request.post({ url: '/user_bill/userbill/add', params })
-}
-
-// 编辑用户账单表
-export function apiUserBillEdit(params: any) {
-    return request.post({ url: '/user_bill/userbill/edit', params })
-}
-
-// 删除用户账单表
-export function apiUserBillDelete(params: any) {
-    return request.post({ url: '/user_bill/userbill/delete', params })
-}
-
-// 用户账单表详情
-export function apiUserBillDetail(params: any) {
-    return request.get({ url: '/user_bill/userbill/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/user_label.ts b/src/api/user_label.ts
deleted file mode 100644
index ba0e26c98..000000000
--- a/src/api/user_label.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 用户标签表列表
-export function apiUserLabelLists(params: any) {
-    return request.get({ url: '/user_label/userlabel/lists', params })
-}
-
-// 添加用户标签表
-export function apiUserLabelAdd(params: any) {
-    return request.post({ url: '/user_label/userlabel/add', params })
-}
-
-// 编辑用户标签表
-export function apiUserLabelEdit(params: any) {
-    return request.post({ url: '/user_label/userlabel/edit', params })
-}
-
-// 删除用户标签表
-export function apiUserLabelDelete(params: any) {
-    return request.post({ url: '/user_label/userlabel/delete', params })
-}
-
-// 用户标签表详情
-export function apiUserLabelDetail(params: any) {
-    return request.get({ url: '/user_label/userlabel/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/user_product_storage.ts b/src/api/user_product_storage.ts
deleted file mode 100644
index 83b6b2c3b..000000000
--- a/src/api/user_product_storage.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 用户商品储存列表
-export function apiUserProductStorageLists(params: any) {
-    return request.get({ url: '/user_product_storage/userproductstorage/lists', params })
-}
-
-// 添加用户商品储存
-export function apiUserProductStorageAdd(params: any) {
-    return request.post({ url: '/user_product_storage/userproductstorage/add', params })
-}
-
-// 编辑用户商品储存
-export function apiUserProductStorageEdit(params: any) {
-    return request.post({ url: '/user_product_storage/userproductstorage/edit', params })
-}
-
-// 删除用户商品储存
-export function apiUserProductStorageDelete(params: any) {
-    return request.post({ url: '/user_product_storage/userproductstorage/delete', params })
-}
-
-// 用户商品储存详情
-export function apiUserProductStorageDetail(params: any) {
-    return request.get({ url: '/user_product_storage/userproductstorage/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/user_product_storage_log.ts b/src/api/user_product_storage_log.ts
deleted file mode 100644
index 995cfe247..000000000
--- a/src/api/user_product_storage_log.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 用户商品储存操作日志列表
-export function apiUserProductStorageLogLists(params: any) {
-    return request.get({ url: '/user_product_storage_log/userproductstoragelog/lists', params })
-}
-
-// 添加用户商品储存操作日志
-export function apiUserProductStorageLogAdd(params: any) {
-    return request.post({ url: '/user_product_storage_log/userproductstoragelog/add', params })
-}
-
-// 编辑用户商品储存操作日志
-export function apiUserProductStorageLogEdit(params: any) {
-    return request.post({ url: '/user_product_storage_log/userproductstoragelog/edit', params })
-}
-
-// 删除用户商品储存操作日志
-export function apiUserProductStorageLogDelete(params: any) {
-    return request.post({ url: '/user_product_storage_log/userproductstoragelog/delete', params })
-}
-
-// 用户商品储存操作日志详情
-export function apiUserProductStorageLogDetail(params: any) {
-    return request.get({ url: '/user_product_storage_log/userproductstoragelog/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/user_recharge.ts b/src/api/user_recharge.ts
deleted file mode 100644
index c0274b1ac..000000000
--- a/src/api/user_recharge.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import request from '@/utils/request'
-
-// 用户充值表列表
-export function apiUserRechargeLists(params: any) {
-    return request.get({ url: '/user_recharge/userrecharge/lists', params })
-}
-
-// 添加用户充值表
-export function apiUserRechargeAdd(params: any) {
-    return request.post({ url: '/user_recharge/userrecharge/add', params })
-}
-
-// 编辑用户充值表
-export function apiUserRechargeEdit(params: any) {
-    return request.post({ url: '/user_recharge/userrecharge/edit', params })
-}
-
-// 删除用户充值表
-export function apiUserRechargeDelete(params: any) {
-    return request.post({ url: '/user_recharge/userrecharge/delete', params })
-}
-
-// 用户充值表详情
-export function apiUserRechargeDetail(params: any) {
-    return request.get({ url: '/user_recharge/userrecharge/detail', params })
-}
-
-// 充值订单退款
-export function apiUserRechargeRefund(params: any) {
-    return request.post({ url: '/user_recharge/userrecharge/refund', params })
-}
diff --git a/src/api/user_ship.ts b/src/api/user_ship.ts
deleted file mode 100644
index 15b85a42d..000000000
--- a/src/api/user_ship.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 会员类型列表
-export function apiUserShipLists(params: any) {
-    return request.get({ url: '/user_ship/usership/lists', params })
-}
-
-// 添加会员类型
-export function apiUserShipAdd(params: any) {
-    return request.post({ url: '/user_ship/usership/add', params })
-}
-
-// 编辑会员类型
-export function apiUserShipEdit(params: any) {
-    return request.post({ url: '/user_ship/usership/edit', params })
-}
-
-// 删除会员类型
-export function apiUserShipDelete(params: any) {
-    return request.post({ url: '/user_ship/usership/delete', params })
-}
-
-// 会员类型详情
-export function apiUserShipDetail(params: any) {
-    return request.get({ url: '/user_ship/usership/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/warehouse.ts b/src/api/warehouse.ts
deleted file mode 100644
index 1acb20d8b..000000000
--- a/src/api/warehouse.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 仓库信息列表
-export function apiWarehouseLists(params: any) {
-    return request.get({ url: '/warehouse/warehouse/lists', params })
-}
-
-// 添加仓库信息
-export function apiWarehouseAdd(params: any) {
-    return request.post({ url: '/warehouse/warehouse/add', params })
-}
-
-// 编辑仓库信息
-export function apiWarehouseEdit(params: any) {
-    return request.post({ url: '/warehouse/warehouse/edit', params })
-}
-
-// 删除仓库信息
-export function apiWarehouseDelete(params: any) {
-    return request.post({ url: '/warehouse/warehouse/delete', params })
-}
-
-// 仓库信息详情
-export function apiWarehouseDetail(params: any) {
-    return request.get({ url: '/warehouse/warehouse/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/warehouse_order.ts b/src/api/warehouse_order.ts
deleted file mode 100644
index 3c26eda26..000000000
--- a/src/api/warehouse_order.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '@/utils/request'
-
-// 商品仓储订单列表
-export function apiWarehouseOrderLists(params: any) {
-    return request.get({ url: '/warehouse_order/warehouseorder/lists', params })
-}
-
-// 添加商品仓储订单
-export function apiWarehouseOrderAdd(params: any) {
-    return request.post({ url: '/warehouse_order/warehouseorder/add', params })
-}
-
-// 添加出库单
-export function apiWarehouseOrderOutbound(params: any) {
-    return request.post({ url: '/warehouse_order/warehouseorder/outbound', params })
-}
-// 编辑商品仓储订单
-export function apiWarehouseOrderEdit(params: any) {
-    return request.post({ url: '/warehouse_order/warehouseorder/edit', params })
-}
-
-// 删除商品仓储订单
-export function apiWarehouseOrderDelete(params: any) {
-    return request.post({ url: '/warehouse_order/warehouseorder/delete', params })
-}
-
-// 商品仓储订单详情
-export function apiWarehouseOrderDetail(params: any) {
-    return request.get({ url: '/warehouse_order/warehouseorder/detail', params })
-}
-// 导出商品仓储入库订单
-export function apiWarehouseOrderRentryExport(params: any) {
-    return request.post({ url: '/warehouse_order/warehouseorder/rentry_export', params })
-}
-// 导出商品仓储出库订单
-export function apiWarehouseOrderExport(params: any) {
-    return request.post({ url: '/warehouse_order/warehouseorder/export', params })
-}
-// 编辑商品仓储订单
-export function apiWarehouseOrderUpdateEdit(params: any) {
-    return request.post({ url: '/warehouse_order/warehouseorder/update_edit', params })
-}
-// 导出商品标签
-export function apiWarehouseOrderExportTags(params: any) {
-    return request.post({ url: '/warehouse_order/warehouseorder/export_tags', params })
-}
diff --git a/src/api/warehouse_product.ts b/src/api/warehouse_product.ts
deleted file mode 100644
index 1cd625177..000000000
--- a/src/api/warehouse_product.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import request from '@/utils/request'
-
-// 商品仓储信息列表
-export function apiWarehouseProductLists(params: any) {
-    return request.get({ url: '/warehouse_product/warehouseproduct/lists', params })
-}
-
-// 添加商品仓储信息
-export function apiWarehouseProductAdd(params: any) {
-    return request.post({ url: '/warehouse_product/warehouseproduct/add', params })
-}
-
-// 编辑商品仓储信息
-export function apiWarehouseProductEdit(params: any) {
-    return request.post({ url: '/warehouse_product/warehouseproduct/edit', params })
-}
-
-// 删除商品仓储信息
-export function apiWarehouseProductDelete(params: any) {
-    return request.post({ url: '/warehouse_product/warehouseproduct/delete', params })
-}
-
-// 商品仓储信息详情
-export function apiWarehouseProductDetail(params: any) {
-    return request.get({ url: '/warehouse_product/warehouseproduct/detail', params })
-}
-// 商品仓储信息确认
-export function apiWarehouseProductEnter(params: any) {
-    return request.post({ url: '/warehouse_product/warehouseproduct/enter', params })
-}
-//商品结算
-export function apiWarehouseProductSettlement(params: any) {
-    return request.post({ url: '/warehouse_product/warehouseproduct/settlement', params })
-}
-
-/**
- * 重置出入库
- * @param params
- * @returns
- */
-export function apiWarehouseProductSetNums(params: any) {
-    return request.post({ url: '/warehouse_product/warehouseproduct/set_nums', params })
-}
diff --git a/src/api/warehouse_product_return.ts b/src/api/warehouse_product_return.ts
deleted file mode 100644
index 67543b7a8..000000000
--- a/src/api/warehouse_product_return.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 仓库商品退货处理列表
-export function apiWarehouseProductReturnLists(params: any) {
-    return request.get({ url: '/warehouse_product_return/warehouseproductreturn/lists', params })
-}
-
-// 添加仓库商品退货处理
-export function apiWarehouseProductReturnAdd(params: any) {
-    return request.post({ url: '/warehouse_product_return/warehouseproductreturn/add', params })
-}
-
-// 编辑仓库商品退货处理
-export function apiWarehouseProductReturnEdit(params: any) {
-    return request.post({ url: '/warehouse_product_return/warehouseproductreturn/edit', params })
-}
-
-// 删除仓库商品退货处理
-export function apiWarehouseProductReturnDelete(params: any) {
-    return request.post({ url: '/warehouse_product_return/warehouseproductreturn/delete', params })
-}
-
-// 仓库商品退货处理详情
-export function apiWarehouseProductReturnDetail(params: any) {
-    return request.get({ url: '/warehouse_product_return/warehouseproductreturn/detail', params })
-}
\ No newline at end of file
diff --git a/src/api/warehouse_product_storege.ts b/src/api/warehouse_product_storege.ts
deleted file mode 100644
index 32dc7854c..000000000
--- a/src/api/warehouse_product_storege.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import request from '@/utils/request'
-
-// 仓库商品存储列表
-export function apiWarehouseProductStoregeLists(params: any) {
-    return request.get({ url: '/warehouse_product_storege/warehouseproductstorege/lists', params })
-}
-
-// 添加仓库商品存储
-export function apiWarehouseProductStoregeAdd(params: any) {
-    return request.post({ url: '/warehouse_product_storege/warehouseproductstorege/add', params })
-}
-
-// 编辑仓库商品存储
-export function apiWarehouseProductStoregeEdit(params: any) {
-    return request.post({ url: '/warehouse_product_storege/warehouseproductstorege/edit', params })
-}
-
-// 删除仓库商品存储
-export function apiWarehouseProductStoregeDelete(params: any) {
-    return request.post({
-        url: '/warehouse_product_storege/warehouseproductstorege/delete',
-        params
-    })
-}
-
-// 仓库商品存储详情
-export function apiWarehouseProductStoregeDetail(params: any) {
-    return request.get({ url: '/warehouse_product_storege/warehouseproductstorege/detail', params })
-}
-
-/**
- * 是否强制校验
- * @param params
- * @returns
- */
-export function apiWarehouseProductStoregeVerify(params: any) {
-    return request.post({
-        url: '/warehouse_product_storege/warehouseproductstorege/verify',
-        params
-    })
-}
diff --git a/src/api/wechat_query.ts b/src/api/wechat_query.ts
deleted file mode 100644
index 753579579..000000000
--- a/src/api/wechat_query.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import request from '@/utils/request'
-
-// 微信支付查询
-export function apiWechatQuery(params: any) {
-    return request.get({ url: '/index/wechatQuery', params })
-}
\ No newline at end of file
diff --git a/src/api/workbench.ts b/src/api/workbench.ts
index ed713a131..17b5266af 100644
--- a/src/api/workbench.ts
+++ b/src/api/workbench.ts
@@ -19,60 +19,3 @@ export function apiGetProductRanking(params: any) {
 export function apiGetUserBasic(params: any) {
     return request.get({ url: '/workbench/get_user_basic', params })
 }
-
-// 用户趋势
-export function apiGetUserTrend(params: any) {
-    return request.get({ url: '/workbench/get_user_trend', params })
-}
-
-// 交易趋势
-export function apiGetBottomTrade(params: any) {
-    return request.get({ url: '/workbench/bottom_trade', params })
-}
-
-// 当日订单金额
-export function apiGetTopTrade(params: any) {
-    return request.get({ url: '/workbench/top_trade', params })
-}
-// 实时订单商品合计统计
-export function product_order(params: any) {
-    return request.get({ url: '/workbench/product_order', params })
-}
-// 实时订单商品合计统计
-export function product_month_order(params: any) {
-    return request.get({ url: '/workbench/product_month_order', params })
-}
-// 实时订单商品合计统计
-export function store_order_cart_info_curve(params: any) {
-    return request.get({ url: '/store_order_cart_info/StoreOrderCartInfo/curve', params })
-}
-
-// 仓库头部统计
-export function total_warehouse(params: any) {
-    return request.get({ url: '/workbench/total_warehouse', params })
-}
-// 仓库列表统计
-export function warehouse_list(params: any) {
-    return request.get({ url: '/workbench/warehouse_list', params })
-}
-// 门店和仓库列表统计
-export function total_warehouse_list(params: any) {
-    return request.get({ url: '/workbench/total_warehouse_list', params })
-}
-// 已结算 未结算列表统计
-export function total_warehouse_product_list(params: any) {
-    return request.get({ url: '/workbench/total_warehouse_product_list', params })
-}
-// 负库存列表统计
-export function negative_inventory(params: any) {
-    return request.get({ url: '/workbench/negative_inventory', params })
-}
-
-// 负库存列表统计
-export function update_negative_zero(params: any) {
-    return request.get({ url: '/workbench/update_negative_zero', params })
-}
-// 负库存列表统计
-export function stock_product_price(params: any) {
-    return request.get({ url: '/workbench/stock_product_price', params })
-}
diff --git a/src/views/activity_zone/component/productPop.vue b/src/views/activity_zone/component/productPop.vue
deleted file mode 100644
index ef2142d8d..000000000
--- a/src/views/activity_zone/component/productPop.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-	<div>
-		<el-form class="mb-[-16px]" :model="queryParams" inline>
-			<el-form-item label="商品名称" prop="store_name">
-				<el-input class="w-[200px]" v-model="queryParams.store_name" @keydown.enter="productList" clearable
-					placeholder="请输入商品名称" />
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" @click="resetPage">查询</el-button>
-				<el-button @click="resetParams">重置</el-button>
-			</el-form-item>
-		</el-form>
-		<div class="mt-4" v-loading="pager.loading">
-			<el-table :data="pager.lists" @selection-change="handleSelectionChange" :height="300">
-				<el-table-column type="selection" width="55" />
-				<el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-				<el-table-column label="商品图片" prop="image" min-width="80">
-					<template #default="{ row }">
-						<el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
-					</template>
-				</el-table-column>
-				<el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
-				<el-table-column label="分类" prop="cate_name" min-width="120" show-overflow-tooltip />
-				<el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
-				<el-table-column label="商品价格" prop="price" min-width="100" show-overflow-tooltip />
-				<el-table-column label="仓库库存" prop="stock" min-width="100" show-overflow-tooltip />
-			</el-table>
-		</div>
-		<div class="flex mt-4 justify-end">
-			<pagination v-model="pager" @change="getLists" />
-		</div>
-		<el-button class="w-full mt-4" type="primary" @click="bindStore">添加商品</el-button>
-	</div>
-</template>
-
-<script lang="ts" setup name="systemStoreLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { apiStoreProductLists } from '@/api/store_product'
-
-	import { ElMessage } from 'element-plus'
-	import { defineProps } from 'vue';
-
-	const props = defineProps({
-		activityZoneFormId: Number
-	});
-
-	// 查询条件
-	const queryParams = reactive({
-		store_name: '',
-		is_warehouse: 1,
-		activity_zone_form_id: props.activityZoneFormId
-	})
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-	const datas = ref()
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	const productList = (e) => {
-		getLists()
-		e.preventDefault();
-	}
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiStoreProductLists,
-		params: queryParams
-	})
-	getLists()
-
-	const emits = defineEmits(['onBindStore'])
-	// 绑定用户
-	const bindStore = () => {
-		const list = pager.lists.filter((item) => selectData.value.includes(item.id))
-		if (!list.length) return ElMessage.error('请先选择商品')
-		emits('onBindStore', list, queryParams.activity_zone_form_id)
-	}
-</script>
\ No newline at end of file
diff --git a/src/views/activity_zone/details.vue b/src/views/activity_zone/details.vue
deleted file mode 100644
index a1922c060..000000000
--- a/src/views/activity_zone/details.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="商品名称" prop="store_name">
-					<el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入商品名称" />
-				</el-form-item>
-
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<el-button v-perms="['activity_zone/add']" type="primary" @click="showProductModal()">
-				<template #icon>
-					<icon name="el-icon-Plus" />
-				</template>
-				新增
-			</el-button>
-			<div class="mt-4">
-				<el-table :data="pager.lists" @selection-change="handleSelectionChange">
-					<el-table-column type="selection" width="55" />
-					<el-table-column label="ID" prop="id" show-overflow-tooltip />
-					<el-table-column label="商品ID" prop="product_id" show-overflow-tooltip />
-					<el-table-column label="商品" prop="store_name" show-overflow-tooltip />
-					<el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-					<el-table-column label="操作" width="120" fixed="right">
-						<template #default="{ row }">
-							<el-button v-perms="['activity_zone/delete']" type="danger" link
-								@click="handleDelete(row.id)">
-								删除
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<el-dialog v-model="showProduct" title="选择商品" width="70%">
-			<productPop :activityZoneFormId="queryParams.form_id" @onBindStore="onBindProduct"></productPop>
-		</el-dialog>
-	</div>
-</template>
-
-<script lang="ts" setup name="activityZoneLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import { apiActivityZoneLists, apiActivityZoneDelete, apiActivityZoneAdd } from '@/api/activity_zone'
-	import feedback from '@/utils/feedback'
-	import productPop from './component/productPop.vue'
-
-	const showProduct = ref(false) // 选择商品列表是否显示
-	
-	const route = useRoute()
-
-	// 查询条件
-	const queryParams = reactive({
-		form_id: route.query.id,
-		store_name: '',
-	})
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-	
-	// 选择商品
-	const onBindProduct = async(e: any[], formId: any) => {
-		let data = {
-			form_id: formId,
-			product_ids: []
-		}
-	    e.forEach((item: any) => {
-	        if (!data.product_ids.find((t: any) => t.id == item.id)) {
-	            data.product_ids.push(item.id)
-	        }
-	    })
-		await apiActivityZoneAdd(data)
-	    showProduct.value = false
-		getLists()
-	}
-	
-	const showProductModal = () => {
-		showProduct.value = true
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('activity_zone')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiActivityZoneLists,
-		params: queryParams
-	})
-	
-	// 删除
-	const handleDelete = async (id : number | any[]) => {
-		await feedback.confirm('确定要删除？')
-		await apiActivityZoneDelete({ id })
-		getLists()
-	}
-
-	getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/activity_zone/edit.vue b/src/views/activity_zone/edit.vue
deleted file mode 100644
index 0bad56e77..000000000
--- a/src/views/activity_zone/edit.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-	<div class="edit-popup">
-		<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-			@close="handleClose">
-			<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-				<el-form-item label="类型" prop="type">
-					<el-select v-model="formData.type" placeholder="请选择类型">
-						<el-option label="全部" value=""></el-option>
-						<el-option v-for="(item, index) in dictData.activity_zone" :key="index" :label="item.remark"
-							:value="item.value" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="表单标题" prop="title">
-					<el-input v-model="formData.title" clearable placeholder="请输入表单标题" />
-				</el-form-item>
-				<el-form-item label="商品分类" prop="cate_ids">
-					<el-cascader class="w-[500px]" v-model="formData.cate_ids" filterable clearable
-						:before-filter="beforeFilter" :props="props" placeholder="请选择商品分类" />
-				</el-form-item>
-				<el-form-item label="备注" prop="remark">
-					<el-input :rows="3" type="textarea" v-model="formData.remark" clearable placeholder="请输入备注" />
-				</el-form-item>
-			</el-form>
-		</popup>
-	</div>
-</template>
-
-<script lang="ts" setup name="categoryEdit">
-	import type { FormInstance } from 'element-plus'
-	import { apiStoreCategoryLists } from '@/api/store_category'
-	import { apiActivityZoneFormAdd, apiActivityZoneFormEdit } from '@/api/activity_zone_form'
-	import type { PropType } from 'vue'
-	defineProps({
-		dictData: {
-			type: Object as PropType<Record<string, any[]>>,
-			default: () => ({})
-		}
-	})
-	const emit = defineEmits(['success', 'close'])
-	const formRef = shallowRef<FormInstance>()
-	const popupRef = shallowRef<InstanceType<typeof Popup>>()
-	const mode = ref('add')
-
-	// 弹窗标题
-	const popupTitle = computed(() => {
-		return mode.value == 'edit' ? '编辑表单' : '新增表单'
-	})
-
-	// 表单数据
-	const formData = reactive({
-		type: '',
-		title: '',
-		cate_ids: [],
-		remark: '',
-	})
-
-	let resolves
-	let nodes
-	const flag = ref(false)
-	let name
-	const beforeFilter = (value) => {
-		name = value
-		flag.value = true
-		props.lazyLoad(nodes, resolves)
-		return false
-	}
-	const props = {
-		value: 'id',
-		label: 'name',
-		lazy: true,
-		multiple: true,
-		lazyLoad(node, resolve) {
-			if (!resolves) resolves = resolve
-			if (!nodes) nodes = node
-			const pid = node.value || 0
-			let data = {}
-			if (flag.value) {
-				data = { name: name }
-				if (!name) {
-					data = {
-						pid: pid,
-						page_size: 10000
-					}
-				}
-			} else {
-				data = {
-					pid: pid,
-					page_size: 10000
-				}
-			}
-			apiStoreCategoryLists({
-				...data
-			}).then((res) => {
-				resolve(
-					res.lists.map((item : any) => {
-						item.leaf = item.is_children == 0
-						flag.value = false
-						return item
-					})
-				)
-			})
-		}
-	}
-
-	// 表单验证
-	const formRules = reactive<any>({
-		type: [
-			{
-				required: true,
-				message: '请输入表单类型',
-				trigger: ['blur']
-			}
-		],
-		title: [
-			{
-				required: true,
-				message: '请输入表单名称',
-				trigger: ['blur']
-			}
-		],
-		cate_ids: [
-			{
-				required: true,
-				message: '请输入商品分类',
-				trigger: ['blur']
-			}
-		]
-	})
-
-	// 获取详情
-	const setFormData = async (data : Record<any, any>) => {
-		for (const key in formData) {
-			if (data[key] != null && data[key] != undefined) {
-				//@ts-ignore
-				formData[key] = data[key]
-			}
-		}
-	}
-
-	// 提交按钮
-	const handleSubmit = async () => {
-		await formRef.value?.validate()
-		const data = { ...formData }
-		mode.value == 'edit' ? await apiActivityZoneFormEdit(data) : await apiActivityZoneFormAdd(data)
-		popupRef.value?.close()
-		emit('success')
-	}
-
-	//打开弹窗
-	const open = (type = 'add') => {
-		mode.value = type
-		popupRef.value?.open()
-	}
-
-	// 关闭回调
-	const handleClose = () => {
-		emit('close')
-	}
-
-	defineExpose({
-		open,
-		setFormData
-	})
-</script>
\ No newline at end of file
diff --git a/src/views/activity_zone/index.vue b/src/views/activity_zone/index.vue
deleted file mode 100644
index 37ebdb0fb..000000000
--- a/src/views/activity_zone/index.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item class="w-[180px]" label="类型" prop="type">
-					<el-select v-model="queryParams.type" clearable placeholder="请选择类型">
-						<el-option label="全部" value=""></el-option>
-						<el-option v-for="(item, index) in dictData.activity_zone" :key="index" :label="item.remark"
-							:value="item.value" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="表单名称" prop="title">
-					<el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入表单名称" />
-				</el-form-item>
-
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<el-button v-perms="['activity_zone/add']" type="primary" @click="handleAdd">
-				<template #icon>
-					<icon name="el-icon-Plus" />
-				</template>
-				新增
-			</el-button>
-			<div class="mt-4">
-				<el-table :data="pager.lists" @selection-change="handleSelectionChange">
-					<el-table-column label="ID" prop="id" show-overflow-tooltip />
-					<el-table-column label="类型" prop="type">
-						<template #default="{ row }">
-							<div v-for="(item, index) in dictData.activity_zone">
-								<div v-if="item.value == row.type">{{item.remark}}</div>
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="标题" prop="title" show-overflow-tooltip />
-					<el-table-column label="商品分类" prop="cate_names" show-overflow-tooltip />
-					<el-table-column label="备注" prop="remark" show-overflow-tooltip />
-
-					<el-table-column label="操作" width="180" fixed="right">
-						<template #default="{ row }">
-							<router-link :to="{
-							        path: 'activity_zone_details',
-							        query: {
-							            id: row.id
-							        }
-							    }">
-								商品列表
-							</router-link>
-							<el-button v-perms="['activity_zone/export']" type="primary" link
-								@click="handleExport(row)">
-								导出
-							</el-button>
-							<el-button v-perms="['activity_zone/delete']" type="danger" link
-								@click="handleDelete(row.id)">
-								删除
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-	</div>
-</template>
-
-<script lang="ts" setup name="activityZoneLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import { apiActivityZoneFormLists, apiActivityZoneFormDelete, apiActivityZoneFormAdd, apiActivityZoneFormExport } from '@/api/activity_zone_form'
-	import { timeFormat } from '@/utils/util'
-	import feedback from '@/utils/feedback'
-	import productPop from './component/productPop.vue'
-	import EditPopup from './edit.vue'
-
-	const showProduct = ref(false) // 选择商品列表是否显示
-	const showRemark = ref(false)
-	const showEdit = ref(false)
-	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-
-
-	// 查询条件
-	const queryParams = reactive({
-		type: '',
-		title: '',
-	})
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('activity_zone')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiActivityZoneFormLists,
-		params: queryParams
-	})
-
-	const handleAdd = async () => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('add')
-	}
-
-	const handleEdit = async (data : any) => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('edit')
-		editRef.value?.setFormData(data)
-	}
-
-	// 删除
-	const handleDelete = async (id : number | any[]) => {
-		await feedback.confirm('确定要删除？')
-		await apiActivityZoneFormDelete({ id })
-		getLists()
-	}
-
-	const handleExport = (row : any) => {
-		showRemark.value = false
-		apiActivityZoneFormExport({
-			id: row.id
-		}).then((res) => {
-			window.open(res.url, '_blank')
-			ElMessage.success('导出成功')
-		})
-	}
-
-	getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/change_log/details.vue b/src/views/change_log/details.vue
deleted file mode 100644
index 13cf8a57d..000000000
--- a/src/views/change_log/details.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="模型" prop="model">
-                    <el-input v-model="formData.model" clearable placeholder="请输入模型" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="关联id" prop="link_id">
-                    <el-input v-model="formData.link_id" clearable placeholder="请输入关联id" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="类型" prop="pm">
-                    <el-select class="flex-1" v-model="formData.pm" clearable placeholder="请选择类型" :disabled="true">
-                        <el-option 
-                            v-for="(item, index) in dictData.business_status"
-                            :key="index" 
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="请求" prop="url">
-                    <el-input v-model="formData.url" clearable placeholder="请输入请求" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="备注" prop="mark">
-                    <el-input v-model="formData.mark" clearable placeholder="请输入备注" :readonly="true"/>
-                </el-form-item>

-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="changeLogDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiChangeLogAdd, apiChangeLogEdit, apiChangeLogDetail } from '@/api/change_log'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    model: '',
-    link_id: '',
-    nums: '',
-    pm: '',
-    url: '',
-    mark: '',

-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiChangeLogDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/change_log/edit.vue b/src/views/change_log/edit.vue
deleted file mode 100644
index 6b3f76a2c..000000000
--- a/src/views/change_log/edit.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="模型" prop="model">
-                    <el-input v-model="formData.model" clearable placeholder="请输入模型" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="关联id" prop="link_id">
-                    <el-input v-model="formData.link_id" clearable placeholder="请输入关联id" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="类型" prop="pm">
-                    <el-select class="flex-1" v-model="formData.pm" clearable placeholder="请选择类型" :disabled="false">
-                        <el-option 
-                            v-for="(item, index) in dictData.business_status"
-                            :key="index" 
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="请求" prop="url">
-                    <el-input v-model="formData.url" clearable placeholder="请输入请求" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="备注" prop="mark">
-                    <el-input v-model="formData.mark" clearable placeholder="请输入备注" :readonly="false"/>
-                </el-form-item>

-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="changeLogEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiChangeLogAdd, apiChangeLogEdit, apiChangeLogDetail } from '@/api/change_log'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑数据变更记录' : '新增数据变更记录'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    model: '',
-    link_id: '',
-    nums: '',
-    pm: '',
-    url: '',
-    mark: '',

-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiChangeLogDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiChangeLogEdit(data) 
-        : await apiChangeLogAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/change_log/index.vue b/src/views/change_log/index.vue
deleted file mode 100644
index 9b3c7b55a..000000000
--- a/src/views/change_log/index.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="模型" prop="model">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.model"
-                        clearable
-                        placeholder="请输入模型"
-                    />
-                </el-form-item>
-                <el-form-item label="关联id" prop="link_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.link_id"
-                        clearable
-                        placeholder="请输入关联id"
-                    />
-                </el-form-item>
-                <el-form-item class="w-[180px]" label="类型" prop="pm">
-                    <el-select v-model="queryParams.pm" clearable placeholder="请选择类型">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="其他" value="0"></el-option>
-                        <el-option label="增加" value="1"></el-option>
-                        <el-option label="减少" value="-1"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="请求" prop="url">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.url"
-                        clearable
-                        placeholder="请输入请求"
-                    />
-                </el-form-item>
-
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip width="100" />
-                    <el-table-column
-                        label="人员"
-                        prop="admin_name"
-                        show-overflow-tooltip
-                        width="100"
-                    />
-                    <el-table-column label="模型" prop="model" show-overflow-tooltip width="240" />
-                    <el-table-column
-                        label="关联id"
-                        prop="link_id"
-                        show-overflow-tooltip
-                        width="100"
-                    />
-                    <el-table-column label="数量" prop="nums" show-overflow-tooltip width="80" />
-                    <el-table-column label="类型" prop="pm" width="80">
-                        <template #default="{ row }">
-                            <span v-if="row.pm === 1">增加</span>
-                            <span v-if="row.pm === -1">减少</span>
-                            <span v-if="row.pm === 0">其他</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="请求" prop="url" show-overflow-tooltip width="300" />
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="changeLogLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiChangeLogLists, apiChangeLogDelete } from '@/api/change_log'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    model: '',
-    link_id: '',
-    nums: '',
-    pm: '',
-    url: '',
-    mark: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('business_status')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiChangeLogLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiChangeLogDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/delivery_service/details.vue b/src/views/delivery_service/details.vue
deleted file mode 100644
index 6820aaa0b..000000000
--- a/src/views/delivery_service/details.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="配送员uid" prop="uid">
-                    <el-input v-model="formData.uid" clearable placeholder="请输入配送员uid" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="配送员名称" prop="nickname">
-                    <el-input v-model="formData.nickname" clearable placeholder="请输入配送员名称" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phone">
-                    <el-input v-model="formData.phone" clearable placeholder="请输入手机号码" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-radio-group v-model="formData.status" placeholder="请选择状态" :disabled="true">
-                        <el-radio 
-                            v-for="(item, index) in dictData.show_status"
-                            :key="index"
-                            :label="parseInt(item.value)"
-                        >
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="deliveryServiceDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiDeliveryServiceAdd, apiDeliveryServiceEdit, apiDeliveryServiceDetail } from '@/api/delivery_service'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    uid: '',
-    nickname: '',
-    phone: '',
-    status: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiDeliveryServiceDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/delivery_service/edit.vue b/src/views/delivery_service/edit.vue
deleted file mode 100644
index fbdab1858..000000000
--- a/src/views/delivery_service/edit.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="配送员uid" prop="uid">
-                    <el-input v-model="formData.uid" clearable placeholder="请输入配送员uid" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="配送员名称" prop="nickname">
-                    <el-input v-model="formData.nickname" clearable placeholder="请输入配送员名称" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phone">
-                    <el-input v-model="formData.phone" clearable placeholder="请输入手机号码" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-radio-group v-model="formData.status" placeholder="请选择状态" :disabled="false">
-                        <el-radio 
-                            v-for="(item, index) in dictData.show_status"
-                            :key="index"
-                            :label="parseInt(item.value)"
-                        >
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="deliveryServiceEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiDeliveryServiceAdd, apiDeliveryServiceEdit, apiDeliveryServiceDetail } from '@/api/delivery_service'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑配送员表' : '新增配送员表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    uid: '',
-    nickname: '',
-    phone: '',
-    status: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    uid: [{
-        required: true,
-        message: '请输入配送员uid',
-        trigger: ['blur']
-    }],
-    nickname: [{
-        required: true,
-        message: '请输入配送员名称',
-        trigger: ['blur']
-    }],
-    phone: [{
-        required: true,
-        message: '请输入手机号码',
-        trigger: ['blur']
-    }]
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiDeliveryServiceDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiDeliveryServiceEdit(data) 
-        : await apiDeliveryServiceAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/delivery_service/index.vue b/src/views/delivery_service/index.vue
deleted file mode 100644
index 673c8ed12..000000000
--- a/src/views/delivery_service/index.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="配送员uid" prop="uid">
-                    <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入配送员uid" />
-                </el-form-item>
-                <el-form-item label="配送员名称" prop="nickname">
-                    <el-input class="w-[280px]" v-model="queryParams.nickname" clearable placeholder="请输入配送员名称" />
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phone">
-                    <el-input class="w-[280px]" v-model="queryParams.phone" clearable placeholder="请输入手机号码" />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-select 
-                     v-model="queryParams.status" clearable placeholder="请选择状态">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option 
-                            v-for="(item, index) in dictData.show_status"
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['delivery_service.delivery_service/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['delivery_service.delivery_service/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="配送员uid" prop="uid" show-overflow-tooltip />
-                    <el-table-column label="配送员名称" prop="nickname" show-overflow-tooltip />
-                    <el-table-column label="手机号码" prop="phone" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.show_status" :value="row.status" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['delivery_service.delivery_service/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['delivery_service.delivery_service/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="deliveryServiceLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiDeliveryServiceLists, apiDeliveryServiceDelete } from '@/api/delivery_service'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    uid: '',
-    nickname: '',
-    phone: '',
-    status: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('show_status')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiDeliveryServiceLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiDeliveryServiceDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
diff --git a/src/views/entryRecord/index.vue b/src/views/entryRecord/index.vue
deleted file mode 100644
index 94d37ce2c..000000000
--- a/src/views/entryRecord/index.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="随便搜">
-                            <el-select class="flex-1" v-model="queryParams.status" clearable placeholder="请选择商品状态">
-                                <el-option label="销售中" :value="0" />
-                                <el-option label="仓库中" :value="0" />
-                                <el-option label="已售罄" :value="0" />
-                                <el-option label="库存预警" :value="0" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="随便搜" prop="nature">
-                            <el-input v-model="queryParams.status" clearable placeholder="请输入商品名称" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" @click="resetPage">查询</el-button>
-                            <el-button @click="resetParams">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="入账门店" prop="progress" show-overflow-tooltip />
-                    <el-table-column label="入账时间" prop="progress" show-overflow-tooltip />
-                    <el-table-column label="应入帐金额" prop="progress" show-overflow-tooltip />
-                    <el-table-column label="已入账金额" prop="progress" show-overflow-tooltip />
-                    <el-table-column label="未入账金额" prop="progress" show-overflow-tooltip />
-                    <el-table-column label="操作" width="170" fixed="right">
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button type="primary" link @click="handleEdit(row)">
-                                起码子
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <!-- <detailPopup ref="editRef" /> -->
-    </div>
-</template>
-
-<script lang="ts" setup name="manageProjectLists">
-import { ref, reactive } from "vue"
-import { usePaging } from '@/hooks/usePaging'
-// import { apiGoodsListLists, apiStatus, apiGoodsTypeLists } from '@/api/goodsList'
-// import detailPopup from './detail.vue'
-
-// const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-// const showDetail = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    status: ""
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    // fetchFun: apiGoodsListLists,
-    params: queryParams
-})
-
-// 详情
-const handleEdit = async (data: any) => {
-    // editRef.value?.open()
-}
-
-// getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/finance/commission/index.vue b/src/views/finance/commission/index.vue
deleted file mode 100644
index 94c3667f7..000000000
--- a/src/views/finance/commission/index.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店" prop="store_id">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入门店id" /> -->
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="用户" prop="uid">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户id" /> -->
-                    <el-select
-                        v-model="queryParams.user_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入用户名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="`${item.nickname}  (ID:${item.id})`"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="时间" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        :shortcuts="shortcuts"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-button v-perms="['store_finance_flow.store_finance_flow/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-新增
-</el-button>
-<el-button v-perms="['store_finance_flow.store_finance_flow/delete']" :disabled="!selectData.length"
-    @click="handleDelete(selectData)">
-    删除
-</el-button> -->
-            <div>
-                <el-table
-                    :data="pager.lists"
-                    @selection-change="handleSelectionChange"
-                    row-key="id"
-                    :tree-props="{ children: 'list' }"
-                >
-                    <el-table-column label="ID" prop="id" min-width="100" show-overflow-tooltip />
-                    <el-table-column
-                        label="交易单号"
-                        prop="order_sn"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="交易时间"
-                        prop="create_time"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="金额"
-                        prop="number"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <span v-if="row.number > 0" class="text-success">{{ row.number }}</span>
-                            <span v-else class="text-danger">{{ row.number }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="门店名称" prop="store_name" show-overflow-tooltip />
-                    <el-table-column
-                        label="用户"
-                        prop="nickname"
-                        min-width="80"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="收益/扣除"
-                        prop="financial_type_name"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="支付方式" prop="pay_type_name" show-overflow-tooltip />
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <details-popup ref="detailsRef" :dict-data="dictData" />
-    </div>
-</template>
-
-<script lang="ts" setup name="storeFinanceFlowLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreFinanceFlowLists, apiStoreFinanceFlowDelete } from '@/api/store_finance_flow'
-import { apiSystemStoreLists } from '@/api/system_store'
-import { apiUserLists } from '@/api/user'
-import shortcuts from '@/utils/shortcuts'
-import moment from 'moment'
-
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    store_name: '',
-    store_id: '',
-    user_id: '',
-    create_time: '',
-    financial_type: 3,
-    financial_pm: 1,
-    start_time: '',
-    end_time: ''
-})
-const startEndTime = ref([])
-
-watch(
-    () => startEndTime.value,
-    (n, o) => {
-        queryParams.start_time = moment(n[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(n[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    },
-    { deep: true }
-)
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreFinanceFlowLists,
-    params: queryParams
-})
-
-getLists()
-
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiUserLists({
-        nickname: e,
-        page_size: 50
-    })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-</script>
diff --git a/src/views/finance/receivable/details.vue b/src/views/finance/receivable/details.vue
deleted file mode 100644
index 7e63a6abe..000000000
--- a/src/views/finance/receivable/details.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="还款明细" :size="1200">
-        <el-table :data="pager.lists">
-            <el-table-column label="ID" prop="id" show-overflow-tooltip />
-            <el-table-column label="门店" prop="store_name" show-overflow-tooltip />
-            <el-table-column label="用户昵称" prop="nickname" show-overflow-tooltip />
-            <el-table-column label="应收金额" prop="total_debt" show-overflow-tooltip />
-            <el-table-column label="实收金额" prop="pay_debt" show-overflow-tooltip />
-            <el-table-column label="剩余欠款" prop="surplus_debt" show-overflow-tooltip />
-            <el-table-column label="收款人" prop="recipient" show-overflow-tooltip />
-            <el-table-column label="支付方式" prop="pay_type_name" show-overflow-tooltip />
-            <el-table-column label="收款证明" prop="file" min-width="80">
-                <template #default="{ row }">
-                    <el-image
-                        style="width: 50px; height: 50px"
-                        :src="row.file"
-                        :preview-teleported="true"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-            <el-table-column label="还款时间" prop="create_time" show-overflow-tooltip />
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </el-drawer>
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import { ElMessage, type FormInstance } from 'element-plus'
-import { timeFormat } from '@/utils/util'
-import { usePaging } from '@/hooks/usePaging'
-import { apiAccountsReceivableRecord } from '@/api/accounts_receivable'
-import moment from 'moment'
-import type { PropType } from 'vue'
-import feedback from '@/utils/feedback'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const showDialog = ref(false)
-const mode = ref('add')
-
-// 表单数据
-const formData = ref({
-    accounts_receivable_id: ''
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = { ...data }
-    queryParams.accounts_receivable_id = data.id
-    getLists()
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    formData.value.accounts_receivable_id = row.order_id
-    // const data = await apiStoreOrderDetail({
-    //     id: row.id
-    // })
-    // setFormData(data)
-}
-
-const queryParams = reactive({
-    accounts_receivable_id: ''
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiAccountsReceivableRecord,
-    params: queryParams
-})
-
-const open = () => {
-    showDialog.value = true
-}
-
-const close = () => {
-    showDialog.value = false
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/receivable/edit.vue b/src/views/finance/receivable/edit.vue
deleted file mode 100644
index fd23d7bb6..000000000
--- a/src/views/finance/receivable/edit.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-	<div class="edit-popup">
-		<popup ref="popupRef" title="账单还款" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
-			<el-form ref="formRef" :model="formData" label-width="100px">
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="用户:" prop="nickname">
-							{{formData.nickname}}
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="门店:" prop="store_name">
-							{{formData.store_name}}
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="应收金额:" prop="surplus_debt">
-							{{formData.surplus_debt}}
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="收款人:" prop="recipient">
-							<el-input v-model="formData.recipient" type="input" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="收款方式:" prop="pay_type">
-							<el-select v-model="formData.pay_type" placeholder="请选择付款方式">
-								<el-option label="现金" :value="1" />
-								<el-option label="微信支付" :value="2" />
-								<el-option label="支付宝支付" :value="3" />
-								<el-option label="对公账号" :value="4" />
-								<el-option label="其他" :value="5" />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="实收金额:" prop="pay_debt">
-							<el-input v-model="formData.pay_debt" type="input" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="图片凭证:" prop="file">
-							<material-picker v-model="formData.file" :limit="1" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="备注:" prop="mark">
-							<el-input v-model="formData.mark" type="input" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-		</popup>
-	</div>
-</template>
-
-<script lang="ts" setup name="storeFinanceFlowEdit">
-	import type { FormInstance } from 'element-plus'
-	import Popup from '@/components/popup/index.vue'
-	import { apiAccountsReceivableEdit } from '@/api/accounts_receivable'
-	import { timeFormat } from '@/utils/util'
-	import type { PropType } from 'vue'
-	defineProps({
-		dictData: {
-			type: Object as PropType<Record<string, any[]>>,
-			default: () => ({})
-		}
-	})
-	const emit = defineEmits(['success', 'close'])
-	const formRef = shallowRef<FormInstance>()
-	const popupRef = shallowRef<InstanceType<typeof Popup>>()
-	const mode = ref('add')
-
-	// 表单数据
-	const formData = reactive({
-		accounts_receivable_id: 0,
-		nickname: '',
-		store_name: '',
-		surplus_debt: '',
-		pay_type: '',
-		file: '',
-		recipient: '',
-		pay_debt: '',
-		mark: '',
-	})
-
-	// 获取详情
-	const setFormData = async (data : Record<any, any>) => {
-		for (const key in formData) {
-			if (data[key] != null && data[key] != undefined) {
-				//@ts-ignore
-				formData[key] = data[key]
-			}
-			formData.accounts_receivable_id = data.id
-			formData.pay_debt = data.surplus_debt
-		}
-	}
-
-	// 提交按钮
-	const handleSubmit = async () => {
-		await formRef.value?.validate()
-		const data = { ...formData, }
-		await apiAccountsReceivableEdit(data)
-		popupRef.value?.close()
-		emit('success')
-	}
-
-	//打开弹窗
-	const open = (type = 'add') => {
-		mode.value = type
-		popupRef.value?.open()
-	}
-
-	// 关闭回调
-	const handleClose = () => {
-		emit('close')
-	}
-
-	defineExpose({
-		open,
-		setFormData
-	})
-</script>
\ No newline at end of file
diff --git a/src/views/finance/receivable/index.vue b/src/views/finance/receivable/index.vue
deleted file mode 100644
index f55f6b231..000000000
--- a/src/views/finance/receivable/index.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-	<div>
-		<el-card shadow="never" class="!border-none mb-4">
-			<div class="mb-6 flex justify-between items-center">
-				<span class="text-2xl">商品概况</span>
-			</div>
-			<div class="flex flex-wrap">
-				<div class="w-1/5 flex mb-6" v-for="(item, index) in statisticsData.list" :key="index">
-					<div>
-						<div class="text-info">{{ item.store_name }}</div>
-						<div class="">欠款:{{ item.surplus_debt }}</div>
-					</div>
-				</div>
-			</div>
-			<el-pagination background layout="prev, pager, next" :total="statisticsData.count" @change="changePage" v-if="statisticsData.count > 10"
-				style="margin-right: 56px; margin-bottom: 11px; float: right" />
-		</el-card>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="门店" prop="store_id">
-					<!-- <el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入门店id" /> -->
-					<el-select v-model="queryParams.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
-						remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户" prop="uid">
-					<!-- <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户id" /> -->
-					<el-select v-model="queryParams.user_id" filterable remote reserve-keyword placeholder="输入用户名称搜索"
-						remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in userList" :key="item.id" :label="`${item.nickname}  (ID:${item.id})`"
-							:value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="订单号" prop="order_sn">
-					<el-input class="w-[280px]" v-model="queryParams.order_sn" clearable placeholder="请输入订单号" />
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<div>
-				<el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id"
-					:tree-props="{ children: 'list' }">
-					<el-table-column label="ID" prop="id" show-overflow-tooltip />
-					<el-table-column label="门店" prop="store_name" show-overflow-tooltip />
-					<el-table-column label="订单号" prop="order_sn" min-width="120" show-overflow-tooltip />
-					<el-table-column label="用户昵称" prop="nickname" show-overflow-tooltip />
-					<el-table-column label="手机号" prop="phone" show-overflow-tooltip />
-					<el-table-column label="账期期限" prop="deadline" show-overflow-tooltip />
-					<el-table-column label="总欠款" prop="total_debt" show-overflow-tooltip />
-					<el-table-column label="剩余欠款" prop="surplus_debt" show-overflow-tooltip />
-					<el-table-column label="欠款天数" prop="debt_day" show-overflow-tooltip />
-					<el-table-column label="操作" fixed="right" width="180">
-						<template #default="{ row }">
-							<el-button v-if="row.surplus_debt > 0" link type="danger" @click="handleEdit(row)">
-								还款
-							</el-button>
-							<el-button link type="primary" @click="handleDetail(row)">
-								还款记录
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-		<details-popup ref="detailsRef" :dict-data="dictData" />
-	</div>
-</template>
-
-<script lang="ts" setup name="storeFinanceFlowLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import { apiAccountsReceivableLists, apiAccountsReceivableEdit, apiAccountsReceivableDetail, apiAccountsReceivableStatistics } from '@/api/accounts_receivable'
-	import { apiSystemStoreLists } from '@/api/system_store'
-	import { apiUserLists } from '@/api/user'
-	import { timeFormat } from '@/utils/util'
-	import feedback from '@/utils/feedback'
-	import EditPopup from './edit.vue'
-	import DetailsPopup from './details.vue'
-
-	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-	const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-	// 是否显示编辑框
-	const showEdit = ref(false)
-
-	// 查询条件
-	const queryParams = reactive({
-		store_name: '',
-		store_id: '',
-		user_id: '',
-		create_time: '',
-		financial_type: 1,
-		financial_pm: 1,
-		order_sn: ''
-	})
-	
-	const topQueryParams = reactive({
-		page_no: '',
-		page_size: '',
-	})
-	
-	const changePage = (e) => {
-	    topQueryParams.page_no = e
-	    getStatistics()
-	}
-	const statisticsData = ref({})
-	const getStatistics = () => {
-		apiAccountsReceivableStatistics(topQueryParams).then(res => {
-			statisticsData.value = res
-		})
-	}
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiAccountsReceivableLists,
-		params: queryParams
-	})
-
-	// 添加
-	const handleAdd = async () => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('add')
-	}
-
-	const handleEdit = async (data : any) => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('edit')
-		editRef.value?.setFormData(data)
-	}
-
-	const handleDetail = async (data : any) => {
-		detailsRef.value?.open()
-		detailsRef.value?.setFormData(data)
-	}
-
-	const handleRepayment = async (data : any) => {
-		detailsRef.value?.open()
-		detailsRef.value?.setFormData(data)
-	}
-
-	getStatistics()
-	getLists()
-
-	const storeloading = ref(false)
-	const storeList = ref([])
-	const remoteMethod = (e = '') => {
-		storeloading.value = true
-		apiSystemStoreLists({
-			name: e,
-			page_size: 50
-		})
-			.then((res) => {
-				storeList.value = res.lists
-				setTimeout(() => {
-					storeloading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					storeloading.value = false
-				}, 300)
-			})
-	}
-
-	const userloading = ref(false)
-	const userList = ref([])
-	const remoteMethodUser = (e = '') => {
-		userloading.value = true
-		apiUserLists({
-			nickname: e,
-			page_size: 50
-		})
-			.then((res) => {
-				userList.value = res.lists
-				setTimeout(() => {
-					userloading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					userloading.value = false
-				}, 300)
-			})
-	}
-</script>
\ No newline at end of file
diff --git a/src/views/finance/store_cash_finance_flow/details.vue b/src/views/finance/store_cash_finance_flow/details.vue
deleted file mode 100644
index 52dc9cb35..000000000
--- a/src/views/finance/store_cash_finance_flow/details.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="门店" prop="store_name">
-                    <el-input v-model="formData.store_name" readonly />
-                </el-form-item>
-                <el-form-item label="应收金额" prop="receivable">
-                    <el-input v-model="formData.receivable" readonly />
-                </el-form-item>
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" readonly />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-switch v-model="formData.status" active-text="已转账" inactive-text="未转账" :active-value="1" :inactive-value="0" size="large" inline-prompt></el-switch>
-                </el-form-item>
-                <el-form-item label="凭证" prop="file">
-                    <material-picker v-model="formData.file" :limit="1" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeCashFinanceFlowDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreCashFinanceFlowAdd, apiStoreCashFinanceFlowEdit, apiStoreCashFinanceFlowDetail } from '@/api/store_cash_finance_flow'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreCashFinanceFlowDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/store_cash_finance_flow/edit.vue b/src/views/finance/store_cash_finance_flow/edit.vue
deleted file mode 100644
index 536db862a..000000000
--- a/src/views/finance/store_cash_finance_flow/edit.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="门店" prop="store_name">
-                    <el-input v-model="formData.store_name" readonly />
-                </el-form-item>
-                <el-form-item label="应收金额" prop="receivable">
-                    <el-input v-model="formData.receivable" readonly />
-                </el-form-item>
-                <el-form-item label="实收金额" prop="receipts">
-                    <el-input v-model="formData.receipts" />
-                </el-form-item>
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" readonly />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-switch
-                        v-model="formData.status"
-                        active-text="已转账"
-                        inactive-text="未转账"
-                        :active-value="1"
-                        :inactive-value="0"
-                        size="large"
-                        inline-prompt
-                    ></el-switch>
-                </el-form-item>
-                <el-form-item label="凭证" prop="file">
-                    <material-picker v-model="formData.file" :limit="1" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeCashFinanceFlowEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiStoreCashFinanceFlowAdd,
-    apiStoreCashFinanceFlowEdit,
-    apiStoreCashFinanceFlowDetail
-} from '@/api/store_cash_finance_flow'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店现金流水' : '新增门店现金流水'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    store_id: '',
-    cash_price: '',
-    receivable: '',
-    receipts: '',
-    admin_id: '',
-    file: '',
-    remark: '',
-    status: '',
-    store_name: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreCashFinanceFlowDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit'
-        ? await apiStoreCashFinanceFlowEdit(data)
-        : await apiStoreCashFinanceFlowAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/store_cash_finance_flow/index.vue b/src/views/finance/store_cash_finance_flow/index.vue
deleted file mode 100644
index 3bfd6e9e3..000000000
--- a/src/views/finance/store_cash_finance_flow/index.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店" prop="store_id">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入门店id" /> -->
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="金额" prop="cash_price">
-					<el-input v-model="queryParams.cash_price" />
-                </el-form-item>
-                <el-form-item label="时间范围" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        :shortcuts="shortcuts"
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-select
-                        v-model="queryParams.status"
-                        placeholder="请选择状态"
-                        size="large"
-                        style="width: 240px"
-                    >
-                        <el-option label="待处理" value="0" />
-                        <el-option label="已完成" value="1" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiStoreCashFinanceFlowLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div>
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="门店" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="交易金额" prop="cash_price" show-overflow-tooltip />
-                    <el-table-column label="应收金额" prop="receivable" show-overflow-tooltip />
-                    <el-table-column label="实收金额" prop="receipts" show-overflow-tooltip />
-                    <el-table-column label="操作人员" prop="admin_id" show-overflow-tooltip />
-                    <el-table-column label="图片" prop="file">
-                        <template #default="{ row }">
-                            <el-image
-                                v-if="row.file && row.file != 0"
-                                style="width: 50px; height: 50px"
-                                :src="row.file"
-                                :preview-teleported="true"
-                            />
-                            <span v-else>待上传</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="备注" prop="remark" />
-                    <el-table-column label="状态" prop="status">
-                        <template #default="{ row }">
-                            <el-tag v-if="row.status == 0" type="danger">待处理</el-tag>
-                            <el-tag v-else type="success">已确认</el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['store_cash_finance_flow.store_cash_finance_flow/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                                v-if="row.status == 0"
-                            >
-                                编辑
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="storeCashFinanceFlowLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiStoreCashFinanceFlowLists,
-    apiStoreCashFinanceFlowDelete
-} from '@/api/store_cash_finance_flow'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import { apiSystemStoreLists } from '@/api/system_store'
-import moment from 'moment'
-
-const shortcuts = [
-    {
-        text: '近一周',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(start.getDate() - 7)
-            return [start, end]
-        }
-    },
-    {
-        text: '近一月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 1)
-            return [start, end]
-        }
-    },
-    {
-        text: '近三月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 3)
-            return [start, end]
-        }
-    }
-]
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-const startEndTime = ref([new Date(), new Date()])
-
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    status: '',
-	cash_price: '',
-    start_time: moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00',
-    end_time: moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-})
-
-const changeStartEndTime = () => {
-	if (startEndTime.value == null || startEndTime.value == '') {
-		queryParams.start_time = ''
-		queryParams.end_time = ''
-	} else {
-		queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-		queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-	}
-    getLists()
-}
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreCashFinanceFlowLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreCashFinanceFlowDelete({ id })
-    getLists()
-}
-onMounted(() => {
-    getLists()
-})
-
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-</script>
diff --git a/src/views/finance/store_extract/details.vue b/src/views/finance/store_extract/details.vue
deleted file mode 100644
index 5109ec264..000000000
--- a/src/views/finance/store_extract/details.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeExtractDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreExtractAdd, apiStoreExtractEdit, apiStoreExtractDetail } from '@/api/store_extract'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreExtractDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/store_extract/edit.vue b/src/views/finance/store_extract/edit.vue
deleted file mode 100644
index b96869a55..000000000
--- a/src/views/finance/store_extract/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeExtractEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreExtractAdd, apiStoreExtractEdit, apiStoreExtractDetail } from '@/api/store_extract'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店提现表' : '新增门店提现表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreExtractDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreExtractEdit(data) 
-        : await apiStoreExtractAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/store_extract/index.vue b/src/views/finance/store_extract/index.vue
deleted file mode 100644
index 24d533ad9..000000000
--- a/src/views/finance/store_extract/index.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店" prop="store_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_id"
-                        clearable
-                        placeholder="请输入门店"
-                    />
-                </el-form-item>
-                <el-form-item label="收款方式" prop="extract_type">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.extract_type"
-                        clearable
-                        placeholder="请输入收款方式"
-                    />
-                </el-form-item>
-                <el-form-item label="审核状态" prop="status">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.status"
-                        clearable
-                        placeholder="请输入审核状态"
-                    />
-                </el-form-item>
-                <el-form-item label="转账状态" prop="pay_status">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.pay_status"
-                        clearable
-                        placeholder="请输入转账状态"
-                    />
-                </el-form-item>
-                <!-- <el-form-item label="创建时间" prop="create_time">
-                    <el-input class="w-[280px]" v-model="queryParams.create_time" clearable placeholder="请输入创建时间" />
-                </el-form-item> -->
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiStoreExtractLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="名称" prop="nickname" show-overflow-tooltip />
-                    <!-- <el-table-column label="收款方式" prop="extract_type" show-overflow-tooltip /> -->
-                    <el-table-column label="提现金额" prop="extract_price" show-overflow-tooltip />
-                    <el-table-column label="openid" prop="openid" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                    <el-table-column label="审核状态" prop="status_name" show-overflow-tooltip />
-                    <el-table-column
-                        label="转账状态"
-                        prop="pay_status_name"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="管理员" prop="admin_id" show-overflow-tooltip />
-                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-if="row.pay_status == 0"
-                                v-perms="['store_extract.store_extract/enter']"
-                                type="primary"
-                                link
-                                @click="handleEnter(row.id)"
-                            >
-                                确认
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="storeExtractLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiStoreExtractLists,
-    apiStoreExtractDelete,
-    apiStoreExtractEnter
-} from '@/api/store_extract'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    extract_type: '',
-    status: '',
-    pay_status: '',
-    create_time: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreExtractLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-// 确认
-const handleEnter = (id: any) => {
-    apiStoreExtractEnter({ id: id }).then(() => {
-        getLists()
-    })
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreExtractDelete({ id })
-    getLists()
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/finance/store_finance_bill/components/billTable.vue b/src/views/finance/store_finance_bill/components/billTable.vue
deleted file mode 100644
index d3c298c63..000000000
--- a/src/views/finance/store_finance_bill/components/billTable.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" v-loading="pager.loading">
-                <el-table-column label="标题" prop="name" show-overflow-tooltip />
-                <el-table-column label="日期" prop="date" show-overflow-tooltip />
-                <el-table-column label="收入金额" prop="income" show-overflow-tooltip />
-                <el-table-column label="支出金额" prop="expenditure" show-overflow-tooltip />
-                <el-table-column label="门店应入账金额" prop="enter" show-overflow-tooltip />
-                <el-table-column label="操作" width="120" fixed="right">
-                    <template #default="{ row }">
-                        <el-button v-perms="['store_cash_finance_flow.store_cash_finance_flow/edit']" type="primary"
-                            link @click="openDetail(row)">
-                            详情
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-        <el-dialog v-model="showDetail" title="订单详情" width="70%">
-            <runWaterPop ref="runRef"></runWaterPop>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="billTable">
-import { usePaging } from '@/hooks/usePaging'
-import { apiDayBillLists, apiWeekBillLists, apiMonthBillLists } from '@/api/store_finance_bill'
-import moment from 'moment';
-
-let apiFun = apiDayBillLists;
-
-const props = defineProps({
-    queryParams: {
-        type: Object,
-        default: () => ({})
-    },
-    type: {
-        type: String,
-        default: 'day'
-    }
-})
-
-if (props.type == 'day') apiFun = apiDayBillLists;
-if (props.type == 'week') apiFun = apiWeekBillLists;
-if (props.type == 'month') apiFun = apiMonthBillLists;
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiFun,
-    params: props.queryParams
-})
-
-defineExpose({
-    getLists
-})
-
-const extractWeekNumber = (str:any)=> {
-    // 使用正则表达式匹配"第xxxx-xx周"中的xx，即周数
-    const weekRegex = /第\d{4}-([0-9]{1,2})周/;
-    const match = str.match(weekRegex);
-    
-    if (match) {
-        // 返回匹配到的周数
-        return parseInt(match[1], 10);
-    } else {
-        // 如果没有匹配到，返回null或其他默认值
-        return null;
-    }
-}
-const extractYear = (str: any) => {
-    // 使用正则表达式匹配"第xxxx-xx周"中的xxxx，即年份
-    const yearRegex = /第(\d{4})-\d{1,2}周/;
-    const match = str.match(yearRegex);
-    
-    if (match) {
-        // 返回匹配到的年份
-        return parseInt(match[1], 10);
-    } else {
-        // 如果没有匹配到，返回null或其他默认值
-        return moment(new Date()).format('YYYY');
-    }
-}
-const convertToYYYYMMDD = (dateString:any) => {
-    // 分割输入字符串获取年和月
-    const year = dateString.split('年')[0];
-    const month = dateString.split('年')[1].split('月')[0];
-    
-    // 创建Date对象，注意JavaScript的月份是从0开始的，所以需要减1
-    const date = new Date(year, month - 1, 1);
-    
-    // 格式化日期为yyyy-mm-dd
-    const formattedDate = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
-    
-    return formattedDate;
-}
-
-
-const runRef = ref(null);
-const showDetail = ref(null);
-const openDetail = async (row: any) => {
-    showDetail.value = true;
-    await nextTick();
-    if(props.type == 'day'){
-        runRef.value?.init({
-            start_time: moment(row.date).format('YYYY-MM-DD') + ' 00:00:00',
-            end_time: moment(row.date).format('YYYY-MM-DD') + ' 23:59:59',
-        });
-    }else if(props.type == 'week'){
-        let t = extractWeekNumber(row.date);
-        if(t){
-            let year:any = extractYear(row.date);
-            // 初始化日期为该年第1周的星期一（这里假设1月1日是星期四，因为2024年1月1日是星期二，但我们需要调整到最近的星期一）
-            let now = new Date(year, 0, 1 - (new Date(year, 0, 1).getDay() || 7) + 1); // 这里确保了得到的是当周的星期一
-            now.setDate(now.getDate() + (t - 1) * 7); // 从第1周的周一到第23周的周一需要增加(23-1)*7天 
-            let end = new Date(now);
-            end.setDate(end.getDate() + 6)
-            runRef.value?.init({
-                start_time: moment(now).format('YYYY-MM-DD') + ' 00:00:00',
-                end_time: moment(end).format('YYYY-MM-DD') + ' 23:59:59',
-            });
-        }else runRef.value?.init({});
-    } else {
-        let sdate = convertToYYYYMMDD(row.date); //获取当前月
-        let edate = new Date(sdate); 
-        edate.setMonth(edate.getMonth()+1); //当前月份+1
-        edate.setDate(edate.getDate()-1); //当前日期-1即可获得上月最后一天
-        runRef.value?.init({
-            start_time: moment(sdate).format('YYYY-MM-DD') + ' 00:00:00',
-            end_time: moment(edate).format('YYYY-MM-DD') + ' 23:59:59',
-        });
-    }
-}
-
-onMounted(() => {
-    getLists()
-})
-
-
-</script>
-
-<style lang="scss" scoped></style>
-
diff --git a/src/views/finance/store_finance_bill/details.vue b/src/views/finance/store_finance_bill/details.vue
deleted file mode 100644
index d12447b66..000000000
--- a/src/views/finance/store_finance_bill/details.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeCashFinanceFlowDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreCashFinanceFlowAdd, apiStoreCashFinanceFlowEdit, apiStoreCashFinanceFlowDetail } from '@/api/store_cash_finance_flow'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreCashFinanceFlowDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/store_finance_bill/edit.vue b/src/views/finance/store_finance_bill/edit.vue
deleted file mode 100644
index 65742131f..000000000
--- a/src/views/finance/store_finance_bill/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeCashFinanceFlowEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreCashFinanceFlowAdd, apiStoreCashFinanceFlowEdit, apiStoreCashFinanceFlowDetail } from '@/api/store_cash_finance_flow'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店现金流水' : '新增门店现金流水'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreCashFinanceFlowDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreCashFinanceFlowEdit(data) 
-        : await apiStoreCashFinanceFlowAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/store_finance_bill/index.vue b/src/views/finance/store_finance_bill/index.vue
deleted file mode 100644
index 08577e5f0..000000000
--- a/src/views/finance/store_finance_bill/index.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店" prop="store_id">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入门店id" /> -->
-                    <el-select v-model="queryParams.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
-                        remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px" @change="handleClick({ paneName: activeName })">
-                        <el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="时间" prop="create_time">
-                    <el-date-picker v-model="startEndTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts" @change="handleClick({ paneName: activeName })" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="handleClick({ paneName: activeName })">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" shadow="never">
-            <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                <el-tab-pane label="日订单" name="first">
-                    <billTable ref="billTableRef1" :queryParams="queryParams" type="day"></billTable>
-                </el-tab-pane>
-                <el-tab-pane label="周订单" name="second">
-                    <billTable ref="billTableRef2" :queryParams="queryParams" type="week"></billTable>
-                </el-tab-pane>
-                <el-tab-pane label="月订单" name="three">
-                    <billTable ref="billTableRef3" :queryParams="queryParams" type="month"></billTable>
-                </el-tab-pane>
-            </el-tabs>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeCashFinanceFlowLists">
-import { watch } from 'vue';
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import { apiSystemStoreLists } from '@/api/system_store'
-import billTable from "./components/billTable.vue";
-import shortcuts from "@/utils/shortcuts";
-import moment from 'moment';
-
-const startEndTime = ref([]);
-
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    start_time: '',
-    end_time: ''
-})
-
-watch(() => startEndTime.value, (n, o) => {
-    queryParams.start_time = moment(n[0]).format('YYYY-MM-DD') + ' 00:00:00';
-    queryParams.end_time = moment(n[1]).format('YYYY-MM-DD') + ' 23:59:59';
-}, { deep: true })
-
-const storeloading = ref(false);
-const storeList = ref([]);
-const remoteMethod = (e: string = '') => {
-    storeloading.value = true;
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    }).then(res => {
-        storeList.value = res.lists;
-        setTimeout(() => {
-            storeloading.value = false;
-        }, 300)
-    }).catch(err => {
-        setTimeout(() => {
-            storeloading.value = false;
-        }, 300)
-    })
-}
-
-const billTableRef1 = ref(null);
-const billTableRef2 = ref(null);
-const billTableRef3 = ref(null);
-
-const activeName = ref('first');
-const handleClick = (tab: any) => {
-    if (tab.paneName == "first") {
-        billTableRef1.value.getLists();
-    } else if (tab.paneName == "second") {
-        billTableRef2.value.getLists();
-    } else if (tab.paneName == "three") {
-        billTableRef3.value.getLists();
-    }
-};
-
-const resetParams = () => {
-    queryParams.store_id = '';
-    queryParams.create_time = '';
-    handleClick({
-        paneName: activeName.value
-    })
-}
-
-nextTick(() => {
-    handleClick({
-        paneName: activeName.value
-    })
-})
-
-</script>
diff --git a/src/views/finance/store_finance_flow/details.vue b/src/views/finance/store_finance_flow/details.vue
deleted file mode 100644
index c81687511..000000000
--- a/src/views/finance/store_finance_flow/details.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="资金走向" :size="1000">
-        <el-table :data="pager.lists" @selection-change="handleSelectionChange" >
-                    <el-table-column label="ID" prop="id" min-width="100" show-overflow-tooltip />
-                    <el-table-column label="交易单号" prop="order_sn" min-width="120" show-overflow-tooltip />
-                    <el-table-column label="交易时间" prop="create_time" min-width="120" show-overflow-tooltip />
-                    <el-table-column label="金额" prop="number" min-width="100" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span v-if="row.number > 0" class="text-success">{{ row.number }}</span>
-                            <span v-else class="text-danger">{{ row.number }}</span>
-                        </template>
-                    </el-table-column>
-                    <!-- <el-table-column label="门店名称" prop="store_name" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="用户" prop="nickname" min-width="80" show-overflow-tooltip /> -->
-                    <el-table-column label="收益/扣除" prop="financial_type_name" show-overflow-tooltip />
-                    <!-- <el-table-column label="支付方式" prop="pay_type_name" show-overflow-tooltip /> -->
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-
-                </el-table>
-                <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-    </el-drawer>
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import { ElMessage, type FormInstance } from 'element-plus'
-import { timeFormat } from '@/utils/util'
-import { usePaging } from '@/hooks/usePaging'
-import { apiStoreFinanceFlowLists } from '@/api/store_finance_flow'
-import moment from 'moment'
-import type { PropType } from 'vue'
-import feedback from '@/utils/feedback'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const showDialog = ref(false)
-const mode = ref('add')
-
-// 表单数据
-const formData = ref({
-    order_id: ''
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = { ...data };
-    queryParams.order_id = data.order_id;
-    getLists();
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    formData.value.order_id = row.order_id;
-    // const data = await apiStoreOrderDetail({
-    //     id: row.id
-    // })
-    // setFormData(data)
-}
-
-const queryParams = reactive({
-    order_id: ''
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreFinanceFlowLists,
-    params: queryParams
-})
-
-const open = ()=>{
-    showDialog.value = true
-}
-
-const close = () => {
-    showDialog.value = false
-    emit('close')
-}
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/store_finance_flow/edit.vue b/src/views/finance/store_finance_flow/edit.vue
deleted file mode 100644
index 93100f388..000000000
--- a/src/views/finance/store_finance_flow/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeFinanceFlowEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreFinanceFlowAdd, apiStoreFinanceFlowEdit, apiStoreFinanceFlowDetail } from '@/api/store_finance_flow'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店资金流水表' : '新增门店资金流水表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreFinanceFlowDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreFinanceFlowEdit(data) 
-        : await apiStoreFinanceFlowAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/store_finance_flow/index.vue b/src/views/finance/store_finance_flow/index.vue
deleted file mode 100644
index cf5e3a850..000000000
--- a/src/views/finance/store_finance_flow/index.vue
+++ /dev/null
@@ -1,246 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="门店" prop="store_id">
-					<!-- <el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入门店id" /> -->
-					<el-select v-model="queryParams.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
-						remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户" prop="uid">
-					<!-- <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户id" /> -->
-					<el-select v-model="queryParams.user_id" filterable remote reserve-keyword placeholder="输入用户名称搜索"
-						remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in userList" :key="item.id" :label="`${item.nickname}  (ID:${item.id})`"
-							:value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="订单号" prop="order_sn">
-					<el-input class="w-[280px]" v-model="queryParams.order_sn" clearable placeholder="请输入订单号" />
-				</el-form-item>
-				<el-form-item label="日期" prop="timeScope">
-					<el-date-picker v-model="queryParams.timeScope" type="daterange" range-separator="至"
-						start-placeholder="开始日期" end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts"
-						@change="changeStartEndTime" />
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-				</el-form-item>
-				<el-form-item>
-					<el-button @click="xlsx(3)">导出手续费</el-button>
-					<el-button @click="xlsx(11)">导出其他收益</el-button>
-					<el-button @click="xlsx(16)">导出损耗</el-button>
-					<el-button @click="xlsx(12)">导出佣金</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<div>
-				<el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id"
-					:tree-props="{ children: 'list' }">
-					<el-table-column label="ID" prop="id" min-width="100" show-overflow-tooltip />
-					<el-table-column label="交易单号" prop="order_sn" min-width="120" show-overflow-tooltip />
-					<el-table-column label="交易时间" prop="create_time" min-width="120" show-overflow-tooltip />
-					<el-table-column label="金额" prop="number" min-width="100" show-overflow-tooltip>
-						<template #default="{ row }">
-							<span v-if="row.number > 0" class="text-success">{{ row.number }}</span>
-							<span v-else class="text-danger">{{ row.number }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="门店名称" prop="store_name" show-overflow-tooltip />
-					<el-table-column label="用户" prop="nickname" min-width="80" show-overflow-tooltip />
-					<el-table-column label="收益/扣除" prop="financial_type_name" show-overflow-tooltip />
-					<el-table-column label="支付方式" prop="pay_type_name" show-overflow-tooltip />
-					<el-table-column label="备注" prop="remark" show-overflow-tooltip />
-					<el-table-column label="操作" fixed="right" width="100">
-						<template #default="{ row }">
-							<el-button link type="primary" @click="handleDetail(row)">
-								资金走向
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-		<details-popup ref="detailsRef" :dict-data="dictData" />
-	</div>
-</template>
-
-<script lang="ts" setup name="storeFinanceFlowLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import { apiStoreFinanceFlowLists, apiStoreFinanceFlowDelete, apiStoreFinanceFlowExport } from '@/api/store_finance_flow'
-	import { apiSystemStoreLists } from '@/api/system_store'
-	import { apiUserLists } from '@/api/user'
-	import { timeFormat } from '@/utils/util'
-	import feedback from '@/utils/feedback'
-	import EditPopup from './edit.vue'
-	import DetailsPopup from './details.vue'
-	import moment from 'moment'
-
-	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-	const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-	// 是否显示编辑框
-	const showEdit = ref(false)
-
-	// 查询条件
-	const queryParams = reactive({
-		store_name: '',
-		store_id: '',
-		user_id: '',
-		create_time: '',
-		financial_type: 1,
-		financial_pm: 1,
-		order_sn: '',
-		timeScope: [],
-		start_time: '',
-		end_time: '',
-	})
-	const shortcuts = [
-		{
-			text: '近一周',
-			value: () => {
-				const end = new Date()
-				const start = new Date()
-				start.setDate(start.getDate() - 7)
-				return [start, end]
-			}
-		},
-		{
-			text: '近一月',
-			value: () => {
-				const end = new Date()
-				const start = new Date()
-				start.setMonth(start.getMonth() - 1)
-				return [start, end]
-			}
-		},
-		{
-			text: '近三月',
-			value: () => {
-				const end = new Date()
-				const start = new Date()
-				start.setMonth(start.getMonth() - 3)
-				return [start, end]
-			}
-		}
-	]
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiStoreFinanceFlowLists,
-		params: queryParams
-	})
-
-	// 添加
-	const handleAdd = async () => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('add')
-	}
-
-	// 编辑
-	const handleEdit = async (data : any) => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('edit')
-		editRef.value?.setFormData(data)
-	}
-
-	const handleDetail = async (data : any) => {
-		detailsRef.value?.open()
-		detailsRef.value?.setFormData(data)
-	}
-
-	// 删除
-	const handleDelete = async (id : number | any[]) => {
-		await feedback.confirm('确定要删除？')
-		await apiStoreFinanceFlowDelete({ id })
-		getLists()
-	}
-
-	const changeStartEndTime = () => {
-		if (queryParams.timeScope[0] && queryParams.timeScope[1]) {
-			queryParams.start_time = moment(queryParams.timeScope[0]).format('YYYY-MM-DD') + ' 00:00:00'
-			queryParams.end_time = moment(queryParams.timeScope[1]).format('YYYY-MM-DD') + ' 23:59:59'
-		} else {
-			queryParams.start_time = ''
-			queryParams.end_time = ''
-		}
-		getLists()
-	}
-	
-	const xlsx = (type) => {
-		apiStoreFinanceFlowExport({
-			type: type,
-			...queryParams
-		}).then((res) => {
-			window.open(res.url, '_blank')
-			ElMessage.success('导出成功')
-		})
-	}
-
-	getLists()
-
-	const storeloading = ref(false)
-	const storeList = ref([])
-	const remoteMethod = (e = '') => {
-		storeloading.value = true
-		apiSystemStoreLists({
-			name: e,
-			page_size: 50
-		})
-			.then((res) => {
-				storeList.value = res.lists
-				setTimeout(() => {
-					storeloading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					storeloading.value = false
-				}, 300)
-			})
-	}
-
-	const userloading = ref(false)
-	const userList = ref([])
-	const remoteMethodUser = (e = '') => {
-		userloading.value = true
-		apiUserLists({
-			nickname: e,
-			page_size: 50
-		})
-			.then((res) => {
-				userList.value = res.lists
-				setTimeout(() => {
-					userloading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					userloading.value = false
-				}, 300)
-			})
-	}
-</script>
\ No newline at end of file
diff --git a/src/views/finance/user_bill/details.vue b/src/views/finance/user_bill/details.vue
deleted file mode 100644
index c5ed97090..000000000
--- a/src/views/finance/user_bill/details.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userBillDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserBillAdd, apiUserBillEdit, apiUserBillDetail } from '@/api/user_bill'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserBillDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/user_bill/edit.vue b/src/views/finance/user_bill/edit.vue
deleted file mode 100644
index 4db5c32a4..000000000
--- a/src/views/finance/user_bill/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userBillEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserBillAdd, apiUserBillEdit, apiUserBillDetail } from '@/api/user_bill'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑用户账单表' : '新增用户账单表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserBillDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiUserBillEdit(data) 
-        : await apiUserBillAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/user_bill/index.vue b/src/views/finance/user_bill/index.vue
deleted file mode 100644
index 65ac603e9..000000000
--- a/src/views/finance/user_bill/index.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="用户uid" prop="uid">
-                    <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户uid" />
-                </el-form-item>
-                <!-- <el-form-item label="明细类型" prop="type">
-                    <el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入明细类型" />
-                </el-form-item> -->
-                <!-- <el-form-item label="创建时间" prop="create_time">
-                    <el-input class="w-[280px]" v-model="queryParams.create_time" clearable placeholder="请输入创建时间" />
-                </el-form-item> -->
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-button v-perms="['user_bill.user_bill/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['user_bill.user_bill/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button> -->
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="明细类型" prop="type" show-overflow-tooltip />
-                    <el-table-column label="明细数字" prop="number" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['user_bill.user_bill/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['user_bill.user_bill/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="userBillLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserBillLists, apiUserBillDelete } from '@/api/user_bill'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    uid: '',
-    type: '',
-    create_time: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserBillLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiUserBillDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
diff --git a/src/views/finance/user_recharge/details.vue b/src/views/finance/user_recharge/details.vue
deleted file mode 100644
index 55c82d618..000000000
--- a/src/views/finance/user_recharge/details.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userRechargeDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserRechargeAdd, apiUserRechargeEdit, apiUserRechargeDetail } from '@/api/user_recharge'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserRechargeDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/user_recharge/edit.vue b/src/views/finance/user_recharge/edit.vue
deleted file mode 100644
index ec9be9449..000000000
--- a/src/views/finance/user_recharge/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userRechargeEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserRechargeAdd, apiUserRechargeEdit, apiUserRechargeDetail } from '@/api/user_recharge'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑用户充值表' : '新增用户充值表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserRechargeDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiUserRechargeEdit(data) 
-        : await apiUserRechargeAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/finance/user_recharge/index.vue b/src/views/finance/user_recharge/index.vue
deleted file mode 100644
index 050863a33..000000000
--- a/src/views/finance/user_recharge/index.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="是否支付" prop="paid">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.paid" clearable placeholder="请输入是否充值" /> -->
-                    <el-select
-                        v-model="queryParams.paid"
-                        class="w-[280px]"
-                        clearable
-                        placeholder="请选择是否支付"
-                        @change="resetPage"
-                    >
-                        <el-option label="已支付" value="1"></el-option>
-                        <el-option label="未支付" value="0"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiUserRechargeLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div>
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="用户昵称" prop="nickname" show-overflow-tooltip />
-                    <el-table-column
-                        label="订单号"
-                        prop="order_id"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="消费金额" prop="price" show-overflow-tooltip />
-                    <el-table-column label="消费类型" prop="recharge_type" show-overflow-tooltip />
-                    <el-table-column label="是否支付" prop="paid" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-tag type="info" v-if="row.status == -1">{{ row.paid_name }}</el-tag>
-                            <el-tag :type="row.paid ? 'success' : 'danger'" v-else>
-                                {{ row.paid_name }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="支付时间"
-                        prop="pay_time"
-                        min-width="180"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="操作" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                type="warning"
-                                link
-                                @click="refund(row)"
-                                v-if="row.paid == 1 && row.status != -1"
-                                v-perms="['user_recharge.user_recharge/refund']"
-                                >退款</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="userRechargeLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiUserRechargeLists,
-    apiUserRechargeDelete,
-    apiUserRechargeRefund
-} from '@/api/user_recharge'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import moment from 'moment'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const startEndTime = ref([new Date(), new Date()])
-
-// 查询条件
-const queryParams = reactive({
-    paid: '',
-    pay_time: '',
-    start_time: '',
-    end_time: ''
-})
-
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD')
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD')
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserRechargeLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiUserRechargeDelete({ id })
-    getLists()
-}
-
-const refund = async (row: any) => {
-    await feedback.confirm('确定要退款吗？')
-    apiUserRechargeRefund({
-        id: row.id
-    })
-        .then((res) => {
-            ElMessage.success('操作成功,退款有一定延迟,请稍后查看')
-            getLists()
-        })
-        .catch((err) => {
-            ElMessage.error('退款失败')
-            getLists()
-        })
-}
-
-getLists()
-</script>
diff --git a/src/views/fnancial_transfers/index.vue b/src/views/fnancial_transfers/index.vue
deleted file mode 100644
index 22d713272..000000000
--- a/src/views/fnancial_transfers/index.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-    <div>
-        <!-- <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="金额" prop="money">
-                    <el-input class="w-[280px]" v-model="queryParams.money" clearable placeholder="请输入金额" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card> -->
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div>
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
-                    <el-table-column label="ID" prop="id" min-width="55"/>
-                    <el-table-column label="店铺ID" prop="store_id" show-overflow-tooltip />
-                    <el-table-column label="时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="收款方" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="结算金额" prop="money" show-overflow-tooltip />
-                    <el-table-column label="结算方式" prop="extract_type" show-overflow-tooltip />
-                    <el-table-column label="确认时间" prop="initiation_time" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ timeFormat(row.initiation_time, 'yyyy-mm-dd') }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <div class="flex" v-if="row.receivable">
-                                <el-button link type="primary" @click="handleDelete(row.id)" v-if="row.status == 0">
-                                    发送
-                                </el-button>
-                                <el-button link type="primary" @click="handleClick(row)" v-if="row.status == 2">
-                                    确认
-                                </el-button>
-                            </div>
-                            <div v-else></div>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <el-dialog v-model="showDialog" title="确认结算" width="680px">
-            <el-descriptions :column="1" border>
-                <el-descriptions-item label="姓名"> {{ rowDate.store_realName }} </el-descriptions-item>
-                <el-descriptions-item label="银行卡号"> {{ rowDate.store_bank_code }} </el-descriptions-item>
-                <el-descriptions-item label="银行名称"> {{ rowDate.store_bank }} </el-descriptions-item>
-                <el-descriptions-item label="开户地址"> {{ rowDate.store_bank_address }} </el-descriptions-item>
-                <el-descriptions-item label="操作">
-                    <el-radio-group v-model="form.status">
-                        <el-radio label="1">通过</el-radio>
-                        <el-radio label="0">不通过</el-radio>
-                    </el-radio-group>
-                </el-descriptions-item>
-                <el-descriptions-item label="附件">
-                    <material-picker v-model="form.transfer_picture" />
-                </el-descriptions-item>
-                <el-descriptions-item label="备注">
-                    <el-input class="w-[280px]" v-model="form.fail_msg" clearable placeholder="请输入备注" type="textarea" />
-                </el-descriptions-item>
-            </el-descriptions>
-            <el-form class="mt-4">
-                <el-form-item>
-                    <el-button type="primary" @click="handleConfirm">确定</el-button>
-                    <el-button @click="showDialog = false">取消</el-button>
-                </el-form-item>
-            </el-form>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="financialTransfersLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiFinancialTransfersLists, apiFinancialTransfersSend, apiFinancialTransfersConfirm } from '@/api/financial_transfers'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    admin_id: '',
-    uid: '',
-    status: '',
-    initiation_time: '',
-    confirmation_time: '',
-    mark: '',
-    money: '',
-    remark_time: ''
-})
-
-const tableRowClassName = ({
-  row,
-  rowIndex,
-}) => {
-    console.log(row.receivable);
-    
-  if (!row.receivable) {
-    return 'warning-row'
-  }
-  return ''
-}
-
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiFinancialTransfersLists,
-    params: queryParams
-})
-
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要发送吗？')
-    await apiFinancialTransfersSend({ id })
-    getLists()
-}
-
-const showDialog = ref(false)
-const rowDate = ref('')
-
-const handleClick = (row: any) => {
-    rowDate.value = row
-    showDialog.value = true
-}
-
-const form = reactive({
-    id: "",
-    transfer_picture: "",
-    status: "",
-    fail_msg: ""
-})
-
-// 删除
-const handleConfirm = async (id: number | any[]) => {
-    form.id = rowDate.value.id
-    await apiFinancialTransfersConfirm({ ...form })
-    getLists()
-    showDialog.value = false
-}
-
-getLists()
-</script>
-
-<style>
-.el-table .warning-row {
-  --el-table-tr-bg-color: var(--el-color-danger-light-9);
-}
-</style>
\ No newline at end of file
diff --git a/src/views/inventory_store/details.vue b/src/views/inventory_store/details.vue
deleted file mode 100644
index 30a1398e3..000000000
--- a/src/views/inventory_store/details.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryStoreDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiInventoryStoreAdd, apiInventoryStoreEdit, apiInventoryStoreDetail } from '@/api/inventory_store'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiInventoryStoreDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/inventory_store/edit.vue b/src/views/inventory_store/edit.vue
deleted file mode 100644
index 024b725dc..000000000
--- a/src/views/inventory_store/edit.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="数量" prop="nums" v-if="mode == 'edit'">
-                    <el-input v-model="formData.nums" clearable placeholder="请输入实际数量" />
-                </el-form-item>
-                <el-form-item label="门店名称" prop="store_id" v-else>
-                    <div class="flex items-center mr-4">
-                        <el-select
-                            v-model="formData.store_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="输入门店名称搜索"
-                            remote-show-suffix
-                            :remote-method="remoteMethod"
-                            :loading="storeloading"
-                            style="width: 240px"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </div>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryStoreEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiInventoryStoreAdd,
-    apiInventoryStoreEdit,
-    apiInventoryStoreDetail
-} from '@/api/inventory_store'
-import { apiSystemStoreLists } from '@/api/system_store'
-
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店盘存' : '新增门店盘存'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    store_id: '',
-    nums: 0
-})
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-// 表单验证
-const formRules = reactive<any>({})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiInventoryStoreDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit' ? await apiInventoryStoreEdit(data) : await apiInventoryStoreAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/inventory_store/index.vue b/src/views/inventory_store/index.vue
deleted file mode 100644
index 334225a1d..000000000
--- a/src/views/inventory_store/index.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店名称" prop="store_id">
-                    <div class="flex items-center mr-4">
-                        <el-select
-                            v-model="queryParams.store_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="输入门店名称搜索"
-                            remote-show-suffix
-                            :remote-method="remoteMethod"
-                            :loading="storeloading"
-                            style="width: 240px"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.status"
-                        clearable
-                        placeholder="请输入状态"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button
-                v-perms="['inventory_store.inventory_store/add']"
-                type="primary"
-                @click="handleAdd"
-            >
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                生成今日盘库
-            </el-button>
-            <el-button
-                v-perms="['inventory_store.inventory_store/enter']"
-                type="primary"
-                @click="inventoryShow = true"
-            >
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                库存核准
-            </el-button>
-            <!-- <el-button
-                v-perms="['inventory_store.inventory_store/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button> -->
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="商品" prop="product_id" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.product_name }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="后台人员" prop="admin_id" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.admin_name }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="门店人员" prop="staff_id" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.staff_name }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="门店" prop="store_id" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.store_name }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="盘库数量" prop="nums" show-overflow-tooltip />
-                    <el-table-column label="确认数量" prop="enter_nums" show-overflow-tooltip />
-                    <el-table-column label="时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.status_name }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['inventory_store.inventory_store/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <!-- <el-button
-                                v-perms="['inventory_store.inventory_store/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button> -->
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <el-dialog v-model="inventoryShow" title="盘库核准" width="600">
-            <el-form :model="EnterNumsForm" label-width="90px">
-                <el-form-item label="门店名称" prop="store_id">
-                    <div class="flex items-center mr-4">
-                        <el-select
-                            v-model="EnterNumsForm.store_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="输入门店名称搜索"
-                            remote-show-suffix
-                            :remote-method="remoteMethod"
-                            :loading="storeloading"
-                            style="width: 240px"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item label="日期" prop="create_time">
-                    <el-date-picker
-                        v-model="EnterNumsForm.create_time"
-                        type="date"
-                        placeholder="选择日期"
-                    />
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="inventoryShow = false">取消</el-button>
-                    <el-button type="primary" @click="handleEnterNums"> 确认 </el-button>
-                </div>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryStoreLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiInventoryStoreLists,
-    apiInventoryStoreDelete,
-    apiInventoryStoreEnterNums
-} from '@/api/inventory_store'
-import { apiSystemStoreLists } from '@/api/system_store'
-
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import moment from 'moment'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const inventoryShow = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    nums: '',
-    enter_nums: '',
-    status: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiInventoryStoreLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-const EnterNumsForm = reactive({
-    store_id: '',
-    create_time: ''
-})
-const handleEnterNums = () => {
-    EnterNumsForm.create_time = moment(EnterNumsForm.create_time).format('YYYY-MM-DD')
-    apiInventoryStoreEnterNums({ ...EnterNumsForm }).then(() => {
-        getLists()
-    })
-}
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiInventoryStoreDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/inventory_transfer/details.vue b/src/views/inventory_transfer/details.vue
deleted file mode 100644
index c0b6995a0..000000000
--- a/src/views/inventory_transfer/details.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="商品" prop="product_id">
-                    <el-input v-model="formData.product_id" clearable placeholder="请输入商品" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="更新前" prop="before_nums">
-                    <el-input v-model="formData.before_nums" clearable placeholder="请输入更新前" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="更新后" prop="after_nums">
-                    <el-input v-model="formData.after_nums" clearable placeholder="请输入更新后" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="1商户2仓库" prop="type">
-                    <el-input v-model="formData.type" clearable placeholder="请输入1商户2仓库" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="转出id" prop="one_id">
-                    <el-input v-model="formData.one_id" clearable placeholder="请输入转出id" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="转入id" prop="two_id">
-                    <el-input v-model="formData.two_id" clearable placeholder="请输入转入id" :readonly="true"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryTransferDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiInventoryTransferAdd, apiInventoryTransferEdit, apiInventoryTransferDetail } from '@/api/inventory_transfer'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    product_id: '',
-    nums: '',
-    before_nums: '',
-    after_nums: '',
-    type: '',
-    one_id: '',
-    two_id: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiInventoryTransferDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/inventory_transfer/edit.vue b/src/views/inventory_transfer/edit.vue
deleted file mode 100644
index eafeec6a7..000000000
--- a/src/views/inventory_transfer/edit.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="转出类型">
-                    <el-radio-group v-model="formData.one_type">
-                        <el-radio label="1">门店</el-radio>
-                        <el-radio label="2">仓库</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="转出门店" prop="one_id" v-if="formData.one_type == 1">
-                    <el-input
-                        v-model="formData.one_name"
-                        clearable
-                        placeholder="请选择转出方"
-                        :readonly="false"
-                        @click="showStore = true"
-                    />
-                </el-form-item>
-                <el-form-item label="转出仓库" prop="one_id" v-if="formData.one_type == 2">
-                    <el-input
-                        v-model="formData.one_name"
-                        clearable
-                        placeholder="请选择转出方"
-                        :readonly="false"
-                        @click="showWarehouse = true"
-                    />
-                </el-form-item>
-                <el-form-item label="转入类型">
-                    <el-radio-group v-model="formData.two_type">
-                        <el-radio label="1">门店</el-radio>
-                        <el-radio label="2">仓库</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="转入门店" prop="two_id" v-if="formData.two_type == 1">
-                    <el-input
-                        v-model="formData.two_name"
-                        clearable
-                        placeholder="请选择转入方"
-                        :readonly="false"
-                        @click="showStoreTwo = true"
-                    />
-                </el-form-item>
-                <el-form-item label="转入仓库" prop="two_id" v-if="formData.two_type == 2">
-                    <el-input
-                        v-model="formData.two_name"
-                        clearable
-                        placeholder="请选择转入方"
-                        :readonly="false"
-                        @click="showWarehouseTwo = true"
-                    />
-                </el-form-item>
-                <el-form-item label="商品" prop="product_id" v-if="formData.one_id">
-                    <el-input
-                        v-model="formData.product_name"
-                        clearable
-                        placeholder="请选择商品"
-                        :readonly="false"
-                        @click="showProduct = true"
-                    />
-                </el-form-item>
-                <el-form-item label="数量" prop="nums" v-if="formData.one_id">
-                    <el-input
-                        v-model="formData.nums"
-                        clearable
-                        placeholder="请输入数量"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-        </popup>
-        <el-dialog v-model="showStore" title="选择门店" width="70%">
-            <store-pop @onBindStore="onBindStore"></store-pop>
-        </el-dialog>
-        <el-dialog v-model="showStoreTwo" title="选择门店" width="70%">
-            <store-pop @onBindStore="onBindStoreTwo"></store-pop>
-        </el-dialog>
-        <el-dialog v-model="showProduct" title="选择商品" width="70%">
-            <product-pop
-                @onBindStore="onBindProduct"
-                :is_branch="1"
-                :store_id="store_id"
-                :warehouse_id="warehouse_id"
-                :is_warehouse="is_warehouse"
-            ></product-pop>
-        </el-dialog>
-        <el-dialog v-model="showWarehouse" title="选择仓库1" width="70%">
-            <warehouse-pop @onBindWarehouse="onBindWarehouse"></warehouse-pop>
-        </el-dialog>
-        <el-dialog v-model="showWarehouseTwo" title="选择仓库2" width="70%">
-            <warehouse-pop @onBindWarehouse="onBindWarehouseTwo"></warehouse-pop>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryTransferEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiInventoryTransferAdd,
-    apiInventoryTransferEdit,
-    apiInventoryTransferDetail
-} from '@/api/inventory_transfer'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-const showProduct = ref(false) // 选择商品列表是否显示
-const showStore = ref(false) // 选择门店列表是否显示
-const showStoreTwo = ref(false) // 选择门店列表是否显示
-const showWarehouse = ref(false) // 选择仓库列表是否显示
-const showWarehouseTwo = ref(false) // 选择仓库列表是否显示
-const store_id = ref(0) // 门店id
-const warehouse_id = ref(0) //仓库id
-const is_warehouse = ref(0) //是否仓库
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品调拨' : '新增商品调拨'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    product_id: '',
-    product_name: '',
-    nums: '',
-    before_nums: '',
-    after_nums: '',
-    one_type: '1',
-    two_type: '1',
-    one_id: '',
-    one_name: '',
-    two_id: '',
-    two_name: '',
-    warehouse_name: '',
-    warehouse_name_two: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    product_id: [
-        {
-            required: true,
-            message: '请输入商品',
-            trigger: ['blur']
-        }
-    ],
-    nums: [
-        {
-            required: true,
-            message: '请输入数量',
-            trigger: ['blur']
-        }
-    ],
-    type: [
-        {
-            required: true,
-            message: '请输入1商户2仓库',
-            trigger: ['blur']
-        }
-    ],
-    one_id: [
-        {
-            required: true,
-            message: '请输入转出id',
-            trigger: ['blur']
-        }
-    ],
-    two_id: [
-        {
-            required: true,
-            message: '请输入转入id',
-            trigger: ['blur']
-        }
-    ]
-})
-const onBindProduct = (e: any[]) => {
-    formData.product_name = e[0].store_name
-    formData.product_id = e[0].product_id
-    showProduct.value = false
-}
-
-// 选择门店
-const onBindStore = (e: any[]) => {
-    formData.one_id = e[0].id
-    formData.one_name = e[0].name
-    showStore.value = false
-    store_id.value = e[0].id
-}
-const onBindStoreTwo = (e: any[]) => {
-    formData.two_id = e[0].id
-    formData.two_name = e[0].name
-    showStoreTwo.value = false
-}
-//选择仓库
-const onBindWarehouse = (e: any[]) => {
-    formData.one_name = e.name
-    formData.one_id = e.id
-    warehouse_id.value = e.id
-    is_warehouse.value = 1
-    showWarehouse.value = false
-}
-//选择仓库
-const onBindWarehouseTwo = (e: any[]) => {
-    formData.two_name = e.name
-    formData.two_id = e.id
-    showWarehouseTwo.value = false
-}
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-const handleType = (e) => {
-    formData.one_id = 0
-    formData.two_id = 0
-    formData.one_name = ''
-    formData.two_name = ''
-    store_id.value = 0
-    is_warehouse.value = 0
-    warehouse_id.value = 0
-}
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiInventoryTransferDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit'
-        ? await apiInventoryTransferEdit(data)
-        : await apiInventoryTransferAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/inventory_transfer/index.vue b/src/views/inventory_transfer/index.vue
deleted file mode 100644
index e65179c90..000000000
--- a/src/views/inventory_transfer/index.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['inventory_transfer/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                    <el-table-column label="转出方" prop="one_name" show-overflow-tooltip />
-                    <el-table-column
-                        label="转出前数量"
-                        prop="one_before_nums"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="转出后数量"
-                        prop="one_after_nums"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="转入方" prop="two_name" show-overflow-tooltip />
-                    <el-table-column
-                        label="转入前数量"
-                        prop="two_before_nums"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="转入后数量"
-                        prop="two_after_nums"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="类型" prop="type_name" show-overflow-tooltip />
-                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryTransferLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiInventoryTransferLists, apiInventoryTransferDelete } from '@/api/inventory_transfer'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-// import EditPopup from './edit.vue'
-import EditPopup from './warehousing.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    store_name: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiInventoryTransferLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiInventoryTransferDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/inventory_transfer/warehousing.vue b/src/views/inventory_transfer/warehousing.vue
deleted file mode 100644
index 064a23982..000000000
--- a/src/views/inventory_transfer/warehousing.vue
+++ /dev/null
@@ -1,245 +0,0 @@
-<template>
-	<div class="edit-popup">
-		<popup ref="popupRef" :title="popupTitle" :async="true" width="900px" @confirm="handleSubmit"
-			@close="handleClose">
-			<div>
-				<el-form ref="formRef" :model="formData" label-width="90px">
-					<el-form-item label="转出类型">
-						<el-radio-group v-model="formData.one_type">
-							<el-radio label="1">门店</el-radio>
-							<el-radio label="2">仓库</el-radio>
-						</el-radio-group>
-					</el-form-item>
-					<el-form-item label="转出门店" prop="one_id" v-if="formData.one_type == 1">
-						<el-select v-model="formData.one_id" filterable remote reserve-keyword placeholder="请选择转出方"
-							remote-show-suffix :remote-method="remoteMethodStore" :loading="storeloading"
-							@change="changeStore" style="width: 300px">
-							<el-option v-for="item in storeList" :key="item.id"
-								:label="`${item.name}|${item.phone}  (ID:${item.id})`" :value="item.id" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="转出仓库" prop="one_id" v-if="formData.one_type == 2">
-						<el-select v-model="formData.one_id" filterable remote reserve-keyword placeholder="请选择转出方"
-							remote-show-suffix :remote-method="remoteMethodWarehouse" :loading="warehouseloading"
-							@change="changeWarehouse" style="width: 300px">
-							<el-option v-for="item in warehouseList" :key="item.id" :label="item.name"
-								:value="item.id" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="转入类型">
-						<el-radio-group v-model="formData.two_type">
-							<el-radio label="1">门店</el-radio>
-							<el-radio label="2">仓库</el-radio>
-						</el-radio-group>
-					</el-form-item>
-					<el-form-item label="转入门店" prop="two_id" v-if="formData.two_type == 1">
-						<el-select v-model="formData.two_id" filterable remote reserve-keyword placeholder="请选择转入方"
-							remote-show-suffix :remote-method="remoteMethodStore" :loading="storeloading"
-							style="width: 300px">
-							<el-option v-for="item in storeList" :key="item.id"
-								:label="`${item.name}|${item.phone}  (ID:${item.id})`" :value="item.id" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="转入仓库" prop="two_id" v-if="formData.two_type == 2">
-						<el-select v-model="formData.two_id" filterable remote reserve-keyword placeholder="请选择转出方"
-							remote-show-suffix :remote-method="remoteMethodWarehouse" :loading="warehouseloading"
-							style="width: 300px">
-							<el-option v-for="item in warehouseList" :key="item.id" :label="item.name"
-								:value="item.id" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="商品" prop="store_id">
-						<div class="flex-1 w-full">
-							<div class="mb-2">
-								<el-button type="primary" @click="showProduct = true">添加商品</el-button>
-							</div>
-							<el-table :data="productList">
-								<el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-								<el-table-column label="商品图片" prop="image" min-width="80">
-									<template #default="{ row }">
-										<el-image style="width: 50px; height: 50px" :src="row.image"
-											:preview-teleported="true" />
-									</template>
-								</el-table-column>
-								<el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
-								<el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
-								<el-table-column label="数量" min-width="150">
-									<template #default="{ row }">
-										<el-input v-model="row.nums" />
-									</template>
-								</el-table-column>
-								<el-table-column label="操作" width="120" fixed="right">
-									<template #default="{ row }">
-										<el-button type="danger" link @click="handleDeleteProdut(row.id)">
-											删除
-										</el-button>
-									</template>
-								</el-table-column>
-							</el-table>
-						</div>
-					</el-form-item>
-				</el-form>
-			</div>
-			<el-dialog v-model="showProduct" title="选择商品" width="70%">
-				<product-pop @onBindStore="onBindProduct" :is_branch="1" :store_id="store_id"
-					:warehouse_id="warehouse_id" :is_warehouse="is_warehouse" :key="productModalKey"></product-pop>
-			</el-dialog>
-		</popup>
-	</div>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-	import { ElMessage, type FormInstance } from 'element-plus'
-	import { timeFormat } from '@/utils/util'
-	import type { PropType } from 'vue'
-	import { onMounted } from 'vue'
-	import { apiWarehouseLists } from '@/api/warehouse'
-	import {
-		apiInventoryTransferAdd,
-		apiInventoryTransferEdit,
-		apiInventoryTransferDetail
-	} from '@/api/inventory_transfer'
-	import { apiSystemStoreLists } from '@/api/system_store'
-
-	const emit = defineEmits(['success', 'close'])
-	const formRef = shallowRef<FormInstance>()
-
-	const popupRef = shallowRef<InstanceType<typeof Popup>>()
-	const mode = ref('add')
-	const store_id = ref(0) // 门店id
-	const warehouse_id = ref(0) //仓库id
-	const is_warehouse = ref(0) //是否仓库
-
-	// 表单数据
-	const formData = reactive({
-		id: '',
-		product_id: '',
-		product_name: '',
-		nums: '',
-		before_nums: '',
-		after_nums: '',
-		one_type: '1',
-		two_type: '1',
-		one_id: '',
-		one_name: '',
-		two_id: '',
-		two_name: '',
-		warehouse_name: '',
-		warehouse_name_two: ''
-	})
-
-	const popupTitle = computed(() => {
-		return mode.value == 'edit' ? '编辑商品调拨' : '新增商品调拨'
-	})
-
-	const showProduct = ref(false) // 选择商品列表是否显示
-	// 商品列表
-	const productList = ref([])
-	// 删除已有商品
-	const handleDeleteProdut = (id : number) => {
-		productList.value = productList.value.filter((item : any) => item.id !== id)
-	}
-	// 选择商品
-	const onBindProduct = (e : any[]) => {
-		console.log(e);
-		e.forEach((item : any) => {
-			if (!productList.value.find((t : any) => t.id == item.id)) {
-				productList.value.push(item)
-			}
-		})
-		showProduct.value = false
-	}
-
-	const changeStore = (e : any) => {
-		store_id.value = e
-		resetUserId()
-	}
-
-	const changeWarehouse = (e : any) => {
-		warehouse_id.value = e
-		is_warehouse.value = 1
-		resetUserId()
-	}
-
-	const storeloading = ref(false)
-	const storeList = ref([])
-	const remoteMethodStore = (e = '') => {
-		storeloading.value = true
-		apiSystemStoreLists({ name: e }).then((res) => {
-			storeList.value = res.lists
-			setTimeout(() => {
-				storeloading.value = false
-			}, 300)
-		})
-	}
-
-	const warehouseloading = ref(false)
-	const warehouseList = ref([])
-	const remoteMethodWarehouse = (e = '') => {
-		warehouseloading.value = true
-		apiWarehouseLists({ name: e }).then((res) => {
-			warehouseList.value = res.lists
-			setTimeout(() => {
-				warehouseloading.value = false
-			}, 300)
-		})
-	}
-
-	const open = (type = 'add') => {
-		mode.value = type
-		popupRef.value?.open()
-	}
-
-	const handleClose = () => {
-		emit('close')
-	}
-
-	// 提交按钮
-	const handleSubmit = async () => {
-		const product_arr = productList.value.map((item : any) => {
-			return {
-				product_id: item.product_id,
-				nums: item.nums,
-				purchase: item.purchases || 0,
-				total_price: item.total_price || 0,
-				manufacture: item.manufacture,
-				expiration_date: item.expiration_date
-			}
-		})
-		const data = { product_arr, ...formData }
-		await formRef.value?.validate()
-		mode.value == 'edit'
-			? await apiInventoryTransferEdit(data)
-			: await apiInventoryTransferAdd(data)
-		popupRef.value?.close()
-		emit('success')
-	}
-
-	// 获取详情
-	const setFormData = async (data : Record<any, any>) => {
-		for (const key in formData) {
-			if (data[key] != null && data[key] != undefined) {
-				//@ts-ignore
-				formData[key] = data[key]
-			}
-		}
-	}
-
-	const getDetail = async (row : Record<string, any>) => {
-		const data = await apiInventoryTransferDetail({
-			id: row.id
-		})
-		setFormData(data)
-	}
-
-	const productModalKey = ref(0)
-	const resetUserId = () => {
-		productModalKey.value++
-	}
-
-	defineExpose({
-		open,
-		setFormData,
-		getDetail
-	})
-</script>
\ No newline at end of file
diff --git a/src/views/inventory_transfer_order/components/orderInfo.vue b/src/views/inventory_transfer_order/components/orderInfo.vue
deleted file mode 100644
index 92e9e8fcd..000000000
--- a/src/views/inventory_transfer_order/components/orderInfo.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" v-loading="pager.loading">
-                <el-table-column
-                    label="商品信息"
-                    prop="store_name"
-                    show-overflow-tooltip
-                    width="400"
-                >
-                    <template #default="{ row }">
-                        <div class="flex items-center">
-                            <el-image
-                                :src="row.image"
-                                class="w-16 h-16 mr-2"
-                                :preview-teleported="true"
-                            ></el-image>
-                            <div>{{ row.store_name }}</div>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="规格" prop="sku_name" show-overflow-tooltip />
-                <el-table-column label="数量" prop="cart_num" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="orderInfo">
-import type { PropType } from 'vue'
-import { apiInventoryTransferOrderLists } from '@/api/inventory_transfer_order'
-import { usePaging } from '@/hooks/usePaging'
-
-const queryParams = reactive({
-    oid: ''
-})
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiInventoryTransferOrderLists,
-    params: queryParams
-})
-const getList = (e: any) => {
-    queryParams.oid = e.oid
-    getLists()
-}
-defineExpose({
-    getList,
-    getLists
-})
-const route = useRoute()
-onMounted(() => {
-    queryParams.oid = route.query.id
-    getLists()
-})
-</script>
diff --git a/src/views/inventory_transfer_order/details.vue b/src/views/inventory_transfer_order/details.vue
deleted file mode 100644
index 7b79ff4e2..000000000
--- a/src/views/inventory_transfer_order/details.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="订单详情" :size="1000">
-        <div class="flex items-center justify-between">
-            <div>订单编号：{{ formData.order_id }}</div>
-            <div>创建时间</div>
-            <div>{{ formData.create_time }}</div>
-        </div>
-        <div class="flex items-center justify-between">
-            <div>转出方：{{ formData.one_name }}</div>
-            <div>方式:{{ formData.type_name }}</div>
-            <div>转入方：{{ formData.two_name }}</div>
-        </div>
-
-        <!-- <el-tabs v-model="activeName" class="demo-tabs" type="border-card" @tab-click="handleClick">
-            <el-tab-pane label="订单信息" name="first">
-                <orderInfo :datas="formData" ref="productRef"></orderInfo>
-            </el-tab-pane>
-        </el-tabs> -->
-        <el-table :data="formData.product_list">
-            <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
-            <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-        </el-table>
-    </el-drawer>
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import Popup from '@/components/popup/index.vue'
-import { apiInventoryTransferOrderDetail } from '@/api/inventory_transfer_order'
-import type { PropType } from 'vue'
-import orderInfo from './components/orderInfo.vue'
-
-const emit = defineEmits(['success', 'close'])
-const showDialog = ref(false)
-const productRef = ref(false)
-const activeName = ref('first')
-
-// 表单数据
-const formData = ref({
-    id: ''
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = { ...data }
-}
-const handleClick = (tab: any) => {
-    productRef.value?.getList({ oid: formData.value.id })
-}
-const getDetail = async (row: Record<string, any>) => {
-    formData.value.id = row.id
-    const data = await apiInventoryTransferOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    showDialog.value = true
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/inventory_transfer_order/edit.vue b/src/views/inventory_transfer_order/edit.vue
deleted file mode 100644
index c3b2e5f51..000000000
--- a/src/views/inventory_transfer_order/edit.vue
+++ /dev/null
@@ -1,335 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="900px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <div>
-                <el-form ref="formRef" :model="formData" label-width="90px">
-                    <el-form-item label="转出类型">
-                        <el-radio-group v-model="formData.one_type">
-                            <el-radio label="1">门店</el-radio>
-                            <el-radio label="2">仓库</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="转出门店" prop="one_id" v-if="formData.one_type == 1">
-                        <el-select
-                            v-model="formData.one_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="请选择转出方"
-                            remote-show-suffix
-                            :remote-method="remoteMethodStore"
-                            :loading="storeloading"
-                            @change="changeStore"
-                            style="width: 300px"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="`${item.name}|${item.phone}  (ID:${item.id})`"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="转出仓库" prop="one_id" v-if="formData.one_type == 2">
-                        <el-select
-                            v-model="formData.one_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="请选择转出方"
-                            remote-show-suffix
-                            :remote-method="remoteMethodWarehouse"
-                            :loading="warehouseloading"
-                            @change="changeWarehouse"
-                            style="width: 300px"
-                        >
-                            <el-option
-                                v-for="item in warehouseList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="转入类型">
-                        <el-radio-group v-model="formData.two_type">
-                            <el-radio label="1">门店</el-radio>
-                            <el-radio label="2">仓库</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="转入门店" prop="two_id" v-if="formData.two_type == 1">
-                        <el-select
-                            v-model="formData.two_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="请选择转入方"
-                            remote-show-suffix
-                            :remote-method="remoteMethodStore"
-                            :loading="storeloading"
-                            style="width: 300px"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="`${item.name}|${item.phone}  (ID:${item.id})`"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="转入仓库" prop="two_id" v-if="formData.two_type == 2">
-                        <el-select
-                            v-model="formData.two_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="请选择转出方"
-                            remote-show-suffix
-                            :remote-method="remoteMethodWarehouse"
-                            :loading="warehouseloading"
-                            style="width: 300px"
-                        >
-                            <el-option
-                                v-for="item in warehouseList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="备注" prop="mark">
-                        <el-input v-model="formData.mark" type="input" style="width: 480px" />
-                    </el-form-item>
-                    <el-form-item label="转入类型">
-                        <el-radio-group v-model="formData.types">
-                            <el-radio label="0">减库存</el-radio>
-                            <el-radio label="1">不减库存</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="商品" prop="store_id">
-                        <div class="flex-1 w-full">
-                            <div class="mb-2">
-                                <el-button type="primary" @click="showProduct = true"
-                                    >添加商品</el-button
-                                >
-                            </div>
-                            <el-table :data="productList">
-                                <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-                                <el-table-column label="商品图片" prop="image" min-width="80">
-                                    <template #default="{ row }">
-                                        <el-image
-                                            style="width: 50px; height: 50px"
-                                            :src="row.image"
-                                            :preview-teleported="true"
-                                        />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                    label="商品名称"
-                                    prop="store_name"
-                                    min-width="200"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column
-                                    label="单位"
-                                    prop="unit_name"
-                                    min-width="80"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column label="数量" min-width="150">
-                                    <template #default="{ row }">
-                                        <el-input v-model="row.nums" />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" width="120" fixed="right">
-                                    <template #default="{ row }">
-                                        <el-button
-                                            type="danger"
-                                            link
-                                            @click="handleDeleteProdut(row.id)"
-                                        >
-                                            删除
-                                        </el-button>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <el-dialog v-model="showProduct" title="选择商品" width="70%">
-                <product-pop
-                    @onBindStore="onBindProduct"
-                    :is_branch="1"
-                    :store_id="store_id"
-                    :warehouse_id="warehouse_id"
-                    :is_warehouse="is_warehouse"
-                    :key="productModalKey"
-                ></product-pop>
-            </el-dialog>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from 'element-plus'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { onMounted } from 'vue'
-import { apiWarehouseLists } from '@/api/warehouse'
-import {
-    apiInventoryTransferOrderAdd,
-    apiInventoryTransferOrderEdit,
-    apiInventoryTransferOrderDetail
-} from '@/api/inventory_transfer_order'
-import { apiSystemStoreLists } from '@/api/system_store'
-
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-const store_id = ref(0) // 门店id
-const warehouse_id = ref(0) //仓库id
-const is_warehouse = ref(0) //是否仓库
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    product_id: '',
-    product_name: '',
-    nums: '',
-    before_nums: '',
-    after_nums: '',
-    one_type: '1',
-    two_type: '1',
-    types: '0',
-    one_id: '',
-    one_name: '',
-    two_id: '',
-    two_name: '',
-    warehouse_name: '',
-    warehouse_name_two: '',
-    mark: ''
-})
-
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品调拨' : '新增商品调拨'
-})
-
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    console.log(e)
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-
-const changeStore = (e: any) => {
-    store_id.value = e
-    resetUserId()
-}
-
-const changeWarehouse = (e: any) => {
-    warehouse_id.value = e
-    is_warehouse.value = 1
-    resetUserId()
-}
-
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethodStore = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({ name: e }).then((res) => {
-        storeList.value = res.lists
-        setTimeout(() => {
-            storeloading.value = false
-        }, 300)
-    })
-}
-
-const warehouseloading = ref(false)
-const warehouseList = ref([])
-const remoteMethodWarehouse = (e = '') => {
-    warehouseloading.value = true
-    apiWarehouseLists({ name: e }).then((res) => {
-        warehouseList.value = res.lists
-        setTimeout(() => {
-            warehouseloading.value = false
-        }, 300)
-    })
-}
-
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-const handleClose = () => {
-    emit('close')
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            product_id: item.product_id,
-            nums: item.nums,
-            purchase: item.purchases || 0,
-            total_price: item.total_price || 0,
-            manufacture: item.manufacture,
-            expiration_date: item.expiration_date
-        }
-    })
-    const data = { product_arr, ...formData }
-    await formRef.value?.validate()
-    await apiInventoryTransferOrderAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiInventoryTransferOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-const productModalKey = ref(0)
-const resetUserId = () => {
-    productModalKey.value++
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/inventory_transfer_order/index.vue b/src/views/inventory_transfer_order/index.vue
deleted file mode 100644
index 27fdba814..000000000
--- a/src/views/inventory_transfer_order/index.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="订单" prop="order_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.order_id"
-                        clearable
-                        placeholder="请输入订单"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button
-                v-perms="['inventory_transfer_order.inventory_transfer_order/add']"
-                type="primary"
-                @click="handleAdd"
-            >
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="订单" prop="order_id" show-overflow-tooltip />
-                    <el-table-column label="转出方" prop="one_name" show-overflow-tooltip />
-                    <el-table-column label="方式" prop="type_name" show-overflow-tooltip />
-                    <el-table-column label="转入方" prop="two_name" show-overflow-tooltip />
-                    <el-table-column label="是否减库" prop="types_name" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                    <!-- <el-table-column label="总数量" prop="total_nums" show-overflow-tooltip />
-                    <el-table-column label="总金额" prop="total_price" show-overflow-tooltip /> -->
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleDetai(row)"
-                                >详情</el-button
-                            >
-
-                            <el-button
-                                v-perms="[
-                                    'inventory_transfer_order.inventory_transfer_order/delete'
-                                ]"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <details-popup
-            v-if="showDetails"
-            ref="detailsRef"
-            @success="getLists"
-            @close="showDetails = false"
-            :dictData="dictData"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryTransferOrderLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiInventoryTransferOrderLists,
-    apiInventoryTransferOrderDelete
-} from '@/api/inventory_transfer_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailsPopup from './details.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDetails = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    one_type: '',
-    two_type: '',
-    types: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiInventoryTransferOrderLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-// 详情
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiInventoryTransferOrderDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/inventory_warehouse/details.vue b/src/views/inventory_warehouse/details.vue
deleted file mode 100644
index da93f017f..000000000
--- a/src/views/inventory_warehouse/details.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryWarehouseDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiInventoryWarehouseAdd, apiInventoryWarehouseEdit, apiInventoryWarehouseDetail } from '@/api/inventory_warehouse'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiInventoryWarehouseDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/inventory_warehouse/edit.vue b/src/views/inventory_warehouse/edit.vue
deleted file mode 100644
index 3926f2fcb..000000000
--- a/src/views/inventory_warehouse/edit.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="数量" prop="nums" v-if="mode == 'edit'">
-                    <el-input v-model="formData.nums" clearable placeholder="请输入实际数量" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="inventoryWarehouseEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiInventoryWarehouseAdd,
-    apiInventoryWarehouseEdit,
-    apiInventoryWarehouseDetail
-} from '@/api/inventory_warehouse'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-console.log(mode.value)
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑仓库盘存' : '新增仓库盘存'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    nums: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiInventoryWarehouseDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit'
-        ? await apiInventoryWarehouseEdit(data)
-        : await apiInventoryWarehouseAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/inventory_warehouse/index.vue b/src/views/inventory_warehouse/index.vue
deleted file mode 100644
index 0fa03a0c0..000000000
--- a/src/views/inventory_warehouse/index.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="仓库名称" prop="warehouse_id">
-					<div class="flex items-center mr-4">
-						<el-select v-model="queryParams.warehouse_id" filterable remote reserve-keyword
-							placeholder="输入仓库名称搜索" remote-show-suffix :remote-method="remoteMethod"
-							:loading="warehouseLoading" style="width: 240px">
-							<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
-						</el-select>
-					</div>
-				</el-form-item>
-				<el-form-item label="状态" prop="status">
-					<el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<el-button v-perms="['inventory_warehouse.inventory_warehouse/add']" type="primary" @click="handleAdd">
-				<template #icon>
-					<icon name="el-icon-Plus" />
-				</template>
-				生成今日盘库
-			</el-button>
-			<el-button v-perms="['inventory_warehouse.inventory_warehouse/enter']" type="primary"
-				@click="inventoryShow = true">
-				<template #icon>
-					<icon name="el-icon-Plus" />
-				</template>
-				库存核准
-			</el-button>
-			<div class="mt-4">
-				<el-table :data="pager.lists" @selection-change="handleSelectionChange">
-					<el-table-column type="selection" width="55" />
-					<el-table-column label="商品" prop="product_id" show-overflow-tooltip>
-						<template #default="{ row }">
-							{{ row.product_name }}
-						</template>
-					</el-table-column>
-					<el-table-column label="后台人员" prop="admin_id" show-overflow-tooltip>
-						<template #default="{ row }">
-							{{ row.admin_name }}
-						</template>
-					</el-table-column>
-					<el-table-column label="盘库数量" prop="nums" show-overflow-tooltip />
-					<el-table-column label="确认数量" prop="enter_nums" show-overflow-tooltip />
-					<el-table-column label="时间" prop="create_time" show-overflow-tooltip />
-					<el-table-column label="状态" prop="status" show-overflow-tooltip>
-						<template #default="{ row }">
-							{{ row.status_name }}
-						</template>
-					</el-table-column>
-					<el-table-column label="操作" width="120" fixed="right">
-						<template #default="{ row }">
-							<el-button v-perms="['inventory_warehouse.inventory_warehouse/edit']" type="primary" link
-								@click="handleEdit(row)">
-								编辑
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-		<el-dialog v-model="inventoryShow" title="盘库核准" width="600">
-			<el-form :model="EnterNumsForm" label-width="90px">
-				<el-form-item label="日期" prop="create_time">
-					<el-date-picker v-model="EnterNumsForm.create_time" type="date" placeholder="选择日期" />
-				</el-form-item>
-			</el-form>
-			<template #footer>
-				<div class="dialog-footer">
-					<el-button @click="inventoryShow = false">取消</el-button>
-					<el-button type="primary" @click="handleEnterNums"> 确认 </el-button>
-				</div>
-			</template>
-		</el-dialog>
-	</div>
-</template>
-
-<script lang="ts" setup name="inventoryStoreLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import {
-		apiInventoryWarehouseLists,
-		apiInventoryWarehouseEnterNums
-	} from '@/api/inventory_warehouse'
-	import { apiWarehouseLists } from '@/api/warehouse'
-
-	import { timeFormat } from '@/utils/util'
-	import feedback from '@/utils/feedback'
-	import EditPopup from './edit.vue'
-	import moment from 'moment'
-
-	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-	// 是否显示编辑框
-	const showEdit = ref(false)
-	const inventoryShow = ref(false)
-
-	// 查询条件
-	const queryParams = reactive({
-		warehouse_id: '',
-		nums: '',
-		enter_nums: '',
-		status: ''
-	})
-
-	const warehouseLoading = ref(false)
-	const warehouseList = ref([])
-	const remoteMethod = (e = '') => {
-		warehouseLoading.value = true
-		apiWarehouseLists({
-			name: e,
-			page_size: 50
-		})
-			.then((res) => {
-				warehouseList.value = res.lists
-				setTimeout(() => {
-					warehouseLoading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					warehouseLoading.value = false
-				}, 300)
-			})
-	}
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiInventoryWarehouseLists,
-		params: queryParams
-	})
-
-	// 添加
-	const handleAdd = async () => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('add')
-	}
-	const EnterNumsForm = reactive({
-		create_time: ''
-	})
-	const handleEnterNums = () => {
-		EnterNumsForm.create_time = moment(EnterNumsForm.create_time).format('YYYY-MM-DD')
-		apiInventoryWarehouseEnterNums({ ...EnterNumsForm }).then(() => {
-			getLists()
-		})
-	}
-	// 编辑
-	const handleEdit = async (data : any) => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('edit')
-		editRef.value?.setFormData(data)
-	}
-
-	getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/label/edit.vue b/src/views/label/edit.vue
deleted file mode 100644
index b160e608d..000000000
--- a/src/views/label/edit.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="标签名字" prop="label_name">
-                    <el-input v-model="formData.label_name" clearable placeholder="请输入标签名字" />
-                </el-form-item>
-                <el-form-item label="logo(图片)" prop="logo">
-                    <material-picker v-model="formData.logo" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="labelEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiLabelAdd, apiLabelEdit, apiLabelDetail } from '@/api/label'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑标签' : '新增标签'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    label_name: '',
-    logo: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiLabelDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiLabelEdit(data) 
-        : await apiLabelAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/label/index.vue b/src/views/label/index.vue
deleted file mode 100644
index 04c97d709..000000000
--- a/src/views/label/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="标签名字" prop="label_name">
-                    <el-input class="w-[280px]" v-model="queryParams.label_name" clearable placeholder="请输入标签名字" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['setting.label/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['setting.label/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="标签名字" prop="label_name" show-overflow-tooltip />
-                    <el-table-column label="logo(图片)" prop="logo">
-                        <template #default="{ row }">
-                            <el-image style="width:50px;height:50px;" :src="row.logo"  :preview-teleported="true"/>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['setting.label/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['setting.label/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="labelLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiLabelLists, apiLabelDelete } from '@/api/label'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    label_name: '',
-    logo: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiLabelLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiLabelDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
diff --git a/src/views/order/beforehand_order/add.vue b/src/views/order/beforehand_order/add.vue
deleted file mode 100644
index ae10b4377..000000000
--- a/src/views/order/beforehand_order/add.vue
+++ /dev/null
@@ -1,808 +0,0 @@
-<template>
-    <el-card>
-        <div class="mb-4 text-lg font-bold">预定单添加</div>
-        <div>
-            <el-form
-                ref="formRef"
-                :model="formData"
-                label-width="90px"
-                :inline="true"
-                :rules="formRules"
-            >
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="用户" prop="nickname">
-                            <el-select
-                                v-model="formData.uid"
-                                filterable
-                                remote
-                                reserve-keyword
-                                placeholder="输入用户名称搜索"
-                                remote-show-suffix
-                                :remote-method="remoteMethodUser"
-                                :loading="userloading"
-                                style="width: 220px"
-                                @change="resetUserId"
-                            >
-                                <el-option
-                                    v-for="item in userList"
-                                    :key="item.id"
-                                    :label="`${item.real_name}|${item.mobile}  (ID:${item.id})`"
-                                    :value="item.id"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="姓名" prop="nickname">
-                            <el-input v-model="formData.nickname" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="手机号" prop="phone">
-                            <el-input v-model="formData.phone" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="地址" prop="address">
-                            <el-input v-model="formData.address" type="input" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="订单类型" prop="order_type">
-                            <el-radio-group
-                                v-model="formData.order_type"
-                                @change="handleOrderType()"
-                            >
-                                <el-radio :label="3">一条龙订单</el-radio>
-                                <el-radio :label="1">铺货订单</el-radio>
-                                <el-radio :label="2">摊贩订单</el-radio>
-                                <!-- <el-radio :label="4">线上订单</el-radio> -->
-                                <!-- <el-radio :label="5">仓库补货</el-radio> -->
-                                <el-radio :label="6">往期补单-出库</el-radio>
-                                <el-radio :label="7">采购订单</el-radio>
-                                <el-radio :label="9">往期补单-入库</el-radio>
-                                <el-radio :label="8">其他订单</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="门店" prop="store_id" style="width: 300px">
-                            <el-select
-                                v-model="formData.store_id"
-                                placeholder="请选择门店"
-                                size="large"
-								@change="resetUserId"
-                            >
-                                <el-option
-                                    v-for="item in storeList"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="是否赊账" prop="is_arrears">
-							<el-switch v-model="formData.is_arrears" :active-value="2" :inactive-value="1" active-text="是"
-							    inactive-text="否" inline-prompt />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="formData.order_type == 7">
-                        <el-form-item label="采购人员" prop="buyer_id" style="width: 300px">
-                            <el-select v-model="formData.buyer_id" placeholder="请选择采购人员" size="large">
-                                <el-option v-for="item in delivery_list" :label="item.nickname" :value="item.uid" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="4">
-                        <el-form-item label="到货时间" prop="arrival_time">
-                            <el-date-picker
-                                v-model="formData.arrival_time"
-                                type="datetime"
-                                :readonly="false"
-                                clearable
-                                value-format="YYYY-MM-DD HH:mm:ss"
-                                placeholder="请选择到货时间"
-                                style="width: 180px"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="桌数" prop="tables">
-                            <el-input-number v-model="formData.tables" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="办事天数" prop="days">
-                            <el-input-number v-model="formData.days" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="厨师" prop="chef">
-                            <el-input v-model="formData.chef" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="电话" prop="chef_phone">
-                            <el-input v-model="formData.chef_phone" type="input" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="备注" prop="purpose">
-                            <el-input
-                                v-model="formData.purpose"
-                                type="input"
-                                style="width: 480px"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="内部备注" prop="mark">
-                            <el-input v-model="formData.mark" type="input" style="width: 480px" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="4">
-                        <el-form-item label="分单员" prop="splitting_officer">
-                            <el-input v-model="formData.splitting_officer" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="跟单员" prop="merchandiser">
-                            <el-input v-model="formData.merchandiser" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="仓管员" prop="distribution_personnel">
-                            <el-input v-model="formData.distribution_personnel" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="运输员" prop="transporter">
-                            <el-input v-model="formData.transporter" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="门店员" prop="system_store_name">
-                            <el-input v-model="formData.system_store_name" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="区域经理" prop="regional_manager">
-                            <el-input v-model="formData.regional_manager" type="input" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-form-item label="商品" prop="product_id" class="w-full">
-                    <div class="flex-1 w-full">
-                        <div class="mb-2">
-                            <el-button type="primary" @click="showProductModal()"
-                                >添加商品</el-button
-                            >
-                        </div>
-                        <el-table :data="productList">
-                            <el-table-column label="商品ID" prop="id" show-overflow-tooltip>
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.id"
-                                        @keydown.enter="enterProduct(row)"
-                                        :ref="(el) => (labelRefs[$index + 'id'] = el)"
-                                        @keyup="moveFocus($event, $index, 'id')"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="商品图片" prop="image" min-width="80">
-                                <template #default="{ row }">
-                                    <el-image
-                                        style="width: 50px; height: 50px"
-                                        :src="row.image"
-                                        :preview-teleported="true"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="商品名称"
-                                prop="store_name"
-                                show-overflow-tooltip
-                            >
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.store_name"
-                                        @keydown.enter="enterStoreName(row)"
-                                        :ref="(el) => (labelRefs[$index + 'store_name'] = el)"
-                                        @keyup="moveFocus($event, $index, 'store_name')"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="单位" min-width="80" show-overflow-tooltip>
-                                <template #default="{ row }">
-                                    <div>{{ row.unit_name }}-{{ row.status_msg }}</div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="仓库数量"
-                                min-width="80"
-                                show-overflow-tooltip
-                                prop="stock"
-                            />
-                            <el-table-column label="数量">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.nums"
-                                        @change="handleChange(row)"
-                                        :ref="(el) => (labelRefs[$index + 'nums'] = el)"
-                                        @keyup="moveFocus($event, $index, 'nums')"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="价格">
-                                <template #default="{ row }">
-                                    <el-input v-model="row.price" disabled />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="总价">
-                                <template #default="{ row }">
-                                    <el-input v-model="row.total_price" disabled />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="型号">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.marques"
-                                        :ref="(el) => (labelRefs[$index + 'marques'] = el)"
-                                        @keyup="moveFocus($event, $index, 'marques')" readonly
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="包装">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.package"
-                                        :ref="(el) => (labelRefs[$index + 'package'] = el)"
-                                        @keyup="moveFocus($event, $index, 'package')" readonly
-                                    />
-                                </template>
-                            </el-table-column>
-                            <!-- <el-table-column label="毛重">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.gross_weight"
-                                        :ref="(el) => (labelRefs[$index + 'gross_weight'] = el)"
-                                        @keyup="moveFocus($event, $index, 'gross_weight')"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="净重">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.net_weight"
-                                        :ref="(el) => (labelRefs[$index + 'net_weight'] = el)"
-                                        @keyup="moveFocus($event, $index, 'net_weight')"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="规格">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.store_info"
-                                        :ref="(el) => (labelRefs[$index + 'store_info'] = el)"
-                                        @keyup="moveFocus($event, $index, 'store_info')"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="售后">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.after_sales"
-                                        :ref="(el) => (labelRefs[$index + 'after_sales'] = el)"
-                                        @keyup="moveFocus($event, $index, 'after_sales')"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="损耗">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.loss"
-                                        :ref="(el) => (labelRefs[$index + 'loss'] = el)"
-                                        @keyup="moveFocus($event, $index, 'loss')"
-                                    />
-                                </template>
-                            </el-table-column> -->
-                            <el-table-column label="备注">
-                                <template #default="{ row, $index }">
-                                    <el-input
-                                        v-model="row.mark"
-                                        :ref="(el) => (labelRefs[$index + 'mark'] = el)"
-                                        @keyup="moveFocus($event, $index, 'mark')"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" width="120" fixed="right">
-                                <template #default="{ row }">
-                                    <el-button
-                                        type="danger"
-                                        link
-                                        @click="handleDeleteProdut(row.id)"
-                                    >
-                                        删除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-form-item>
-                <el-row>
-                    <el-button @click="handleSubmit(formRef)" type="primary" class="w-40 ml-20"
-                        >提交</el-button
-                    >
-                    <el-form-item label="总价" prop="total_price">
-                        <div>
-                            {{ formData.total_price }}
-                            <span class="ml-4">该金额只做前台展示,后台会从新计算</span>
-                        </div>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-        </div>
-        <el-dialog v-model="showProduct" title="选择商品" width="70%">
-            <product-warehouse-pop
-                :key="productModalKey"
-                :userId="formData.uid"
-                :storeId="formData.store_id"
-                :order_type="formData.order_type"
-                @onBindStore="onBindProduct"
-            ></product-warehouse-pop>
-        </el-dialog>
-    </el-card>
-    <el-dialog v-model="dialogProductShow" title="选择商品" width="1200">
-        <el-table :data="dialogProductLists" @current-change="handleCurrentChange" :height="300">
-            <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-            <el-table-column label="商品图片" prop="image" min-width="80">
-                <template #default="{ row }">
-                    <el-image
-                        style="width: 50px; height: 50px"
-                        :src="row.image"
-                        :preview-teleported="true"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="商品名称"
-                prop="store_name"
-                min-width="200"
-                show-overflow-tooltip
-            />
-            <el-table-column label="分类" prop="cate_name" min-width="120" show-overflow-tooltip />
-            <el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
-            <el-table-column label="商品价格" prop="price" min-width="100" show-overflow-tooltip />
-            <el-table-column label="仓库库存" prop="stock" min-width="100" show-overflow-tooltip />
-        </el-table>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from 'element-plus'
-import type { PropType } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { apiBeforehandOrderAdd } from '@/api/beforehand_order'
-import { apiSystemStoreLists } from '@/api/system_store'
-import { apiStoreProductDetail, apiStoreProductLists } from '@/api/store_product'
-import { apiDeliveryServiceLists } from '@/api/delivery_service'
-import { apiUserLists } from '@/api/user'
-import feedback from '@/utils/feedback'
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-// const formRef = shallowRef<FormInstance>()
-const formRef = ref<FormInstance>()
-// 表单数据
-const formData = reactive({
-    warehouse_id: '',
-    is_buyer: -1,
-    buyer_id: '',
-	is_arrears: 1,
-    supplier_id: '',
-    code: '',
-    total_price: 0,
-    order_type: 3,
-    store_id: '',
-    arrival_time: '',
-    purpose: '',
-    tables: 0,
-    days: 0,
-    chef: '',
-    chef_phone: '',
-    splitting_officer: '',
-    merchandiser: '何月英',
-    distribution_personnel: '余友',
-    transporter: '',
-    system_store_name: '',
-    regional_manager: '张波',
-    mark: '',
-    uid: '',
-    nickname: '',
-    phone: '',
-    address: ''
-})
-const enterProduct = async (e: any) => {
-    const data = await apiStoreProductDetail({ id: e.id, user_id: formData.uid, store_id: formData.store_id })
-    setData(e, data)
-}
-
-const setData = (e: any, data: any) => {
-    e.id = data.id
-    e.image = data.image
-    e.marques = data.marques
-    e.store_info = data.store_info
-    e.price = data.price
-    e.purchase = data.purchase
-    e.after_sales = data.after_sales
-    e.loss = data.loss
-    e.unit = data.unit
-    e.store_name = data.store_name
-    e.unit_name = data.unit_name
-    e.status_msg = data.status_msg
-    e.stock = data.stock
-    e.gross_weight = data.gross_weight
-    e.net_weight = data.net_weight
-    e.package = data.package
-    const ids: any[] = []
-    productList.value.forEach((item: any) => {
-        ids.push(item.id)
-    })
-    if (ids.includes(0) == false) {
-        productList.value.push({ id: 0 })
-    }
-}
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([{ id: 0 }])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-function handleChange(row) {
-    row.total_price = (row.nums * row.price).toFixed(2)
-    if (row.total_price > 0) {
-        formData.total_price = (
-            parseFloat(formData.total_price) + parseFloat(row.total_price)
-        ).toFixed(2)
-    }
-}
-
-function handleOrderType(row) {
-    if (formData.order_type == 7 || formData.order_type == 5) {
-        formData.is_buyer = 0
-    } else {
-        formData.is_buyer = -1
-    }
-	if (formData.order_type == 7 && delivery_list.value.length == 0) {
-		getDeliveryList()
-	}
-}
-const router = useRouter()
-// 提交按钮
-const handleSubmit = async (formEl: FormInstance | undefined) => {
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            product_id: item.id,
-            nums: item.nums,
-            price: item.price || 0,
-            purchase: item.purchase || 0,
-            total_price: item.total_price || 0,
-            marques: item.marques,
-            store_info: item.store_info,
-            after_sales: item.after_sales,
-            loss: item.loss,
-            unit: item.unit,
-            gross_weight: item.gross_weight,
-            net_weight: item.net_weight,
-            package: item.package,
-            mark: item.mark
-        }
-    })
-    await formEl.validate((valid, fields) => {
-        if (valid) {
-            apiBeforehandOrderAdd({
-                product_arr,
-                ...formData
-            }).then((res) => {
-                setTimeout(() => {
-                    router.push({
-                        path: '/order/beforehand_order'
-                    })
-                }, 2000)
-            })
-        }
-    })
-}
-const storeList = ref([])
-apiSystemStoreLists({ page_no: 1, page_size: 100 }).then((res) => {
-    storeList.value = res.lists
-})
-
-const dialogProductLists = ref([])
-const dialogProductShow = ref(false)
-const dialogProductData = ref()
-const enterStoreName = (e: any) => {
-    apiStoreProductLists({
-        store_name: e.store_name,
-        product_type: [0, 6],
-        is_warehouse: 1,
-        order_type: formData.order_type,
-        user_id: formData.uid,
-		store_id: formData.store_id
-        // is_show: 1
-    }).then((res) => {
-        if (res.count == 1) {
-            const data = res.lists[0]
-            setData(e, data)
-        }
-        if (res.count > 1) {
-            dialogProductLists.value = res.lists
-            dialogProductShow.value = true
-            dialogProductData.value = e
-        }
-    })
-}
-// 表格选择后回调事件
-const handleCurrentChange = (val: any[]) => {
-    if (val == null) {
-        return
-    }
-    setData(dialogProductData.value, val)
-    dialogProductShow.value = false
-    dialogProductLists.value = []
-    dialogProductData.value = []
-}
-
-const labelRefs = reactive<Record<string, HTMLElement>>({})
-const moveFocus = (event: any, index: number, key: string) => {
-    const keyField = [
-        'id',
-        'store_name',
-        'nums',
-        // 'price',
-        // 'total_price',
-        'marques',
-        // 'gross_weight',
-        // 'net_weight',
-        // 'store_info',
-        // 'after_sales',
-        // 'loss',
-        'package',
-        'mark'
-    ]
-
-    // if (event.keyCode === 13) {
-    //     // 回车向右
-    //     if (index === productList.value.length - 1 && key === keyField[keyField.length - 1]) {
-    //         return
-    //     }
-    //     labelRefs[index + key].blur()
-    //     if (key === keyField[keyField.length - 1]) {
-    //         labelRefs[index + 1 + keyField[0]].focus()
-    //     } else {
-    //         const nextKeyIndex = keyField.findIndex((item) => item === key) + 1
-    //         nextTick(() => {
-    //             labelRefs[index + keyField[nextKeyIndex]].focus()
-    //         })
-    //     }
-    // }
-    // 向上 38
-    if (event.keyCode === 38) {
-        if (index === 0) {
-            return // 第一行无法向上
-        }
-        labelRefs[index + key].blur()
-        nextTick(() => {
-            labelRefs[index - 1 + key].focus()
-        })
-    }
-    // 向下 40
-    if (event.keyCode === 40) {
-        if (index === productList.value.length - 1) {
-            return // 最后一行无法向下
-        }
-        labelRefs[index + key].blur()
-        nextTick(() => {
-            labelRefs[index + 1 + key].focus()
-        })
-    }
-    // 向左 37
-    if (event.keyCode === 37) {
-        if (index === 0 && key === keyField[0]) {
-            return
-        }
-        labelRefs[index + key].blur()
-        // 当前行第一个,跳转上一行最后一个
-        if (key === keyField[0]) {
-            labelRefs[index - 1 + keyField[keyField.length - 1]].focus()
-        } else {
-            // 跳转上一个
-            const preKeyIndex = keyField.findIndex((item) => item === key) - 1
-            nextTick(() => {
-                labelRefs[index + keyField[preKeyIndex]].focus()
-            })
-        }
-    }
-    // // 向右 39
-    if (event.keyCode === 39) {
-        if (index === productList.value.length - 1 && key === keyField[keyField.length - 1]) {
-            return
-        }
-        labelRefs[index + key].blur()
-        // 最后一行最后一个,跳转下一行第一个
-        if (key === keyField[keyField.length - 1]) {
-            labelRefs[index + 1 + keyField[0]].focus()
-        } else {
-            // 跳转下一个
-            const nextKeyIndex = keyField.findIndex((item) => item === key) + 1
-            nextTick(() => {
-                labelRefs[index + keyField[nextKeyIndex]].focus()
-            })
-        }
-    }
-}
-// 表单验证
-const formRules = reactive<any>({
-    uid: [
-        {
-            required: true,
-            message: '请输入采购用户',
-            trigger: ['blur']
-        }
-    ],
-    store_id: [
-        {
-            required: true,
-            message: '请选择门店',
-            trigger: ['blur']
-        }
-    ],
-    arrival_time: [
-        {
-            required: true,
-            message: '请选择到货时间',
-            trigger: ['blur']
-        }
-    ],
-    tables: [
-        {
-            required: true,
-            message: '请输入桌数',
-            trigger: ['blur']
-        }
-    ],
-    days: [
-        {
-            required: true,
-            message: '请输入天数',
-            trigger: ['blur']
-        }
-    ],
-    chef: [
-        {
-            required: true,
-            message: '请输入厨师',
-            trigger: ['blur']
-        }
-    ],
-    chef_phone: [
-        {
-            required: true,
-            message: '请输入厨师电话',
-            trigger: ['blur']
-        }
-    ],
-    purpose: [
-        {
-            required: true,
-            message: '请输入采购目的',
-            trigger: ['blur']
-        }
-    ],
-    system_store_name: [
-        {
-            required: true,
-            message: '请输入门店联系人',
-            trigger: ['blur']
-        }
-    ],
-    splitting_officer: [
-        {
-            required: true,
-            message: '请输入分单员',
-            trigger: ['blur']
-        }
-    ],
-    merchandiser: [
-        {
-            required: true,
-            message: '请输入跟单员',
-            trigger: ['blur']
-        }
-    ],
-    distribution_personnel: [
-        {
-            required: true,
-            message: '请输入仓管员',
-            trigger: ['blur']
-        }
-    ],
-    transporter: [
-        {
-            required: true,
-            message: '请输入运输员',
-            trigger: ['blur']
-        }
-    ],
-    regional_manager: [
-        {
-            required: true,
-            message: '请输入区域经理',
-            trigger: ['blur']
-        }
-    ]
-})
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiUserLists({
-        nickname: e,
-        page_size: 10
-    })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-
-const showProductModal = () => {
-    showProduct.value = true
-}
-const productModalKey = ref(0)
-const resetUserId = (e) => {
-    productModalKey.value++
-}
-
-const delivery_list = ref([])
-const getDeliveryList = () => {
-    apiDeliveryServiceLists({ type: 3 }).then((res) => {
-        delivery_list.value = res.lists
-    })
-}
-</script>
diff --git a/src/views/order/beforehand_order/component/copyPop.vue b/src/views/order/beforehand_order/component/copyPop.vue
deleted file mode 100644
index ee57f8d3e..000000000
--- a/src/views/order/beforehand_order/component/copyPop.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<div class="edit-popup">
-		<popup ref="popupRef" title="复制订单" :async="true" width="550px" @confirm="handleSubmit"
-			@close="handleClose">
-			<el-form ref="formRef" :model="formData" label-width="90px">
-				<el-form-item label="门店" prop="store_id" style="width: 300px">
-					<el-select v-model="formData.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
-						remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px">
-						<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="备注" prop="mark">
-					<el-input v-model="formData.mark" clearable placeholder="请输入备注" :readonly="false" />
-				</el-form-item>
-			</el-form>
-		</popup>
-	</div>
-</template>
-
-<script lang="ts" setup name="warehouseOrderEdit">
-	import type { FormInstance } from 'element-plus'
-	import Popup from '@/components/popup/index.vue'
-	import {
-		apiBeforehandOrderCopy
-	} from '@/api/beforehand_order'
-	import { apiSystemStoreLists } from '@/api/system_store'
-	import { timeFormat } from '@/utils/util'
-	import type { PropType } from 'vue'
-	const emit = defineEmits(['success', 'close'])
-	const formRef = shallowRef<FormInstance>()
-	const popupRef = shallowRef<InstanceType<typeof Popup>>()
-
-	const storeloading = ref(false)
-	const storeList = ref([])
-	const remoteMethod = (e = '') => {
-		storeloading.value = true
-		apiSystemStoreLists({
-			name: e,
-			page_size: 50
-		}).then((res) => {
-			storeList.value = res.lists
-			setTimeout(() => {
-				storeloading.value = false
-			}, 300)
-		})
-	}
-
-	// 表单数据
-	const formData = reactive({
-		id: '',
-		store_id: '',
-		mark: ''
-	})
-
-	// 提交按钮
-	const handleSubmit = async () => {
-		const data = { ...formData }
-		await apiBeforehandOrderCopy(data)
-		popupRef.value?.close()
-		emit('success')
-	}
-
-	//打开弹窗
-	const open = (id) => {
-		formData.id = id
-		popupRef.value?.open()
-	}
-
-	// 关闭回调
-	const handleClose = () => {
-		emit('close')
-	}
-
-	defineExpose({
-		open
-	})
-</script>
\ No newline at end of file
diff --git a/src/views/order/beforehand_order/component/damage.vue b/src/views/order/beforehand_order/component/damage.vue
deleted file mode 100644
index 4770c7a25..000000000
--- a/src/views/order/beforehand_order/component/damage.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-    <div>
-        <el-form class="inline-block" :model="queryParams" inline>
-            <el-form-item label="名称" prop="store_name">
-                <el-input
-                    class="w-[280px]"
-                    v-model="queryParams.store_name"
-                    clearable
-                    placeholder="请输入名称"
-                />
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="resetPage">查询</el-button>
-                <export-data
-                    class="ml-2.5"
-                    :fetch-fun="apiPurchaseProductOfferLists"
-                    :params="queryParams"
-                    :page-size="pager.size"
-                />
-            </el-form-item>
-        </el-form>
-        <el-button
-            type="primary"
-            @click="OclickDialogBuyer"
-            v-perms="['beforehand_order.beforehand_order/oneClickStorage']"
-            class="mb-4"
-        >
-            一键报损
-        </el-button>
-        <el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
-            <el-table-column prop="id" label="ID" width="60" />
-            <el-table-column label="商品图片" prop="image" width="120">
-                <template #default="{ row }">
-                    <el-image
-                        style="width: 50px; height: 50px"
-                        :src="row.image"
-                        :preview-teleported="true"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-            <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-            <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-            <el-table-column label="仓库" prop="warehouse_name" show-overflow-tooltip />
-            <el-table-column label="原因" prop="mark" show-overflow-tooltip />
-            <el-table-column label="操作" fixed="right" width="180">
-                <template #default="{ row }">
-                    <el-button
-                        type="primary"
-                        link
-                        @click="resetWarehouseClick(row)"
-                        v-perms="['warehouse_product.warehouse_product/resetNums']"
-                        >重置数量</el-button
-                    >
-                    <el-button
-                        type="danger"
-                        link
-                        @click="handleDelete(row.id)"
-                        v-perms="['purchase_product_offer.purchase_product_offer/delete']"
-                        >删除</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-if="pager.lists" v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-import {
-    apiPurchaseProductOfferLists,
-    apiPurchaseProductOfferDelete
-} from '@/api/purchase_product_offer'
-import { apiBeforehandOrderCartInfoOneClickStorage } from '@/api/beforehand_order_cart_info'
-import { apiWarehouseLists } from '@/api/warehouse'
-import { apiSupplierLists } from '@/api/supplier'
-import { useDictData } from '@/hooks/useDictOptions'
-import feedback from '@/utils/feedback'
-
-const order_id = ref({ id: 0 })
-const dialogBuyer = ref(false)
-const warehouse_list = ref([])
-const resetWarehouseShow = ref(false)
-
-const one_click_storage = ref({
-    bhoid: order_id.value.id,
-    warehouse_id: '',
-    remark: ''
-})
-const formData = ref({
-    id: '',
-    bhoid: order_id.value.id,
-    supplier_id: '',
-    purchase: 0,
-    outbound_price: 0,
-    total_price: 0,
-    buyer_nums: 0,
-    package: '',
-    store_info: '',
-    marques: '',
-    after_sales: '',
-    pay_type: 1
-})
-const resetWarehouseData = ref({
-    id: '',
-    store_name: '',
-    nums: ''
-})
-const resetWarehouseClick = (data: any) => {
-    resetWarehouseShow.value = true
-    resetWarehouseData.value.id = data.id
-    resetWarehouseData.value.store_name = data.store_name
-    resetWarehouseData.value.nums = data.nums
-}
-const OclickDialogBuyer = () => {
-    dialogBuyer.value = true
-    apiWarehouseLists({}).then((res) => {
-        warehouse_list.value = res.lists
-    })
-}
-const queryParams = reactive({
-    order_id: order_id.value.id,
-    store_name: '',
-    is_adopt: '',
-    is_mer: 1
-})
-const supplierLoading = ref(false)
-const supplierList = ref([])
-const remoteMethodSupplier = (e = '') => {
-    supplierLoading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            supplierList.value = res.lists
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-}
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseProductOfferLists,
-    params: queryParams
-})
-// 获取字典数据
-const { dictData } = useDictData('outbound_floating')
-function getList(id) {
-    order_id.value.id = id
-    one_click_storage.value.bhoid = id
-    formData.value.bhoid = id
-    queryParams.order_id = id
-    getLists()
-}
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiPurchaseProductOfferDelete({ id })
-    getLists()
-}
-defineExpose({
-    getList
-})
-</script>
diff --git a/src/views/order/beforehand_order/component/drawer.vue b/src/views/order/beforehand_order/component/drawer.vue
deleted file mode 100644
index 09a83b94e..000000000
--- a/src/views/order/beforehand_order/component/drawer.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-	<el-drawer title="订单流程" v-model="visible" :size="700">
-		<el-card class="step-card mb-1" v-for="item in dataList">
-			<el-row>
-				<el-form-item label="用户" prop="nickname">
-					<el-input v-model="item.admin.name" type="input" disabled />
-				</el-form-item>
-			</el-row>
-			<el-row>
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="item.remark" type="input" />
-				</el-form-item>
-			</el-row>
-			<el-row>
-				<el-form-item label="图片" prop="images">
-					<div v-for="image in item.images">
-						<el-image :src="image" style="width: 120px; height: 120px" :preview-src-list="item.images" />
-					</div>
-				</el-form-item>
-			</el-row>
-			<el-form-item v-if="item.status == 0" label="">
-				<el-button @click="handleConfirm(item)" type="primary" class="w-40">确认</el-button>
-			</el-form-item>
-		</el-card>
-		<el-card class="step-card mt-1" v-if="!auditStatus">
-			<el-form ref="formRef" :model="formData" label-width="90px">
-				<el-row>
-					<el-form-item label="用户" prop="admin_id">
-						<el-select v-model="formData.admin_id" filterable remote reserve-keyword placeholder="输入用户名称搜索"
-							remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading"
-							style="width: 220px">
-							<el-option v-for="item in userList" :key="item.id"
-								:label="`${item.name}|${item.account}  (ID:${item.id})`" :value="item.id" />
-						</el-select>
-					</el-form-item>
-				</el-row>
-				<el-row>
-					<el-form-item label="备注" prop="remark">
-						<el-input v-model="formData.remark" type="input" />
-					</el-form-item>
-				</el-row>
-				<el-row>
-					<el-form-item label="图片" prop="images">
-						<material-picker v-model="formData.images" :limit="20" />
-					</el-form-item>
-				</el-row>
-				<el-form-item label="">
-					<el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="step-card mt-1" v-if="!auditStatus">
-			<el-button @click="handleSettle" type="primary" class="w-40">完结</el-button>
-		</el-card>
-	</el-drawer>
-</template>
-
-<script lang="ts" setup>
-	import { defineProps, defineEmits, type FormInstance } from 'vue'
-	import {
-		apiBeforehandOrderLogLists,
-		apiBeforehandOrderLogSave,
-		apiBeforehandOrderSettle,
-		apiBeforehandOrderLogConfirm
-	} from '@/api/beforehand_order'
-	import { Plus } from '@element-plus/icons-vue'
-	import type { UploadProps, UploadUserFile } from 'element-plus'
-	import { adminLists } from '@/api/perms/admin'
-
-	const props = defineProps({
-		modelValue: {
-			type: Boolean,
-			required: true
-		}
-	})
-	const emit = defineEmits(['update:modelValue'])
-
-	const visible = computed({
-		get: () => props.modelValue,
-		set: (value) => emit('update:modelValue', value)
-	})
-
-	const formData = reactive({
-		order_id: '',
-		images: [],
-		remark: '',
-		admin_id: ''
-	})
-	const formRef = shallowRef<FormInstance>()
-
-	const handleSubmit = async () => {
-		await formRef.value?.validate()
-		const data : any = { ...formData }
-		await apiBeforehandOrderLogSave(data)
-		handleClose()
-	}
-
-	const fileList = ref([])
-
-	const auditStatus = ref(false)
-	const dataList = ref([])
-	const open = (id) => {
-		formData.order_id = id
-		auditStatus.value = false
-		dataList.value = []
-		apiBeforehandOrderLogLists({ order_id: id }).then((res : any) => {
-			if (res.audit_status == 1) {
-				auditStatus.value = true
-			}
-			dataList.value = res.list
-		})
-	}
-	const handleClose = () => {
-		emit('close')
-	}
-
-	const userloading = ref(false)
-	const userList = ref([])
-	const remoteMethodUser = (e = '') => {
-		userloading.value = true
-		adminLists({
-			name: e,
-			page_size: 10
-		})
-			.then((res) => {
-				userList.value = res.lists
-				setTimeout(() => {
-					userloading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					userloading.value = false
-				}, 300)
-			})
-	}
-
-	const handleConfirm = async (row) => {
-		await apiBeforehandOrderLogConfirm(row)
-		emit('close')
-	}
-
-	const handleSettle = async () => {
-		await apiBeforehandOrderSettle({ id: formData.order_id })
-		emit('close')
-	}
-
-	defineExpose({
-		open
-	})
-</script>
\ No newline at end of file
diff --git a/src/views/order/beforehand_order/component/editProduct.vue b/src/views/order/beforehand_order/component/editProduct.vue
deleted file mode 100644
index 7d888585e..000000000
--- a/src/views/order/beforehand_order/component/editProduct.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input v-model="formData.store_name" disabled />
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input
-                        v-model="formData.nums"
-                        clearable
-                        placeholder="请输入数量"
-                        :readonly="false"
-                        @change="compute"
-                    />
-                </el-form-item>
-                <el-form-item label="零售价" prop="purchases">
-                    <el-input
-                        v-model="formData.purchases"
-                        clearable
-                        placeholder="请输入价格"
-                        :readonly="false"
-                        @change="compute"
-                        :disabled="formData.type == 0"
-                    />
-                </el-form-item>
-                <el-form-item label="总价" prop="total_price">
-                    <el-input
-                        v-model="formData.total_price"
-                        clearable
-                        placeholder="请输入价格"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="备注" prop="mark">
-                    <el-input
-                        v-model="formData.mark"
-                        clearable
-                        placeholder="请输入备注"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiBeforehandOrderCartInfoEdit,
-    apiBeforehandOrderCartInfoDetail
-} from '@/api/beforehand_order_cart_info'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品' : '新增商品仓储订单'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    bhoid: '',
-    type: 0,
-    store_name: '',
-    total_price: '',
-    nums: '',
-    purchases: '',
-    mark: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({})
-const compute = () => {
-    formData.total_price = (formData.nums * formData.purchases).toFixed(2)
-}
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    formData.nums = data.cart_num
-    formData.purchases = data.price
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiBeforehandOrderCartInfoDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    await apiBeforehandOrderCartInfoEdit(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/beforehand_order/component/goodsOffer.vue b/src/views/order/beforehand_order/component/goodsOffer.vue
deleted file mode 100644
index e7b104b00..000000000
--- a/src/views/order/beforehand_order/component/goodsOffer.vue
+++ /dev/null
@@ -1,547 +0,0 @@
-<template>
-    <div>
-        <el-form class="inline-block" :model="queryParams" inline>
-            <el-form-item label="名称" prop="store_name">
-                <el-input
-                    class="w-[280px]"
-                    v-model="queryParams.store_name"
-                    clearable
-                    placeholder="请输入名称"
-                />
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="resetPage">查询</el-button>
-                <export-data
-                    class="ml-2.5"
-                    :fetch-fun="apiPurchaseProductOfferLists"
-                    :params="queryParams"
-                    :page-size="pager.size"
-                />
-            </el-form-item>
-        </el-form>
-        <el-button type="primary" @click="no_storage(0)" class="mb-4"> 未入库 </el-button>
-        <el-button type="primary" @click="no_storage(1)" class="mb-4"> 已入库 </el-button>
-        <!-- <el-button
-            type="primary"
-            @click="OclickDialogBuyer"
-            v-perms="['beforehand_order.beforehand_order/oneClickStorage']"
-            class="mb-4"
-        >
-            一键入库
-        </el-button> -->
-        <el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
-            <el-table-column prop="id" label="ID" width="60" />
-            <el-table-column label="商品图片" prop="image" width="120">
-                <template #default="{ row }">
-                    <el-image
-                        style="width: 50px; height: 50px"
-                        :src="row.image"
-                        :preview-teleported="true"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-            <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-
-            <el-table-column label="供应商" prop="supplier_name" show-overflow-tooltip />
-            <el-table-column label="需求数量" prop="need_num" show-overflow-tooltip />
-
-            <el-table-column label="采购数量" prop="buyer_nums" show-overflow-tooltip />
-            <el-table-column label="采购价" prop="price" show-overflow-tooltip />
-            <el-table-column label="采购总价" prop="total_price" show-overflow-tooltip />
-            <el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip />
-
-            <el-table-column label="采购状态" prop="buyer_confirm_name" show-overflow-tooltip />
-            <el-table-column label="支付方式" prop="pay_type_name" show-overflow-tooltip />
-            <el-table-column label="是否入库" prop="is_storage_name" show-overflow-tooltip />
-            <el-table-column label="来源订单信息" prop="unit_name" show-overflow-tooltip>
-                <template #default="{ row }">
-                    <div v-for="item in row.source_order_info">
-                        <div>订单id：{{ item.source_order_id }}</div>
-                        <div>数量：{{ item.need_num }}</div>
-                        <div>订单备注：{{ item.mark }}</div>
-                    </div>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" fixed="right" width="180">
-                <template #default="{ row }">
-                    <el-button
-                        v-if="row.is_storage == 0"
-                        type="primary"
-                        link
-                        @click="procureClick(row)"
-                        >采购设置</el-button
-                    >
-                    <el-button
-                        v-if="row.is_storage == 0"
-                        type="primary"
-                        link
-                        v-perms="['beforehand_order.beforehand_order/oneClickStorage']"
-                        @click="storeroomClick(row)"
-                        >分拣入库</el-button
-                    >
-                    <!-- <el-button
-                        type="primary"
-                        link
-                        @click="productOfferClick(row)"
-                        v-perms="['purchase_product_offer.purchase_product_offer/warehouse']"
-                        >修改入库</el-button
-                    > -->
-                    <el-button
-                        type="danger"
-                        link
-                        @click="handleDelete(row.id)"
-                        v-perms="['purchase_product_offer.purchase_product_offer/delete']"
-                        >删除</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
-        <!-- <div class="flex mt-4 justify-end">
-            <pagination
-                v-if="pager.lists"
-                v-model="pager"
-                @change="getLists"
-            />
-        </div> -->
-    </div>
-    <el-dialog v-model="dialogBuyer" title="入库设置" width="600">
-        <el-form ref="formRef" :model="one_click_storage" label-width="90px">
-            <el-form-item label="仓库">
-                <el-select
-                    v-model="one_click_storage.warehouse_id"
-                    placeholder="请选择仓库"
-                    size="large"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in warehouse_list"
-                        :label="item.name"
-                        :value="item.id"
-                        :key="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="备注" prop="remark">
-                <el-input
-                    v-model="one_click_storage.remark"
-                    clearable
-                    placeholder="请输入备注"
-                    :readonly="false"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="dialogBuyer = false">取消</el-button>
-                <el-button type="primary" @click="oneClickStorage" :disabled="disableClick">
-                    确认
-                </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="procureShow" title="采购设置" width="600">
-        <el-form ref="formRef" :model="formData" label-width="90px">
-            <el-form-item label="供应商">
-                <el-select
-                    v-model="formData.supplier_id"
-                    filterable
-                    reserve-keyword
-                    placeholder="输入供应商名称搜索"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in supplierList"
-                        :key="item.id"
-                        :label="item.mer_name"
-                        :value="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="数量" prop="buyer_nums">
-                <el-input
-                    v-model="formData.buyer_nums"
-                    clearable
-                    placeholder="请输入采购数量"
-                    :readonly="false"
-                    @change="compute"
-                />
-            </el-form-item>
-            <!-- <el-form-item label="采购价" prop="purchase_price">
-                <el-input
-                    v-model="formData.purchase_price"
-                    clearable
-                    placeholder="请输入采购价"
-                    :readonly="false"
-                />
-            </el-form-item>
-            <el-form-item label="采购净价" prop="purchase">
-                <el-input
-                    v-model="formData.purchase"
-                    clearable
-                    placeholder="请输入采购净价"
-                    :readonly="false"
-                    disabled
-                />
-            </el-form-item>                    @change="compute"
- -->
-            <el-form-item label="采购总价" prop="total_price">
-                <el-input
-                    v-model="formData.total_price"
-                    clearable
-                    placeholder="请输入采购总价"
-                    :readonly="false"
-                />
-            </el-form-item>
-            <el-form-item label="付款方式" prop="pay_type">
-                <el-radio-group v-model="formData.pay_type">
-                    <el-radio :label="1">赊账</el-radio>
-                    <el-radio :label="2">现金</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <!-- <el-form-item label="包装" prop="package">
-                <el-input v-model="formData.package" placeholder="请输入包装" />
-            </el-form-item>
-            <el-form-item label="规格" prop="store_info">
-                <el-input v-model="formData.store_info" placeholder="请输入规格" />
-            </el-form-item>
-            <el-form-item label="型号" prop="marques">
-                <el-input v-model="formData.marques" placeholder="请输入型号" />
-            </el-form-item>
-            <el-form-item label="售后" prop="after_sales">
-                <el-input v-model="formData.after_sales" placeholder="请输入售后" />
-            </el-form-item>
-            <el-form-item label="生产日期" prop="manufacture">
-                <el-date-picker
-                    v-model="formData.manufacture"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    placeholder="请输入生产日期"
-                />
-            </el-form-item>
-            <el-form-item label="保质期" prop="expiration_date">
-                <el-date-picker
-                    v-model="formData.expiration_date"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    placeholder="请输入保质期"
-                />
-            </el-form-item> -->
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="procureShow = false">取消</el-button>
-                <el-button type="primary" @click="setProcureInfo"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="storeroomShow" title="分拣设置" width="600">
-        <el-form ref="formRef" :model="storeroom" label-width="90px">
-            <el-form-item label="仓库">
-                <el-select
-                    v-model="storeroom.warehouse_id"
-                    placeholder="请选择仓库"
-                    size="large"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in warehouse_list"
-                        :label="item.name"
-                        :value="item.id"
-                        :key="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="采购数量" prop="buyer_nums">
-                <el-input v-model="storeroom.buyer_nums" readonly />
-            </el-form-item>
-            <el-form-item label="分拣数量" prop="warehouse_num">
-                <el-input
-                    v-model="storeroom.warehouse_num"
-                    clearable
-                    placeholder="请输入分拣数量"
-                    :readonly="false"
-                    @change="compute"
-                />
-            </el-form-item>
-            <el-form-item label="备注" prop="mark">
-                <el-input
-                    v-model="storeroom.mark"
-                    clearable
-                    placeholder="请输入备注"
-                    :readonly="false"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="storeroomShow = false">取消</el-button>
-                <el-button type="primary" @click="putInStorage" :disabled="disableClick">
-                    确认
-                </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="productOfferShow" title="入库设置" width="600">
-        <el-form ref="formRef" :model="productOfferData" label-width="90px">
-            <el-form-item label="采购数量" prop="buyer_nums">
-                <el-input
-                    v-model="productOfferData.buyer_nums"
-                    clearable
-                    placeholder="请输入采购数量"
-                    :readonly="false"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="productOfferShow = false">取消</el-button>
-                <el-button type="primary" @click="productOfferInfo"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-import {
-    apiPurchaseProductOfferLists,
-    apiPurchaseProductOfferSetProcureInfo,
-    apiPurchaseProductOffersetStoreroomInfo,
-    apiPurchaseProductOffersetStoreroomInfoTwo,
-    apiPurchaseProductOfferDelete
-} from '@/api/purchase_product_offer'
-import {
-    apiBeforehandOrderCartInfoOneClickStorage,
-    apiBeforehandOrderCartInfoPutInStorage
-} from '@/api/beforehand_order_cart_info'
-import { apiWarehouseLists } from '@/api/warehouse'
-import { apiSupplierLists } from '@/api/supplier'
-import { useDictData } from '@/hooks/useDictOptions'
-import feedback from '@/utils/feedback'
-
-const order_id = ref({ id: 0 })
-const outbound_lv = ref('')
-const dialogBuyer = ref(false)
-const procureShow = ref(false)
-const storeroomShow = ref(false)
-const productOfferShow = ref(false)
-const warehouse_list = ref([])
-const disableClick = ref(false)
-
-const one_click_storage = ref({
-    bhoid: order_id.value.id,
-    warehouse_id: '',
-    remark: ''
-})
-const formData = ref({
-    id: '',
-    bhoid: order_id.value.id,
-    supplier_id: '',
-    purchase: 0,
-    purchase_price: 0,
-    outbound_price: 0,
-    total_price: 0,
-    buyer_nums: 0,
-    package: '',
-    store_info: '',
-    marques: '',
-    after_sales: '',
-    pay_type: 1,
-    manufacture: '',
-    expiration_date: ''
-})
-
-const storeroom = ref({
-    id: '',
-    bhoid: order_id.value.id,
-    product_id: '',
-    buyer_nums: '',
-    warehouse_num: '',
-    warehouse_id: '',
-    mark: ''
-})
-const productOfferData = ref({
-    id: '',
-    buyer_nums: ''
-})
-const no_storage = (type: any) => {
-    queryParams.is_storage = type
-    getLists()
-}
-// 重置表单
-const resetFormData = () => {
-    formData.value = {
-        id: '',
-        bhoid: order_id.value.id,
-        supplier_id: '',
-        purchase: 0,
-        purchase_price: 0,
-        outbound_price: 0,
-        total_price: 0,
-        buyer_nums: 0,
-        package: '',
-        store_info: '',
-        marques: '',
-        after_sales: '',
-        pay_type: 1,
-        manufacture: '',
-        expiration_date: ''
-    }
-}
-const oneClickStorage = async () => {
-    disableClick.value = true
-    try {
-        await apiBeforehandOrderCartInfoOneClickStorage(one_click_storage.value)
-        dialogBuyer.value = false
-        disableClick.value = false
-        getLists()
-    } catch (error) {
-        setTimeout(() => {
-            disableClick.value = false
-        }, 2000)
-    }
-}
-/**
- * 采购信息设置
- */
-const setProcureInfo = () => {
-    apiPurchaseProductOfferSetProcureInfo(formData.value).then((res) => {
-        procureShow.value = false
-        resetFormData()
-        getLists()
-    })
-}
-
-const putInStorage = () => {
-    try {
-        apiBeforehandOrderCartInfoPutInStorage(storeroom.value).then((res) => {
-            storeroomShow.value = false
-            disableClick.value = false
-            getLists()
-        })
-    } catch (error) {
-        setTimeout(() => {
-            disableClick.value = false
-        }, 2000)
-    }
-}
-
-/**
- * 库房信息设置
- */
-const setStoreroomInfo = () => {
-    apiPurchaseProductOffersetStoreroomInfo(storeroom.value).then((res) => {
-        storeroomShow.value = false
-        resetFormData()
-        getLists()
-    })
-}
-const productOfferInfo = () => {
-    apiPurchaseProductOffersetStoreroomInfoTwo(productOfferData.value).then((res) => {
-        productOfferShow.value = false
-        resetFormData()
-        getLists()
-    })
-}
-const procureClick = (data: any) => {
-    if (supplierList.value.length <= 0) {
-        apiSupplierLists({ page_size: 999 }).then((res) => {
-            supplierList.value = res.lists
-        })
-    }
-    formData.value.id = data.id
-    formData.value.buyer_nums = data.need_num
-    formData.value.purchase = data.price
-    formData.value.total_price = data.total_price
-
-    formData.value.package = data.package
-    formData.value.store_info = data.store_info
-    formData.value.marques = data.marques
-    formData.value.after_sales = data.after_sales
-    formData.value.pay_type = data.pay_type
-    formData.value.supplier_id = data.supplier_id
-    formData.value.manufacture = data.manufacture
-    formData.value.expiration_date = data.expiration_date
-
-    dictData.outbound_floating.forEach((item) => {
-        if (item.value == data.top_cate_name) {
-            outbound_lv.value = `${item.name}|${item.value}`
-        }
-    })
-    procureShow.value = true
-}
-const storeroomClick = (data: any) => {
-    storeroom.value.id = data.id
-    storeroom.value.bhoid = data.order_id
-    storeroom.value.product_id = data.product_id
-    storeroom.value.buyer_nums = data.buyer_nums
-    storeroom.value.warehouse_num = ''
-    storeroomShow.value = true
-    apiWarehouseLists({}).then((res) => {
-        warehouse_list.value = res.lists
-    })
-}
-const productOfferClick = (data: any) => {
-    productOfferData.value.id = data.id
-    productOfferData.value.buyer_nums = data.buyer_nums
-    productOfferShow.value = true
-}
-const compute = () => {
-    formData.value.purchase = (formData.value.total_price / formData.value.buyer_nums).toFixed(2)
-}
-const OclickDialogBuyer = () => {
-    dialogBuyer.value = true
-    apiWarehouseLists({}).then((res) => {
-        warehouse_list.value = res.lists
-    })
-}
-const queryParams = reactive({
-    order_id: order_id.value.id,
-    store_name: '',
-    is_adopt: '',
-    page_size: 200,
-    page_no: 1,
-    is_mer: 1
-})
-const supplierLoading = ref(false)
-const supplierList = ref([])
-const remoteMethodSupplier = (e = '') => {
-    supplierLoading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            supplierList.value = res.lists
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-}
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseProductOfferLists,
-    params: queryParams
-})
-// 获取字典数据
-const { dictData } = useDictData('outbound_floating')
-function getList(id) {
-    order_id.value.id = id
-    one_click_storage.value.bhoid = id
-    formData.value.bhoid = id
-    queryParams.order_id = id
-    getLists()
-}
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiPurchaseProductOfferDelete({ id })
-    getLists()
-}
-defineExpose({
-    getList
-})
-</script>
diff --git a/src/views/order/beforehand_order/component/orderCartInfo.vue b/src/views/order/beforehand_order/component/orderCartInfo.vue
deleted file mode 100644
index b2b60d1bc..000000000
--- a/src/views/order/beforehand_order/component/orderCartInfo.vue
+++ /dev/null
@@ -1,370 +0,0 @@
-<template>
-    <div>
-        <el-form class="inline-block" :model="queryParams" inline>
-            <el-form-item label="名称" prop="store_name">
-                <el-input
-                    class="w-[280px]"
-                    v-model="queryParams.store_name"
-                    clearable
-                    placeholder="请输入名称"
-                />
-            </el-form-item>
-            <el-form-item>
-                <!-- <el-button type="primary" @click="fixAcceptNum">修复分拣数量</el-button> -->
-                <el-button type="primary" @click="resetPage">查询</el-button>
-				<el-button type="primary" @click="syncPrice">同步价格</el-button>
-                <export-data
-                    class="ml-2.5"
-                    :fetch-fun="apiBeforehandOrderCartInfoLists"
-                    :params="queryParams"
-                    :page-size="pager.size"
-                />
-            </el-form-item>
-        </el-form>
-
-        <el-radio-group v-model="queryParams.top_cate_value" style="margin-left: 30px">
-            <el-radio
-                :value="0"
-                label="全部"
-                @change="topCateChange({ name: '全部', id: 0 })"
-            ></el-radio>
-            <el-radio
-                :value="item.id"
-                :label="item.name"
-                v-for="item in formData.top_cate"
-                :key="item.id"
-                @change="topCateChange(item)"
-            ></el-radio>
-        </el-radio-group>
-        <div>
-            <el-table :data="pager.lists" v-loading="pager.loading">
-                <el-table-column label="id" prop="id" show-overflow-tooltip />
-                <el-table-column label="商品信息" prop="store_name" show-overflow-tooltip>
-                    <template #default="{ row }">
-                        <div class="flex items-center">
-                            <el-image
-                                :src="row.image"
-                                class="w-16 h-16 mr-2"
-                                :preview-teleported="true"
-                            ></el-image>
-                            <div>{{ row.store_name }}</div>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="分类" prop="top_cate_name" show-overflow-tooltip />
-                <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-                <el-table-column label="仓库库存" prop="warehouse_stock" show-overflow-tooltip />
-                <el-table-column label="需要数量" prop="cart_num" show-overflow-tooltip />
-                <el-table-column label="分拣数量" prop="accept_num" show-overflow-tooltip />
-                <el-table-column label="零售价" prop="price" show-overflow-tooltip />
-                <el-table-column label="合计金额" prop="total_price" show-overflow-tooltip />
-                <el-table-column label="支付金额" prop="pay_price" show-overflow-tooltip />
-                <el-table-column label="采购订单" prop="procurement_order_id" show-overflow-tooltip>
-                    <template #default="{ row }">
-						<router-link class="ml-4 text-[#63c869]" :to="{ path: 'beforehand_order_details', query: { id: row.procurement_order_id } }">
-						    {{row.procurement_order_id}}
-						</router-link>
-                    </template>
-                </el-table-column>
-				<el-table-column label="是否门店出货" prop="store_sale" show-overflow-tooltip>
-				    <template #default="{ row }">
-						<el-switch v-model="row.store_sale" :active-value="1" :inactive-value="0" active-text="是"
-						    inactive-text="否" inline-prompt @change="setStoreSale(row.id)" />
-				    </template>
-				</el-table-column>
-                <el-table-column
-                    label="是否需采购"
-                    prop="is_buyer"
-                    show-overflow-tooltip
-                    width="120"
-                >
-                    <template #default="{ row }">
-                        <div v-if="row.is_buyer == 0">
-                            <el-button
-                                type="danger"
-                                round
-                                size="small"
-                                @click="handleBuyer(-1, row)"
-                                >否</el-button
-                            >
-                            <el-button
-                                type="success"
-                                round
-                                size="small"
-                                @click="handleBuyer(1, row)"
-                                >是</el-button
-                            >
-                        </div>
-                        <div v-else>
-                            <span v-if="row.is_buyer == 1"
-                                >{{ row.status_name
-                                }}<el-button
-                                    type="success"
-                                    round
-                                    size="small"
-                                    @click="handleBuyer(-1, row)"
-                                    v-if="row.status_name == '采购中'"
-                                    >不采</el-button
-                                ></span
-                            >
-                            <span v-if="row.is_buyer == -1"
-                                >无需采购
-                                <el-button
-                                    type="success"
-                                    round
-                                    size="small"
-                                    @click="handleBuyer(1, row)"
-                                    >重采</el-button
-                                ></span
-                            >
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                <el-table-column label="操作" width="120" fixed="right">
-                    <template #default="{ row }">
-                        <el-button
-                            type="primary"
-                            link
-                            @click="handleEdit(row, 0)"
-                            v-perms="['beforehand_order_cart_info.beforehand_order_cart_info/edit']"
-                        >
-                            编辑
-                        </el-button>
-                        <el-button
-                            v-perms="[
-                                'beforehand_order_cart_info.beforehand_order_cart_info/edit1'
-                            ]"
-                            type="primary"
-                            link
-                            @click="handleEdit(row, 1)"
-                        >
-                            价格编辑
-                        </el-button>
-                        <el-button
-                            v-perms="[
-                                'beforehand_order_cart_info.beforehand_order_cart_info/delete'
-                            ]"
-                            type="danger"
-                            link
-                            @click="handleDeletes(row.id)"
-                        >
-                            删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-        <el-dialog v-model="dialogBuyer" title="设置采购" width="600">
-            <el-form ref="formRef" :model="purchase_product_offer" label-width="120px">
-                <el-form-item label="采购人员">
-                    <el-select
-                        v-model="purchase_product_offer.buyer_id"
-                        placeholder="请选择采购人员"
-                        size="large"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in delivery_list"
-                            :label="item.nickname"
-                            :value="item.uid"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="采购数量" prop="need_num">
-                    <el-input
-                        v-model="purchase_product_offer.need_num"
-                        clearable
-                        placeholder="请输入采购数量"
-                        :readonly="false"
-                    />
-                </el-form-item>
-				<el-form-item label="是否合并采购" prop="merge_product">
-				    <el-radio-group v-model="purchase_product_offer.merge_product">
-				        <el-radio :label="1">是</el-radio>
-				        <el-radio :label="2">否</el-radio>
-				    </el-radio-group>
-				</el-form-item>
-                <el-form-item label="备注" prop="mark">
-                    <el-input
-                        v-model="purchase_product_offer.mark"
-                        clearable
-                        placeholder="请输入备注"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="dialogBuyer = false">取消</el-button>
-                    <el-button type="primary" @click="goodsOfferUpdate"> 确认 </el-button>
-                </div>
-            </template>
-        </el-dialog>
-        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-import {
-    apiBeforehandOrderCartInfoLists,
-    apiBeforehandOrderCartInfoDelete,
-    apiBeforehandOrderCartInfoProcurementStatus,
-    apiBeforehandOrderCartInfoFix,
-    apiBeforehandOrderCartInfoSyncPrice,
-	apiBeforehandOrderCartInfoSetStoreSale
-} from '@/api/beforehand_order_cart_info'
-import { apiDeliveryServiceLists } from '@/api/delivery_service'
-import feedback from '@/utils/feedback'
-import { apiPurchaseProductOfferAdd } from '@/api/purchase_product_offer'
-import EditPopup from './editProduct.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-
-// 是否显示编辑框
-const showEdit = ref(false)
-const ids = ref()
-const dialogBuyer = ref(false)
-// 编辑
-const handleEdit = async (data: any, type: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    data.type = type
-    editRef.value?.setFormData(data)
-}
-// 删除
-const handleDeletes = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiBeforehandOrderCartInfoDelete({ id })
-    getLists()
-}
-const formData = ref({
-    id: '',
-    top_cate: []
-})
-const queryParams = reactive({
-    store_name: '',
-    bhoid: '',
-    pay_type: '',
-    top_cate: '',
-    top_cate_value: ''
-})
-
-const purchase_product_offer = ref({
-    order_id: '',
-    product_id: '',
-    need_num: '',
-    unit: '',
-    is_buyer: '',
-    buyer_id: '',
-	merge_product: 2,
-    mark: ''
-})
-const goodsOfferUpdate = () => {
-    apiPurchaseProductOfferAdd(purchase_product_offer.value).then((res) => {
-        getLists()
-        dialogBuyer.value = false
-    })
-}
-const delivery_list = ref([])
-const DeliveryService = () => {
-    apiDeliveryServiceLists({ type: 3 }).then((res) => {
-        delivery_list.value = res.lists
-    })
-}
-
-/**
- * 是否需采购
- * @param e
- */
-const handleBuyer = (e, row) => {
-    if (e == 1) {
-        purchase_product_offer.value.order_id = row.bhoid
-        purchase_product_offer.value.product_id = row.product_id
-        purchase_product_offer.value.unit = row.unit
-        purchase_product_offer.value.need_num = row.cart_num
-        purchase_product_offer.value.mark = row.mark
-        purchase_product_offer.value.is_buyer = '1'
-        DeliveryService()
-        dialogBuyer.value = true
-    } else {
-        apiBeforehandOrderCartInfoProcurementStatus({
-            id: row.id
-        }).then(() => {
-            getLists()
-        })
-    }
-}
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiBeforehandOrderCartInfoLists,
-    params: queryParams
-})
-const topCateChange = (row: any) => {
-    if (row.id == 0) {
-        queryParams.top_cate = ''
-        queryParams.top_cate_value = '全部'
-        getLists()
-    } else {
-        queryParams.top_cate = row.id
-        queryParams.top_cate_value = row.name
-
-        getLists()
-    }
-}
-
-const beforehand_order_cart_info = () => {
-    apiBeforehandOrderCartInfoLists({
-        export: 2,
-        bhoid: formData.value.id
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-
-function getList(data: any) {
-    formData.value = data
-    queryParams.bhoid = data.id
-    getLists()
-}
-
-const fixAcceptNum = () => {
-    apiBeforehandOrderCartInfoFix({
-        bhoid: formData.value.id
-    }).then((res) => {
-        ElMessage.success('处理成功')
-        getLists()
-    })
-}
-
-const syncPrice = async() => {
-	await apiBeforehandOrderCartInfoSyncPrice({
-        bhoid: formData.value.id
-    })
-	getLists()
-}
-
-const setStoreSale = async(id) => {
-	await apiBeforehandOrderCartInfoSetStoreSale({
-        id: id
-    })
-	getLists()
-}
-
-onMounted(() => {
-    queryParams.bhoid = route.query.id
-    formData.value.id = route.query.id
-    getLists()
-})
-defineExpose({
-    getList
-})
-</script>
diff --git a/src/views/order/beforehand_order/component/outbound.vue b/src/views/order/beforehand_order/component/outbound.vue
deleted file mode 100644
index 2b95b62c1..000000000
--- a/src/views/order/beforehand_order/component/outbound.vue
+++ /dev/null
@@ -1,315 +0,0 @@
-<template>
-    <div>
-        <el-button
-            type="primary"
-            @click="OclickDialogBuyer"
-            v-perms="['beforehand_order.beforehand_order/createOutboundOrder']"
-        >
-            一键出库
-        </el-button>
-        <!-- <el-button type="primary" @click="xlsx(1)"> 打印采购单 </el-button> -->
-        <!-- <el-button type="primary" @click="xlsx(2)"> 打印供货单 </el-button>
-        <el-button type="primary" @click="xlsx(3)"> 打印商户/会员单 </el-button> -->
-        <!-- <el-button type="primary" @click="xlsx(4)"> 打印零售单 </el-button> -->
-        <el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
-            <el-table-column prop="id" label="ID" width="60" />
-            <el-table-column label="商品图片" prop="image" width="120">
-                <template #default="{ row }">
-                    <el-image
-                        style="width: 50px; height: 50px"
-                        :src="row.image"
-                        :preview-teleported="true"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-            <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-
-            <!-- <el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip width="100" /> -->
-            <el-table-column label="出库数量" prop="nums" show-overflow-tooltip />
-            <el-table-column label="出库价" prop="price" show-overflow-tooltip />
-            <el-table-column label="总价" prop="total_price" show-overflow-tooltip />
-            <el-table-column label="操作" fixed="right">
-                <template #default="{ row }">
-                    <el-button
-                        type="primary"
-                        link
-                        @click="returnWarehouseClick(row)"
-                        v-perms="['beforehand_order.beforehand_order/returnWarehouseClick']"
-                        >退库</el-button
-                    >
-                    <el-button
-                        type="primary"
-                        link
-                        @click="resetWarehouseClick(row)"
-                        v-perms="['warehouse_product.warehouse_product/resetNums']"
-                        >重置数量</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-if="pager.lists" v-model="pager" @change="getLists" />
-        </div>
-    </div>
-    <el-dialog v-model="dialogBuyer" title="出库设置" width="600">
-        <el-form ref="formRef" :model="one_click_storage" label-width="90px">
-            <el-form-item label="仓库">
-                <el-select
-                    v-model="one_click_storage.warehouse_id"
-                    placeholder="请选择仓库"
-                    size="large"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in warehouse_list"
-                        :label="item.name"
-                        :value="item.id"
-                        :key="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="送货时间">
-                <el-date-picker
-                    :readonly="false"
-                    class="flex-1 !flex"
-                    v-model="one_click_storage.delivery_time"
-                    clearable
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    placeholder="选择生产日期"
-                >
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item label="门店" prop="store_id">
-                <el-select
-                    v-model="one_click_storage.store_id"
-                    placeholder="请选择门店"
-                    size="large"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in store_list"
-                        :label="item.name"
-                        :value="item.id"
-                        :key="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="备注" prop="remark">
-                <el-input
-                    v-model="one_click_storage.remark"
-                    clearable
-                    placeholder="请输入备注"
-                    :readonly="false"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="dialogBuyer = false">取消</el-button>
-                <el-button type="primary" @click="oneClickStorage" :disabled="disableClick">
-                    确认
-                </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="returnWarehouseShow" title="退货设置" width="600">
-        <el-form :model="returnWarehouseData" label-width="90px">
-            <el-form-item label="商品名称" prop="store_name">
-                <el-input
-                    v-model="returnWarehouseData.store_name"
-                    clearable
-                    :readonly="false"
-                    disabled
-                />
-            </el-form-item>
-            <el-form-item label="数量" prop="nums">
-                <el-input
-                    v-model="returnWarehouseData.nums"
-                    clearable
-                    :readonly="false"
-                    placeholder="请输入数量"
-                />
-            </el-form-item>
-            <el-form-item label="备注" prop="mark">
-                <el-input
-                    v-model="returnWarehouseData.mark"
-                    clearable
-                    :readonly="false"
-                    placeholder="请输入备注"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="returnWarehouseShow = false">取消</el-button>
-                <el-button type="primary" @click="returnWarehouseAdd"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="resetWarehouseShow" title="重置数量" width="600">
-        <el-form :model="resetWarehouseData" label-width="90px">
-            <el-form-item label="商品名称" prop="store_name">
-                <el-input
-                    v-model="resetWarehouseData.store_name"
-                    clearable
-                    :readonly="false"
-                    disabled
-                />
-            </el-form-item>
-            <el-form-item label="数量" prop="nums">
-                <el-input
-                    v-model="resetWarehouseData.nums"
-                    clearable
-                    :readonly="false"
-                    placeholder="请输入数量"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="resetWarehouseShow = false">取消</el-button>
-                <el-button type="primary" @click="resetWarehouse"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-import {
-    apiBeforehandOrderOutboundLists,
-    apiBeforehandOrderCreateOutboundOrder
-} from '@/api/beforehand_order'
-import { apiWarehouseLists } from '@/api/warehouse'
-import { apiSystemStoreLists } from '@/api/system_store'
-import { apiWarehouseOrderExport } from '@/api/warehouse_order'
-import { apiWarehouseProductReturnAdd } from '@/api/warehouse_product_return'
-import { apiWarehouseProductSetNums } from '@/api/warehouse_product'
-
-const dialogBuyer = ref(false)
-const returnWarehouseShow = ref(false)
-const resetWarehouseShow = ref(false)
-const warehouse_list = ref([])
-const store_list = ref([])
-
-const order_id = ref({ id: 0 })
-const outbound_id = ref(0)
-
-const one_click_storage = ref({
-    bhoid: order_id.value.id,
-    warehouse_id: '',
-    remark: '',
-    delivery_time: '',
-    store_id: ''
-})
-const returnWarehouseData = ref({
-    id: '',
-    nums: '',
-    store_name: '',
-    financial_pm: 1,
-    return_type: 1,
-    bhoid: '',
-    mark: ''
-})
-const resetWarehouseData = ref({
-    id: '',
-    store_name: '',
-    nums: ''
-})
-
-const disableClick = ref(false)
-const oneClickStorage = () => {
-    disableClick.value = true
-    // try {
-    apiBeforehandOrderCreateOutboundOrder(one_click_storage.value).then((res) => {
-        ElMessage.success('出库成功')
-        dialogBuyer.value = false
-        disableClick.value = false
-        getLists()
-    })
-    // } catch (error) {
-    //     setTimeout(() => {
-    //         disableClick.value = false
-    //     }, 2000)
-    // }
-    setTimeout(() => {
-        disableClick.value = false
-    }, 4000)
-}
-const OclickDialogBuyer = () => {
-    dialogBuyer.value = true
-    apiWarehouseLists({}).then((res) => {
-        warehouse_list.value = res.lists
-    })
-    apiSystemStoreLists({}).then((res) => {
-        store_list.value = res.lists
-    })
-}
-const xlsx = (type) => {
-    if (outbound_id.value > 0) {
-        apiWarehouseOrderExport({
-            id: outbound_id.value,
-            type: type
-        }).then((res) => {
-            window.open(res.url, '_blank')
-            ElMessage.success('导出成功')
-        })
-    } else {
-        ElMessage.error('出库id不能为空')
-    }
-}
-
-const returnWarehouseClick = (data: any) => {
-    returnWarehouseShow.value = true
-    returnWarehouseData.value.id = data.id
-    returnWarehouseData.value.bhoid = order_id.value.id
-    returnWarehouseData.value.store_name = data.store_name
-    returnWarehouseData.value.nums = data.nums
-}
-const resetWarehouseClick = (data: any) => {
-    resetWarehouseShow.value = true
-    resetWarehouseData.value.id = data.id
-    resetWarehouseData.value.store_name = data.store_name
-    resetWarehouseData.value.nums = data.nums
-}
-//请求退库
-const returnWarehouseAdd = (data: any) => {
-    returnWarehouseShow.value = false
-    if (returnWarehouseData.value.bhoid <= 0) {
-        ElMessage.error('订单id不能为空')
-        return false
-    }
-    apiWarehouseProductReturnAdd(returnWarehouseData.value).then((res) => {})
-}
-//重置出库商品数量
-const resetWarehouse = (data: any) => {
-    if (resetWarehouseData.value.id <= 0) {
-        ElMessage.error('id不能为空')
-        return false
-    }
-    apiWarehouseProductSetNums(resetWarehouseData.value).then((res) => {
-        resetWarehouseShow.value = false
-        getLists()
-    })
-}
-const queryParams = reactive({
-    id: order_id.value.id
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiBeforehandOrderOutboundLists,
-    params: queryParams
-})
-function getList(id, order) {
-    outbound_id.value = order.outbound_id
-    order_id.value.id = id
-    one_click_storage.value.bhoid = id
-    queryParams.id = id
-    getLists()
-}
-defineExpose({
-    getList
-})
-</script>
diff --git a/src/views/order/beforehand_order/component/returnSupplier.vue b/src/views/order/beforehand_order/component/returnSupplier.vue
deleted file mode 100644
index 6213aafb2..000000000
--- a/src/views/order/beforehand_order/component/returnSupplier.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-    <div>
-        <el-button type="primary" @click="ReturnSupplier"> 导出退供应商单 </el-button>
-        <el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
-            <el-table-column prop="id" label="ID" width="60" />
-            <el-table-column label="商品图片" prop="image" width="120">
-                <template #default="{ row }">
-                    <el-image
-                        style="width: 50px; height: 50px"
-                        :src="row.image"
-                        :preview-teleported="true"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-            <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-            <el-table-column label="退供应商数量" prop="nums" show-overflow-tooltip />
-            <el-table-column label="退供应商价" prop="price" show-overflow-tooltip />
-            <el-table-column label="退供应商总价" prop="total_price" show-overflow-tooltip />
-            <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-if="pager.lists" v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-import { apiWarehouseProductReturnLists } from '@/api/warehouse_product_return'
-import { apiPurchaseOrderReturnSupplier } from '@/api/beforehand_order'
-
-const queryParams = reactive({
-    bhoid: '',
-    return_type: 2
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseProductReturnLists,
-    params: queryParams
-})
-function getList(order) {
-    queryParams.bhoid = order.id
-    getLists()
-}
-const ReturnSupplier = () => {
-    apiPurchaseOrderReturnSupplier({ id: queryParams.bhoid }).then((res) => {
-        if (res.url != '') {
-            window.open(res.url, '_blank')
-        }
-    })
-}
-defineExpose({
-    getList
-})
-</script>
diff --git a/src/views/order/beforehand_order/component/returnWarehouse.vue b/src/views/order/beforehand_order/component/returnWarehouse.vue
deleted file mode 100644
index 16aa3c565..000000000
--- a/src/views/order/beforehand_order/component/returnWarehouse.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-    <div>
-        <el-button type="primary" @click="StockReturn"> 导出退库单 </el-button>
-        <el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
-            <el-table-column prop="id" label="ID" width="60" />
-            <el-table-column label="商品图片" prop="image" width="120">
-                <template #default="{ row }">
-                    <el-image
-                        style="width: 50px; height: 50px"
-                        :src="row.image"
-                        :preview-teleported="true"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-            <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-            <el-table-column label="退库数量" prop="nums" show-overflow-tooltip />
-            <el-table-column label="退库价" prop="price" show-overflow-tooltip />
-            <el-table-column label="退库总价" prop="total_price" show-overflow-tooltip />
-            <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-            <el-table-column label="操作" fixed="right">
-                <template #default="{ row }">
-                    <el-button
-                        type="primary"
-                        link
-                        @click="returnWarehouseClick(row)"
-                        v-perms="['beforehand_order.beforehand_order/returnSupplierClick']"
-                        >退供应商</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-if="pager.lists" v-model="pager" @change="getLists" />
-        </div>
-    </div>
-    <el-dialog v-model="returnWarehouseShow" title="退货设置" width="600">
-        <el-form :model="returnWarehouseData" label-width="90px">
-            <el-form-item label="商品名称" prop="store_name">
-                <el-input
-                    v-model="returnWarehouseData.store_name"
-                    clearable
-                    :readonly="false"
-                    disabled
-                />
-            </el-form-item>
-            <el-form-item label="数量" prop="nums">
-                <el-input
-                    v-model="returnWarehouseData.nums"
-                    clearable
-                    :readonly="false"
-                    placeholder="请输入数量"
-                />
-            </el-form-item>
-            <el-form-item label="备注" prop="mark">
-                <el-input
-                    v-model="returnWarehouseData.mark"
-                    clearable
-                    :readonly="false"
-                    placeholder="请输入备注"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="returnWarehouseShow = false">取消</el-button>
-                <el-button type="primary" @click="returnWarehouseAdd"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-import {
-    apiWarehouseProductReturnLists,
-    apiWarehouseProductReturnAdd
-} from '@/api/warehouse_product_return'
-import { apiPurchaseOrderStockReturn } from '@/api/beforehand_order'
-const returnWarehouseShow = ref(false)
-const returnWarehouseData = ref({
-    id: '',
-    nums: '',
-    store_name: '',
-    financial_pm: 0,
-    return_type: 2,
-    bhoid: '',
-    mark: ''
-})
-const queryParams = reactive({
-    bhoid: '',
-    return_type: 1
-})
-const returnWarehouseClick = (data: any) => {
-    returnWarehouseShow.value = true
-    returnWarehouseData.value.id = data.id
-    returnWarehouseData.value.bhoid = queryParams.bhoid
-    returnWarehouseData.value.store_name = data.store_name
-    returnWarehouseData.value.nums = data.nums
-}
-//请求退库
-const returnWarehouseAdd = (data: any) => {
-    returnWarehouseShow.value = false
-    apiWarehouseProductReturnAdd(returnWarehouseData.value).then((res) => {})
-}
-const StockReturn = () => {
-    apiPurchaseOrderStockReturn({ id: queryParams.bhoid }).then((res) => {
-        if (res.url != '') {
-            window.open(res.url, '_blank')
-        }
-    })
-}
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseProductReturnLists,
-    params: queryParams
-})
-function getList(order) {
-    queryParams.bhoid = order.id
-    getLists()
-}
-defineExpose({
-    getList
-})
-</script>
diff --git a/src/views/order/beforehand_order/component/warehousing.vue b/src/views/order/beforehand_order/component/warehousing.vue
deleted file mode 100644
index 18cb675ac..000000000
--- a/src/views/order/beforehand_order/component/warehousing.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-	<div>
-		<el-button type="primary" @click="xlsx()"> 打印入库单 </el-button>
-		<el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
-			<el-table-column prop="id" label="ID" />
-			<el-table-column label="供应商" prop="supplier_name" show-overflow-tooltip />
-			<el-table-column label="商品图片" prop="image" width="120">
-				<template #default="{ row }">
-					<el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
-				</template>
-			</el-table-column>
-			<el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-			<el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-
-			<!-- <el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip width="100" /> -->
-			<el-table-column label="入库数量" prop="nums" show-overflow-tooltip />
-			<el-table-column label="采购价" prop="purchase" show-overflow-tooltip />
-			<el-table-column label="总价" prop="total_price" show-overflow-tooltip />
-			<el-table-column label="操作" fixed="right">
-				<template #default="{ row }">
-					<el-button type="primary" link @click="deleteFunc(row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div class="flex mt-4 justify-end">
-			<pagination v-if="pager.lists" v-model="pager" @change="getLists" />
-		</div>
-	</div>
-	<el-dialog v-model="resetWarehouseShow" title="重置数量" width="600">
-		<el-form :model="resetWarehouseData" label-width="90px">
-			<el-form-item label="商品名称" prop="store_name">
-				<el-input v-model="resetWarehouseData.store_name" clearable :readonly="false" disabled />
-			</el-form-item>
-			<el-form-item label="数量" prop="nums">
-				<el-input v-model="resetWarehouseData.nums" clearable :readonly="false" placeholder="请输入数量" />
-			</el-form-item>
-		</el-form>
-		<template #footer>
-			<div class="dialog-footer">
-				<el-button @click="resetWarehouseShow = false">取消</el-button>
-				<el-button type="primary" @click="resetWarehouse"> 确认 </el-button>
-			</div>
-		</template>
-	</el-dialog>
-</template>
-
-<script lang="ts" setup name="subOrder">
-	import { usePaging } from '@/hooks/usePaging'
-	import { apiBeforehandOrderWarehousingLists } from '@/api/beforehand_order'
-	import { apiWarehouseOrderRentryExport } from '@/api/warehouse_order'
-	import { apiWarehouseProductSetNums, apiWarehouseProductDelete } from '@/api/warehouse_product'
-
-	const order_id = ref({ id: 0 })
-	const warehousing_id = ref(0)
-	const resetWarehouseShow = ref(false)
-
-	const queryParams = reactive({
-		id: order_id.value.id
-	})
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiBeforehandOrderWarehousingLists,
-		params: queryParams
-	})
-	const xlsx = () => {
-		if (warehousing_id.value > 0) {
-			apiWarehouseOrderRentryExport({
-				id: warehousing_id.value
-			}).then((res) => {
-				window.open(res.url, '_blank')
-				ElMessage.success('导出成功')
-			})
-		} else {
-			ElMessage.error('入库id不能为空')
-		}
-	}
-	const resetWarehouseData = ref({
-		id: '',
-		store_name: '',
-		nums: ''
-	})
-	const resetWarehouseClick = (data : any) => {
-		resetWarehouseShow.value = true
-		resetWarehouseData.value.id = data.id
-		resetWarehouseData.value.store_name = data.store_name
-		resetWarehouseData.value.nums = data.nums
-	}
-	
-	const deleteFunc = (id) => {
-		apiWarehouseProductDelete({id}).then((res) => {
-			getLists()
-		})
-	}
-	//重置出库商品数量
-	const resetWarehouse = (data : any) => {
-		if (resetWarehouseData.value.id <= 0) {
-			ElMessage.error('id不能为空')
-			return false
-		}
-		apiWarehouseProductSetNums(resetWarehouseData.value).then((res) => {
-			resetWarehouseShow.value = false
-			getLists()
-		})
-	}
-	function getList(id, warehousing) {
-		order_id.value.id = id
-		queryParams.id = id
-		getLists()
-		warehousing_id.value = warehousing
-	}
-	defineExpose({
-		getList
-	})
-</script>
\ No newline at end of file
diff --git a/src/views/order/beforehand_order/details.vue b/src/views/order/beforehand_order/details.vue
deleted file mode 100644
index a39786ef8..000000000
--- a/src/views/order/beforehand_order/details.vue
+++ /dev/null
@@ -1,680 +0,0 @@
-<template>
-    <el-card>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">姓名：</div>
-                <div style="color: black">{{ formData.other_data?.nickname }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">手机：</div>
-                <div style="color: black">{{ formData.other_data?.phone }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">送货地址：</div>
-                <div style="color: black">{{ formData.other_data?.address }}</div>
-            </div>
-        </div>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">单号：</div>
-                <div style="color: black">{{ formData.order_id }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">支付单号：</div>
-                <div style="color: black">{{ formData.order_sn }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">门店：</div>
-                <div style="color: black">{{ formData.system_store }}</div>
-            </div>
-        </div>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">到货时间：</div>
-                <div style="color: black">{{ formData.other_data?.arrival_time }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">桌数：</div>
-                <div style="color: black">{{ formData.other_data?.tables }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">办事天数：</div>
-                <div style="color: black">{{ formData.other_data?.days }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">厨师：</div>
-                <div style="color: black">{{ formData.other_data?.chef }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">电话：</div>
-                <div style="color: black">{{ formData.other_data?.chef_phone }}</div>
-            </div>
-        </div>
-
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">采购事由：</div>
-                <div style="color: black">{{ formData.other_data?.purpose }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">备注：</div>
-                <div style="color: black">{{ formData.mark }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">代购备注：</div>
-                <div style="color: black">{{ formData.other_data?.store_mark }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">分单员：</div>
-                <div style="color: black">{{ formData.other_data?.splitting_officer }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">跟单员：</div>
-                <div style="color: black">{{ formData.other_data?.merchandiser }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">仓管员：</div>
-                <div style="color: black">{{ formData.other_data?.distribution_personnel }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">运输员：</div>
-                <div style="color: black">{{ formData.other_data?.transporter }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">门店员：</div>
-                <div style="color: black">{{ formData.other_data?.system_store_name }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">区域经理：</div>
-                <div style="color: black">{{ formData.other_data?.regional_manager }}</div>
-            </div>
-        </div>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">总价</div>
-                <div style="color: black">￥{{ formData.total_price }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">支付金额</div>
-                <div style="color: black">￥{{ formData.pay_price }}</div>
-            </div>
-            <div class="flex flex-col flex-2">
-                <div style="color: gray">时间</div>
-                <div style="color: black">{{ formData.create_time }}</div>
-            </div>
-            <!-- <el-button @click="xlsx(formData.id, 1)"> 打印订单 </el-button> -->
-            <el-button @click="xlsx2(formData.id)"> 打印商品标签 </el-button>
-            <el-button @click="generateOrderClick"> 生成商品订单 </el-button>
-            <el-button @click="handleBuyer()" v-if="[6, 9].includes(formData.order_type)">
-                生成往期入库单
-            </el-button>
-        </div>
-        <div class="justify-between m-4">
-            <el-button v-if="formData.order_type != 7" @click="xlsx3(formData.id)">
-                打印下单清单
-            </el-button>
-            <el-button v-if="formData.order_type != 7" @click="xlsx4(formData.id)">
-                打印分配单
-            </el-button>
-            <el-button v-if="formData.order_type == 7" @click="xlsx5(formData.id)">
-                打印采购单
-            </el-button>
-            <el-button v-if="formData.order_type != 7" @click="xlsx6(formData.id)">
-                打印出库单
-            </el-button>
-            <el-button v-if="formData.order_type != 7" @click="xlsx6(formData.id, 2)">
-                打印供货单
-            </el-button>
-            <el-button v-if="formData.order_type != 7" @click="xlsx6(formData.id, 3)">
-                打印无价格出库单
-            </el-button>
-        </div>
-        <el-button type="primary" @click="dialogShop = true">
-            追加
-        </el-button>
-        <el-button
-            type="primary"
-            @click="confirm(formData.id)"
-            v-if="formData.store_staff_id > 0 && formData.is_confirm == 0"
-        >
-            确认
-        </el-button>
-
-        <el-tabs
-            v-model="activeName"
-            class="demo-tabs mt-3"
-            type="border-card"
-            @tab-change="tabChange"
-        >
-            <el-tab-pane v-if="![7, 9].includes(formData.order_type)" label="明细" name="second">
-                <orderCartInfo ref="orderCartInfoRef" :id="formData.id" />
-            </el-tab-pane>
-            <el-tab-pane v-if="[7, 9].includes(formData.order_type)" label="采购" name="offer">
-                <goodsOffer ref="goodsOfferRef" :order_id="formData.id" />
-            </el-tab-pane>
-            <el-tab-pane
-                v-if="[7, 9].includes(formData.order_type)"
-                label="入库"
-                name="warehousing"
-            >
-                <warehousing ref="warehousingRef" :order_id="formData.id" />
-            </el-tab-pane>
-            <el-tab-pane v-if="![7, 9].includes(formData.order_type)" label="出库" name="outbound">
-                <outbound ref="outboundRef" :order_id="formData.id" />
-            </el-tab-pane>
-            <el-tab-pane
-                v-if="![7, 9].includes(formData.order_type)"
-                label="退库房"
-                name="returnWarehouse"
-            >
-                <returnWarehouse ref="returnWarehouseRef" />
-            </el-tab-pane>
-            <el-tab-pane
-                v-if="![7, 9].includes(formData.order_type)"
-                label="退供应商"
-                name="returnSupplier"
-            >
-                <returnSupplier ref="returnSupplierRef" />
-            </el-tab-pane>
-        </el-tabs>
-    </el-card>
-    <el-dialog v-model="dialogShop" title="追加商品" width="1200">
-        <el-form ref="formRef" label-width="90px">
-            <div class="mb-2">
-                <el-button type="primary" @click="showProduct = true">添加商品</el-button>
-            </div>
-            <el-table :data="productList">
-                <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-                <el-table-column label="商品图片" prop="image" min-width="80">
-                    <template #default="{ row }">
-                        <el-image
-                            style="width: 50px; height: 50px"
-                            :src="row.image"
-                            :preview-teleported="true"
-                        />
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="商品名称"
-                    prop="store_name"
-                    min-width="180"
-                    show-overflow-tooltip
-                />
-                <el-table-column
-                    label="分类"
-                    prop="cate_name"
-                    min-width="80"
-                    show-overflow-tooltip
-                />
-                <el-table-column
-                    label="单位"
-                    prop="unit_name"
-                    min-width="80"
-                    show-overflow-tooltip
-                />
-                <el-table-column label="数量" min-width="150">
-                    <template #default="{ row }">
-                        <el-input v-model="row.num" @change="handleChange(row)" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="价格" min-width="150">
-                    <template #default="{ row }">
-                        <el-input v-model="row.price" disabled />
-                    </template>
-                </el-table-column>
-                <el-table-column label="总价" min-width="150">
-                    <template #default="{ row }">
-                        <el-input v-model="row.total_price" disabled />
-                    </template>
-                </el-table-column>
-                <el-table-column label="生产日期" min-width="140">
-                    <template #default="{ row }">
-                        <el-date-picker
-                            :readonly="false"
-                            class="flex-1 !flex"
-                            v-model="row.manufacture"
-                            clearable
-                            type="date"
-                            value-format="YYYY-MM-DD"
-                            placeholder="选择生产日期"
-                        >
-                        </el-date-picker>
-                    </template>
-                </el-table-column>
-                <el-table-column label="保质期" min-width="140">
-                    <template #default="{ row }">
-                        <el-date-picker
-                            :readonly="false"
-                            class="flex-1 !flex"
-                            v-model="row.expiration_date"
-                            clearable
-                            type="date"
-                            value-format="YYYY-MM-DD"
-                            placeholder="选择保质期"
-                        >
-                        </el-date-picker>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="120" fixed="right">
-                    <template #default="{ row }">
-                        <el-button type="danger" link @click="handleDeleteProdut(row.id)">
-                            删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="dialogShop = false">取消</el-button>
-                <el-button type="primary" @click="appendAdd"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="showProduct" title="选择商品" width="70%">
-        <!-- <product-pop
-            @onBindStore="onBindProduct"
-            :warehouse_id="warehouse_id"
-            :is_warehouse="1"
-        ></product-pop> -->
-        <product-warehouse-pop
-            :key="productModalKey"
-            :userId="formData.uid"
-            :order_type="formData.order_type"
-            @onBindStore="onBindProduct"
-        ></product-warehouse-pop>
-    </el-dialog>
-
-    <el-dialog v-model="generateOrderShow" title="生成支付订单设置" width="600">
-        <el-form :model="generateOrderData" label-width="90px">
-            <el-form-item label="用户">
-                <el-select
-                    v-model="generateOrderData.user_id"
-                    filterable
-                    remote
-                    reserve-keyword
-                    placeholder="输入用户名称搜索"
-                    remote-show-suffix
-                    :remote-method="remoteMethodUser"
-                    :loading="userloading"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in userList"
-                        :key="item.id"
-                        :label="`${item.real_name}|${item.mobile}  (ID:${item.id})`"
-                        :value="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="门店" prop="store_id">
-                <el-select
-                    v-model="generateOrderData.store_id"
-                    placeholder="请选择门店"
-                    size="large"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in storeList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="支付方式" prop="pay_type">
-                <el-select
-                    v-model="generateOrderData.pay_type"
-                    placeholder="请选择支付方式"
-                    size="large"
-                    style="width: 240px"
-                >
-                    <el-option label="微信小程序支付" value="7" />
-                    <el-option label="采购款支付" value="18" />
-                    <el-option label="余额支付" value="3" />
-                    <el-option label="现金支付" value="17" />
-                </el-select>
-            </el-form-item>
-			<el-form-item label="优惠金额" prop="deduction_price">
-				<el-input v-model="generateOrderData.deduction_price" clearable placeholder="请输入优惠金额" :readonly="false" />
-			</el-form-item>
-			<el-form-item label="备注" prop="mark">
-				<el-input v-model="generateOrderData.mark" clearable placeholder="请输入订单备注" :readonly="false" />
-			</el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="generateOrderShow = false">取消</el-button>
-                <el-button type="primary" @click="generateOrderAdd"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="dialogBuyer" title="设置采购" width="600">
-        <el-form ref="formRef" :model="purchase_product_offer" label-width="90px">
-            <el-form-item label="采购人员">
-                <el-select
-                    v-model="purchase_product_offer.buyer_id"
-                    placeholder="请选择采购人员"
-                    size="large"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in delivery_list"
-                        :label="item.nickname"
-                        :value="item.uid"
-                    />
-                </el-select>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="dialogBuyer = false">取消</el-button>
-                <el-button type="primary" @click="generatePastWarehouseReceiptd"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import { ElMessage, type FormInstance } from 'element-plus'
-import {
-    apiBeforehandOrderCartInfoLists,
-    apiBeforehandOrderCartInfoAppendAdd
-} from '@/api/beforehand_order_cart_info'
-import {
-    apiPurchaseOrderExport,
-    apiPurchaseOrderGenerateOrder,
-    apiBeforehandOrderDetail,
-    apiPurchaseOrderExportOrderList,
-    apiPurchaseOrderOrderAllocation,
-    apiPurchaseOrderOrderInfo,
-    apiPurchaseOrderOrderOutbound,
-    apiBeforehandOrderConfirm
-} from '@/api/beforehand_order'
-import type { PropType, nextTick } from 'vue'
-import { usePaging } from '@/hooks/usePaging'
-import { useRoute } from 'vue-router'
-import goodsOffer from './component/goodsOffer.vue'
-import orderCartInfo from './component/orderCartInfo.vue'
-import warehousing from './component/warehousing.vue'
-import outbound from './component/outbound.vue'
-import returnWarehouse from './component/returnWarehouse.vue'
-import returnSupplier from './component/returnSupplier.vue'
-import { apiUserLists } from '@/api/user'
-import { apiSystemStoreLists } from '@/api/system_store'
-import printData from './template-files/template1'
-import { hiprint } from 'vue-plugin-hiprint'
-import { apiDeliveryServiceLists } from '@/api/delivery_service'
-import { apiPurchaseProductOfferAddPurchasesOneClick } from '@/api/purchase_product_offer'
-
-const demos = () => {
-    apiBeforehandOrderCartInfoLists({ bhoid: formData.value.id }).then((res) => {
-        printData.printData.details = { ...formData.value }
-        printData.printData.table = res.lists
-        const hiprintTemplate = new hiprint.PrintTemplate({
-            template: printData.json
-        })
-        console.log(printData)
-        hiprintTemplate.print(printData, { printer: '', title: 'hiprint测试打印' })
-    })
-}
-
-const generateOrderShow = ref(false)
-
-const goodsOfferRef = ref(null)
-const warehousingRef = ref(null)
-const outboundRef = ref(null)
-const orderCartInfoRef = ref(null)
-const returnWarehouseRef = ref(null)
-const returnSupplierRef = ref(null)
-const route = useRoute()
-const dialogBuyer = ref(false)
-
-const tabChange = (type: any) => {
-    if (type == 'second') {
-        orderCartInfoRef.value?.getList(formData.value)
-    }
-    if (type == 'offer') {
-        goodsOfferRef.value?.getList(formData.value.id)
-    }
-    if (type == 'warehousing') {
-        warehousingRef.value?.getList(formData.value.id, formData.value.warehousing_id)
-    }
-    if (type == 'outbound') {
-        outboundRef.value?.getList(formData.value.id, formData.value)
-    }
-    if (type == 'returnWarehouse') {
-        returnWarehouseRef.value?.getList(formData.value)
-    }
-    if (type == 'returnSupplier') {
-        returnSupplierRef.value?.getList(formData.value)
-    }
-}
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-
-const emit = defineEmits(['success', 'close'])
-const showDialog = ref(false)
-const dialogShop = ref(false)
-const activeName = ref('second')
-const warehouse_id = ref(0)
-const is_warehouse = ref(0)
-const financial_pm = ref(0)
-// 表单数据
-const formData = ref({
-    id: '',
-    code: '',
-    total_price: '',
-    supplier_name: '',
-    warehouse_name: '',
-    system_store: '',
-    financial_pm: '',
-    order_sn: '',
-    warehousing_id: '',
-    top_cate: [],
-    uid: '',
-    store_id: '',
-    order_type: '',
-    store_staff_id: '',
-    is_confirm: 0
-})
-const generateOrderData = ref({
-    id: '',
-    user_id: '',
-    order_type: '',
-    pay_type: '',
-    store_id: '',
-	deduction_price: '0.00',
-	mark: ''
-})
-const appendAdd = () => {
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            id: item.id,
-            nums: item.num || 0,
-            unit: item.unit || 0,
-            purchase: item.price || 0,
-            prices: item.purchase || 0,
-            total_price: item.total_price || 0,
-            manufacture: item.manufacture,
-            expiration_date: item.expiration_date
-        }
-    })
-    apiBeforehandOrderCartInfoAppendAdd({
-        id: queryParams.bhoid,
-        product_arr: product_arr
-    }).then((res) => {
-        dialogShop.value = false
-    })
-	if (formData.value.order_type == 7) {
-		goodsOfferRef.value?.getList(formData.value.id)
-	}
-}
-const queryParams = reactive({
-    bhoid: route.query.id,
-    pay_type: '',
-    top_cate: '',
-    top_cate_value: ''
-})
-
-const getDetail = () => {
-    apiBeforehandOrderDetail({ id: queryParams.bhoid }).then((row: any) => {
-        formData.value = { ...row }
-        warehouse_id.value = row.warehouse_id
-        generateOrderData.value.id = row.id
-        generateOrderData.value.store_id = row.store_id
-        generateOrderData.value.user_id = row.uid
-        generateOrderData.value.order_type = row.order_type
-        if (row.financial_pm == 0) {
-            is_warehouse.value = 1
-        } else {
-            financial_pm.value = 1
-        }
-        productList.value = []
-        if ([7, 9].includes(formData.value.order_type)) {
-            activeName.value = 'offer'
-            nextTick(() => {
-                goodsOfferRef.value.getList(formData.value.id)
-            })
-        }
-    })
-}
-getDetail()
-const xlsx2 = (id) => {
-    apiPurchaseOrderExport({
-        id: id
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-const xlsx3 = (id) => {
-    apiPurchaseOrderExportOrderList({
-        id: id
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-const xlsx4 = (id) => {
-    apiPurchaseOrderOrderAllocation({
-        id: id
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-const xlsx5 = (id) => {
-    apiPurchaseOrderOrderInfo({
-        id: id,
-        print: 1
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-const xlsx6 = (id, type = 1) => {
-    apiPurchaseOrderOrderOutbound({
-        id: id,
-        type: type
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-function handleChange(row) {
-    row.total_price = row.num * row.price
-}
-//打开弹窗
-const open = () => {
-    showDialog.value = true
-}
-
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiUserLists({
-        nickname: e,
-        page_size: 10
-    })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-const storeList = ref([])
-const generateOrderClick = () => {
-    generateOrderShow.value = true
-    apiSystemStoreLists({ page_no: 1, page_size: 100 }).then((res) => {
-        storeList.value = res.lists
-    })
-}
-const purchase_product_offer = ref({
-    order_id: '',
-    buyer_id: ''
-})
-const generatePastWarehouseReceiptd = () => {
-    apiPurchaseProductOfferAddPurchasesOneClick(purchase_product_offer.value).then((res) => {})
-}
-const generateOrderAdd = () => {
-    apiPurchaseOrderGenerateOrder(generateOrderData.value).then((res) => {
-        generateOrderShow.value = false
-    })
-}
-
-const confirm = (id) => {
-    apiBeforehandOrderConfirm({ id }).then((res) => {
-        formData.value.is_confirm = 1
-    })
-}
-const delivery_list = ref([])
-const DeliveryService = () => {
-    apiDeliveryServiceLists({ type: 3 }).then((res) => {
-        delivery_list.value = res.lists
-    })
-}
-/**
- * 是否需采购
- * @param e
- */
-const handleBuyer = () => {
-    purchase_product_offer.value.order_id = formData.value.id
-    DeliveryService()
-    dialogBuyer.value = true
-}
-const productModalKey = ref(0)
-const resetUserId = (e) => {
-    productModalKey.value++
-}
-defineExpose({
-    open
-})
-</script>
diff --git a/src/views/order/beforehand_order/edit.vue b/src/views/order/beforehand_order/edit.vue
deleted file mode 100644
index 37aaf20e8..000000000
--- a/src/views/order/beforehand_order/edit.vue
+++ /dev/null
@@ -1,264 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="1000px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="用户" prop="nickname">
-                            <el-input v-model="formData.other_data.nickname" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="电话" prop="phone">
-                            <el-input v-model="formData.other_data.phone" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="地址" prop="address">
-                            <el-input
-                                v-model="formData.other_data.address"
-                                type="input"
-                                style="width: 400px"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="门店" prop="store_id" style="width: 200px">
-                            <el-select
-                                v-model="formData.store_id"
-                                placeholder="请选择门店"
-                                size="large"
-                            >
-                                <el-option
-                                    v-for="item in storeList"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="到货时间" prop="arrival_time">
-                            <el-date-picker
-                                v-model="formData.other_data.arrival_time"
-                                type="datetime"
-                                :readonly="false"
-                                clearable
-                                value-format="YYYY-MM-DD HH:mm:ss"
-                                placeholder="请选择到货时间"
-                                style="width: 180px"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="桌数" prop="tables">
-                            <el-input-number v-model="formData.other_data.tables" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="办事天数" prop="days">
-                            <el-input-number v-model="formData.other_data.days" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="厨师" prop="chef">
-                            <el-input v-model="formData.other_data.chef" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="电话" prop="chef_phone">
-                            <el-input v-model="formData.other_data.chef_phone" type="input" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="备注" prop="purpose">
-                            <el-input
-                                v-model="formData.other_data.purpose"
-                                type="input"
-                                style="width: 480px"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="内部备注" prop="mark">
-                            <el-input v-model="formData.mark" type="input" style="width: 480px" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="24">
-                        <el-form-item label="代购备注" prop="store_mark">
-                            <el-input
-                                v-model="formData.other_data.store_mark"
-                                type="textarea"
-                                :arows="3"
-                                style="width: 80%"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="4">
-                        <el-form-item label="分单员" prop="splitting_officer">
-                            <el-input
-                                v-model="formData.other_data.splitting_officer"
-                                type="input"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="跟单员" prop="merchandiser">
-                            <el-input v-model="formData.other_data.merchandiser" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="仓管员" prop="distribution_personnel">
-                            <el-input
-                                v-model="formData.other_data.distribution_personnel"
-                                type="input"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="运输员" prop="transporter">
-                            <el-input v-model="formData.other_data.transporter" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="门店员" prop="system_store_name">
-                            <el-input
-                                v-model="formData.other_data.system_store_name"
-                                type="input"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="区域经理" prop="regional_manager">
-                            <el-input v-model="formData.other_data.regional_manager" type="input" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <!-- <el-form-item label="图片" prop="file">
-                    <material-picker v-model="formData.file" :limit="1" />
-                </el-form-item> -->
-                <el-form-item
-                    label="订单类型"
-                    prop="order_type"
-                    v-perms="['beforehand_order.beforehand_order/order_type']"
-                >
-                    <el-radio-group v-model="formData.order_type" @change="handleOrderType()">
-                        <el-radio :label="1">铺货订单</el-radio>
-                        <el-radio :label="2">摊贩订单</el-radio>
-                        <el-radio :label="3">一条龙订单</el-radio>
-                        <!-- <el-radio :label="4">线上订单</el-radio> -->
-                        <el-radio :label="5">仓库补货</el-radio>
-                        <el-radio :label="6">往期补单-出库</el-radio>
-                        <el-radio :label="9">往期补单-入库</el-radio>
-                        <el-radio :label="8">其他订单</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="备注" prop="mark">
-                    <el-input
-                        v-model="formData.mark"
-                        clearable
-                        placeholder="请输入备注"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="beforehandOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiBeforehandOrderAdd,
-    apiBeforehandOrderEdit,
-    apiBeforehandOrderDetail
-} from '@/api/beforehand_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { apiSystemStoreLists } from '@/api/system_store'
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑预订单表' : '新增预订单表'
-})
-const storeList = ref([])
-apiSystemStoreLists({ page_no: 1, page_size: 100 }).then((res) => {
-    storeList.value = res.lists
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    file: '',
-    other_data: {},
-    store_id: '',
-    order_type: '',
-    mark: ''
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    const datas = await apiBeforehandOrderDetail({
-        id: data.id
-    })
-    for (const key in formData) {
-        if (datas[key] != null && datas[key] != undefined) {
-            //@ts-ignore
-            formData[key] = datas[key]
-        }
-    }
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit' ? await apiBeforehandOrderEdit(data) : await apiBeforehandOrderAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/order/beforehand_order/index.vue b/src/views/order/beforehand_order/index.vue
deleted file mode 100644
index ba14a723c..000000000
--- a/src/views/order/beforehand_order/index.vue
+++ /dev/null
@@ -1,492 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="订单号" prop="order_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.order_id"
-                        clearable
-                        placeholder="请输入订单号"
-                    />
-                </el-form-item>
-                <el-form-item label="日期" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item label="门店名称" prop="store_id">
-                    <div class="flex items-center mr-4">
-                        <el-select
-                            v-model="queryParams.store_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="输入门店名称搜索"
-                            remote-show-suffix
-                            :remote-method="remoteMethod"
-                            :loading="storeloading"
-                            style="width: 240px"
-                            @change="get_lists"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item label="支付订单号" prop="order_sn">
-                    <el-input
-                        class="w-[200px]"
-                        v-model="queryParams.order_sn"
-                        clearable
-                        placeholder="请输入订单号"
-                    />
-                </el-form-item>
-                <el-form-item label="入库单号" prop="order_rk">
-                    <el-input
-                        class="w-[200px]"
-                        v-model="queryParams.order_rk"
-                        clearable
-                        placeholder="请输入入库单号"
-                    />
-                </el-form-item>
-                <el-form-item label="出库单号" prop="order_ck">
-                    <el-input
-                        class="w-[200px]"
-                        v-model="queryParams.order_ck"
-                        clearable
-                        placeholder="请输入出库单号"
-                    />
-                </el-form-item>
-                <el-form-item label="备注" prop="mark">
-                    <el-input
-                        class="w-[200px]"
-                        v-model="queryParams.mark"
-                        clearable
-                        placeholder="请输入备注"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="storeOrderList"> 门店 </el-button>
-                    <el-button type="primary" @click="get_lists">查询</el-button>
-                    <el-button @click="getResetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiBeforehandOrderLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <router-link
-                :to="{
-                    path: 'beforehand_order_add'
-                }"
-                class="ml-4"
-            >
-                <el-button type="primary"> 添加 </el-button>
-            </router-link>
-            <router-link
-                :to="{
-                    path: 'beforehand_order_cart_info'
-                }"
-                class="ml-4"
-            >
-                <el-button type="primary"> 商品列表 </el-button>
-            </router-link>
-            <el-tabs v-model="activeName" class="demo-tabs mt-2" @tab-change="handleClick">
-                <el-tab-pane label="全部" name="all"></el-tab-pane>
-                <el-tab-pane
-                    :label="`铺货订单(${statisticsCount.order_type_1})`"
-                    name="1"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`摊贩订单(${statisticsCount.order_type_2})`"
-                    name="2"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`一条龙订单(${statisticsCount.order_type_3})`"
-                    name="3"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`线上订单(${statisticsCount.order_type_4})`"
-                    name="4"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`仓库补货(${statisticsCount.order_type_5})`"
-                    name="5"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`采购订单(${statisticsCount.order_type_7})`"
-                    name="7"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`其他订单(${statisticsCount.order_type_8})`"
-                    name="8"
-                ></el-tab-pane>
-            </el-tabs>
-            <el-tabs v-model="activeName2" @tab-change="handleClick2">
-                <el-tab-pane label="全部" name="all"></el-tab-pane>
-                <el-tab-pane
-                    :label="`未出库(${statisticsCount.outbound_0})`"
-                    name="1"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`已出库(${statisticsCount.outbound_1})`"
-                    name="2"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`未入库(${statisticsCount.warehousing_0})`"
-                    name="3"
-                ></el-tab-pane>
-                <el-tab-pane
-                    :label="`已入库(${statisticsCount.warehousing_1})`"
-                    name="4"
-                ></el-tab-pane>
-            </el-tabs>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip width="55" />
-                    <el-table-column
-                        label="操作时间/人员"
-                        prop="create_time"
-                        show-overflow-tooltip
-                        width="150"
-                    >
-                        <template #default="{ row }">
-                            <div>{{ row.admin_name }}</div>
-                            <div>{{ row.create_time }}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="单号" prop="order_id" show-overflow-tooltip width="180">
-                        <template #default="{ row }">
-                            <div>{{ row.order_id }}</div>
-                            <div>{{ row.order_sn }}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="订单类型"
-                        prop="order_type_name"
-                        show-overflow-tooltip
-                    />
-                    <!-- <el-table-column label="状态" prop="financial_pm_name" show-overflow-tooltip /> -->
-                    <el-table-column label="门店" prop="system_store" show-overflow-tooltip />
-                    <el-table-column label="入库" prop="warehousing" show-overflow-tooltip />
-                    <el-table-column label="出库" prop="outbound" show-overflow-tooltip />
-                    <el-table-column label="总价格" prop="total_price" show-overflow-tooltip />
-                    <el-table-column label="内部备注" prop="mark" show-overflow-tooltip />
-                    <el-table-column
-                        label="代购备注"
-                        prop="other_data.store_mark"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="通知" prop="msg" show-overflow-tooltip />
-                    <!-- <el-table-column label="文件" prop="file" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.file"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column> -->
-                    <el-table-column label="结算状态" prop="audit_status" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.audit_status == 1 ? '已结算' : '未结算' }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button v-if="row.order_type == 1" link @click="showCopyPop(row)">
-                                一键复制
-                            </el-button>
-							<el-button v-if="row.is_arrears == 1"  type="danger" link @click="handleTransfer(row.id)">
-							    转欠款
-							</el-button>
-                            <!-- <el-button type="danger" link @click="handleDrawer(row)">
-                                流程
-                            </el-button> -->
-                            <router-link
-                                :to="{
-                                    path: 'beforehand_order_details',
-                                    query: {
-                                        id: row.id
-                                    }
-                                }"
-                                class="ml-4"
-                            >
-                                详情
-                            </router-link>
-                            <el-button
-                                link
-                                @click="handleEdit(row)"
-                                v-perms="['beforehand_order.beforehand_order/edit']"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['beforehand_order.beforehand_order/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                            <el-button
-                                @click="xlsx7(row.id)"
-                                v-perms="['beforehand_order.beforehand_order/supply_order']"
-                                link
-                            >
-                                打印供货单
-                            </el-button>
-                            <el-button
-                                v-if="row.uid > 0"
-                                @click="xlsx8(row.id)"
-                                v-perms="['beforehand_order.beforehand_order/supply_order']"
-                                link
-                            >
-                                打印会员单
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="get_lists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <!-- <details-popup
-            v-if="showDetails"
-            ref="detailsRef"
-            @success="getLists"
-            @close="showDetails = false"
-            :dictData="dictData"
-        /> -->
-        <edit-popup v-if="showEdit" ref="editRef" @success="get_lists" @close="showEdit = false" />
-        <DrawerPop v-model="showDrawer" ref="drawerRef" @close="showDrawer = false" />
-        <CopyPop v-model="showCopy" ref="copyRef" @success="get_lists" @close="showCopy = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseOrderLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import moment from 'moment'
-import {
-    apiBeforehandOrderLists,
-    apiBeforehandOrderDelete,
-    apiBeforehandOrderSettle,
-    apiPurchaseOrderOrderOutbound,
-    apiPurchaseOrderOrderOutbound3,
-    apiBeforehandOrderCopy,
-	apiBeforehandOrderTransfer,
-    apiBeforehandOrderStatisticsCount
-} from '@/api/beforehand_order'
-import { apiSystemStoreLists } from '@/api/system_store'
-import DrawerPop from './component/drawer.vue'
-import EditPopup from './edit.vue'
-import CopyPop from './component/copyPop.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-
-// 是否显示编辑框
-const showEdit = ref(false)
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const copyRef = shallowRef<InstanceType<typeof EditPopup>>()
-
-const showDrawer = ref(false)
-const statisticsCount = ref([])
-const drawerRef = ref(null)
-const drawerData = ref([])
-const showCopy = ref(false)
-
-const activeName = ref('all')
-const handleClick = (e) => {
-    if (activeName.value == 'all') {
-        queryParams.order_type = ''
-    } else {
-        queryParams.order_type = activeName.value
-    }
-    get_lists()
-}
-const activeName2 = ref('all')
-const handleClick2 = (e) => {
-    if (activeName2.value == 'all') {
-        queryParams.warehouse_type = ''
-    } else {
-        queryParams.warehouse_type = activeName2.value
-    }
-    get_lists()
-}
-const showCopyPop = async (data: any) => {
-    showCopy.value = true
-    await nextTick()
-    copyRef.value?.open(data.id)
-}
-const handleDrawer = (data: any) => {
-    showDrawer.value = true
-    drawerRef.value?.open(data.id)
-}
-const handleTransfer = async (id: any) => {
-	await feedback.confirm('确定要转欠款吗？')
-	await apiBeforehandOrderTransfer({ id })
-	get_lists()
-}
-// 查询条件
-const queryParams = reactive({
-    is_store: route.query.is_store ? route.query.is_store : 0,
-    order_id: '',
-    product_name: '',
-    financial_pm: 1,
-    store_id: '',
-    start_time: '',
-    end_time: '',
-    supplier_id: '',
-    order_sn: '',
-    order_ck: '',
-    order_rk: '',
-    order_type: '',
-    warehouse_type: '',
-    mark: '',
-    is_store: ''
-})
-
-const storeOrderList = () => {
-    queryParams.is_store = 1
-    get_lists()
-}
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 详情
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiBeforehandOrderLists,
-    params: queryParams
-})
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiBeforehandOrderDelete({ id })
-    get_lists()
-}
-
-// 结算
-const handleSettle = async (id) => {
-    await apiBeforehandOrderSettle({ id })
-    get_lists()
-}
-
-const startEndTime = ref([])
-
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    get_lists()
-}
-const xlsx7 = (id) => {
-    apiPurchaseOrderOrderOutbound({
-        id: id,
-        type: 2
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-const xlsx8 = (id) => {
-    apiPurchaseOrderOrderOutbound3({
-        id: id
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-const statistics_count = () => {
-    apiBeforehandOrderStatisticsCount(queryParams).then((res) => {
-        statisticsCount.value = res
-    })
-}
-const get_lists = () => {
-    getLists()
-    statistics_count()
-}
-const getResetParams = () => {
-    queryParams.order_id = ''
-    queryParams.product_name = ''
-    queryParams.financial_pm = 1
-    queryParams.store_id = ''
-    queryParams.start_time = ''
-    queryParams.end_time = ''
-    queryParams.supplier_id = ''
-    queryParams.order_sn = ''
-    queryParams.order_ck = ''
-    queryParams.order_rk = ''
-    queryParams.order_type = ''
-    queryParams.warehouse_type = ''
-    queryParams.mark = ''
-    resetParams()
-}
-onMounted(() => {
-    get_lists()
-})
-</script>
diff --git a/src/views/order/beforehand_order/template-files/template1.js b/src/views/order/beforehand_order/template-files/template1.js
deleted file mode 100644
index a80f09e4d..000000000
--- a/src/views/order/beforehand_order/template-files/template1.js
+++ /dev/null
@@ -1,641 +0,0 @@
-export const name = '自定义表格'
-export const desc = '通过HTML元素实现自定义表格'
-export const author = '54xavier'
-export const link = 'https://ccsimple.gitee.io/vue-plugin-hiprint/'
-// url 或者 base64 或者 require('../../../assets/logo.png')
-export const preview = '/static/template8.png'
-export const printData = {
-    table: {},
-    details: {}
-}
-export const json = {
-    panels: [
-        {
-            index: 0,
-            name: 1,
-            height: 296.6,
-            width: 210,
-            paperHeader: 0,
-            paperFooter: 840.7559055118112,
-            printElements: [
-                {
-                    options: {
-                        left: 174,
-                        top: 12,
-                        height: 17,
-                        width: 260,
-                        fontSize: 16.5,
-                        fontWeight: '700',
-                        textAlign: 'center',
-                        hideTitle: true,
-                        title: '供 投 里 海 农 特 产 品 下 单 清 单',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 434,
-                        bottom: 28.25,
-                        vCenter: 304,
-                        hCenter: 19.75
-                    },
-                    printElementType: {
-                        title: '单据表头',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 198,
-                        top: 37.5,
-                        height: 9.75,
-                        width: 200,
-                        title: '收货地址',
-                        field: 'printData.details.other_data.address',
-                        testData: '某某区某某镇某某村某某小组某某地名',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 296.49609375,
-                        bottom: 47.49609375,
-                        vCenter: 251.49609375,
-                        hCenter: 42.62109375,
-                        qid: 'phone_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 96,
-                        top: 37.5,
-                        height: 9.75,
-                        width: 90,
-                        title: '电话',
-                        field: 'printData.details.other_data..phone',
-                        testData: '18982406440',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 185.25,
-                        bottom: 47.25,
-                        vCenter: 140.25,
-                        hCenter: 42.375,
-                        qid: 'nickname_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 405,
-                        top: 37.5,
-                        height: 9.75,
-                        width: 140,
-                        title: '订单号',
-                        field: 'printData.details.order_id',
-                        testData: 'YG1730278258811950',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 87.49609375,
-                        bottom: 67.74609375,
-                        vCenter: 52.49609375,
-                        hCenter: 62.87109375,
-                        qid: 'nickname_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 18,
-                        top: 37.5,
-                        height: 9.75,
-                        width: 70,
-                        title: '姓名',
-                        field: 'printData.details.other_data.nickname',
-                        testData: '张三',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 97.25,
-                        bottom: 47.25,
-                        vCenter: 57.25,
-                        hCenter: 42.375
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 198.5,
-                        top: 54.25,
-                        height: 9.75,
-                        width: 79,
-                        title: '采购事由',
-                        field: 'printData.details.other_data.purpose',
-                        testData: '70寿宴',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 381.49609375,
-                        bottom: 66.99609375,
-                        vCenter: 346.49609375,
-                        hCenter: 62.12109375,
-                        qid: 'nickname_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 95,
-                        top: 55,
-                        height: 9.75,
-                        width: 90,
-                        title: '电话',
-                        field: 'printData.details.other_data.chef_phone',
-                        testData: '18982406440',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 184.74609375,
-                        bottom: 91.74609375,
-                        vCenter: 139.74609375,
-                        hCenter: 86.87109375,
-                        qid: 'phone_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 17.5,
-                        top: 55,
-                        height: 9.75,
-                        width: 70,
-                        title: '厨师',
-                        field: 'printData.details.other_data.chef',
-                        testData: '张三',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 87.49609375,
-                        bottom: 88.74609375,
-                        vCenter: 52.49609375,
-                        hCenter: 83.87109375,
-                        qid: 'nickname_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 288,
-                        top: 56,
-                        height: 10,
-                        width: 45,
-                        title: '桌数',
-                        field: 'printData.details.other_data.tables',
-                        testData: '70',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 475.24609375,
-                        bottom: 68.49609375,
-                        vCenter: 435.74609375,
-                        hCenter: 63.62109375,
-                        qid: 'purpose_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 341,
-                        top: 56,
-                        height: 10,
-                        width: 60,
-                        title: '办事时间',
-                        field: 'printData.details.other_data.days',
-                        testData: '3',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 491.49609375,
-                        bottom: 67.74609375,
-                        vCenter: 468.99609375,
-                        hCenter: 62.87109375,
-                        qid: 'tables_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 197.5,
-                        top: 75,
-                        height: 9.75,
-                        width: 140,
-                        title: '到货时间',
-                        field: 'printData.details.other_data.arrival_time',
-                        testData: '2024-10-15 14:30:20',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 548.7478713989258,
-                        bottom: 90.74787139892578,
-                        vCenter: 478.7478713989258,
-                        hCenter: 85.87287139892578,
-                        qid: 'create_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 15,
-                        top: 75,
-                        height: 9.75,
-                        width: 140,
-                        title: '下单时间',
-                        field: 'printData.details.create_time',
-                        testData: '2024-10-15 14:30:20',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        right: 182.24291229248047,
-                        bottom: 90.99291229248047,
-                        vCenter: 112.24291229248047,
-                        hCenter: 86.11791229248047,
-                        qid: 'phone_1'
-                    },
-                    printElementType: {
-                        title: '文本',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 18,
-                        top: 108,
-                        height: 54,
-                        width: 558,
-                        field: 'printData.table',
-                        qid: 'table',
-                        right: 568.75,
-                        bottom: 161.25,
-                        vCenter: 293.75,
-                        hCenter: 134.25,
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        columns: [
-                            [
-                                {
-                                    width: 28.04091373500173,
-                                    title: '编号',
-                                    field: 'product_id',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 31.50798168980468,
-                                    title: '类别',
-                                    field: 'top_cate_name',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 92.52725057431623,
-                                    title: '名称',
-                                    field: 'store_name',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 32.49120839160852,
-                                    title: '毛重',
-                                    field: 'gross_weight',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 32.53381779989224,
-                                    title: '净重',
-                                    field: 'net_weight',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 29.42867753045773,
-                                    title: '单位',
-                                    field: 'unit_name',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 31.50297331923548,
-                                    title: '单价',
-                                    field: 'price',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 28.61867322166049,
-                                    title: '数量',
-                                    field: 'cart_num',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 33.35318875457845,
-                                    title: '金额',
-                                    field: 'total_price',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 29.468112230977603,
-                                    title: '包装',
-                                    field: 'package',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 31.164499506790204,
-                                    title: '押金',
-                                    field: 'deposit',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 50.09380340779709,
-                                    title: '售后',
-                                    field: 'after_sales',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 47.030224080099075,
-                                    title: '损耗',
-                                    field: 'loss',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 32.08816604575006,
-                                    title: '产地',
-                                    field: 'place_of_production',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                },
-                                {
-                                    width: 28.15050971203051,
-                                    title: '备注',
-                                    field: 'mark',
-                                    checked: true,
-                                    fixed: false,
-                                    rowspan: 1,
-                                    colspan: 1
-                                }
-                            ]
-                        ]
-                    },
-                    printElementType: {
-                        title: '订单数据',
-                        type: 'table',
-                        editable: true,
-                        columnDisplayEditable: true,
-                        columnDisplayIndexEditable: true,
-                        columnTitleEditable: true,
-                        columnResizable: true,
-                        columnAlignEditable: true,
-                        isEnableEditField: true,
-                        isEnableContextMenu: true,
-                        isEnableInsertRow: true,
-                        isEnableDeleteRow: true,
-                        isEnableInsertColumn: true,
-                        isEnableDeleteColumn: true,
-                        isEnableMergeCell: true
-                    }
-                },
-                {
-                    options: {
-                        left: 87.5,
-                        top: 172.5,
-                        height: 9.75,
-                        width: 110,
-                        title: '采购预收金额',
-                        right: 197.4921875,
-                        bottom: 182.25,
-                        vCenter: 142.4921875,
-                        hCenter: 177.375,
-                        field: 'payment_amount',
-                        testData: '100.3',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        qid: 'count_1'
-                    },
-                    printElementType: {
-                        title: '这是更新后的元素',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 292.5,
-                        top: 172.5,
-                        height: 9.75,
-                        width: 90,
-                        title: '合计预收',
-                        right: 382.5,
-                        bottom: 181.9921875,
-                        vCenter: 337.5,
-                        hCenter: 177.1171875,
-                        field: 'pay_price',
-                        testData: '100.3',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        qid: 'deposit_1'
-                    },
-                    printElementType: {
-                        title: '这是更新后的元素',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 207.5,
-                        top: 172.5,
-                        height: 9.75,
-                        width: 70,
-                        title: '押金',
-                        right: 311,
-                        bottom: 180.99609375,
-                        vCenter: 256,
-                        hCenter: 176.12109375,
-                        field: 'deposit',
-                        testData: '100.3',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        qid: 'payment_1'
-                    },
-                    printElementType: {
-                        title: '这是更新后的元素',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 390,
-                        top: 172.5,
-                        height: 9.75,
-                        width: 90,
-                        title: '接单员',
-                        right: 480.24609375,
-                        bottom: 184.74609375,
-                        vCenter: 435.24609375,
-                        hCenter: 179.87109375,
-                        field: 'admin_name',
-                        testData: '只做',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        qid: 'pay_1'
-                    },
-                    printElementType: {
-                        title: '这是更新后的元素',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 17.5,
-                        top: 172.5,
-                        height: 9.75,
-                        width: 50,
-                        title: '累计',
-                        right: 137.25,
-                        bottom: 183,
-                        vCenter: 77.25,
-                        hCenter: 178.125,
-                        field: 'count',
-                        testData: '10',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0
-                    },
-                    printElementType: {
-                        title: '这是更新后的元素',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 487.5,
-                        top: 172.5,
-                        height: 9.75,
-                        width: 90,
-                        title: '分单员',
-                        right: 576.99609375,
-                        bottom: 181.74609375,
-                        vCenter: 531.99609375,
-                        hCenter: 176.87109375,
-                        field: 'pay_price',
-                        testData: '里斯',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0,
-                        qid: 'pay_2'
-                    },
-                    printElementType: {
-                        title: '这是更新后的元素',
-                        type: 'text'
-                    }
-                },
-                {
-                    options: {
-                        left: 17.5,
-                        top: 190,
-                        height: 9.75,
-                        width: 360,
-                        title: '备注',
-                        field: 'mark',
-                        testData: '数量金额最终以实际收货金额结算，多退少补。押金退框无利息退还。',
-                        coordinateSync: false,
-                        widthHeightSync: false,
-                        qrCodeLevel: 0
-                    },
-                    printElementType: {
-                        title: '这是更新后的元素',
-                        type: 'text'
-                    }
-                }
-            ],
-            paperNumberLeft: 565,
-            paperNumberTop: 396,
-            paperNumberContinue: true,
-            watermarkOptions: {},
-            panelLayoutOptions: {}
-        }
-    ]
-}
-export default {
-    preview: preview,
-    name: name,
-    desc: desc,
-    author: author,
-    link: link,
-    printData: printData,
-    json: json
-}
diff --git a/src/views/order/beforehand_order_cart_info/index.vue b/src/views/order/beforehand_order_cart_info/index.vue
deleted file mode 100644
index b7b086593..000000000
--- a/src/views/order/beforehand_order_cart_info/index.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item label="订单id" prop="bhoid">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.bhoid"
-                        clearable
-                        placeholder="请输入订单id"
-                    />
-                </el-form-item>
-                <el-form-item label="日期" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiBeforehandOrderCartInfoLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="订单id" prop="bhoid" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <router-link
-                                class="ml-4 text-[#63c869]"
-                                :to="{ path: 'beforehand_order_details', query: { id: row.bhoid } }"
-                            >
-                                {{ row.bhoid }}
-                            </router-link>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-                    <!-- <el-table-column label="包装" prop="package" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="型号" prop="marques" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="押金" prop="deposit" show-overflow-tooltip /> -->
-                    <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                    <el-table-column label="单价" prop="price" show-overflow-tooltip />
-                    <el-table-column label="总价" prop="total_price" show-overflow-tooltip />
-                    <!-- <el-table-column label="支付金额" prop="pay_price" show-overflow-tooltip /> -->
-                    <el-table-column label="数量" prop="cart_num" show-overflow-tooltip />
-                    <!-- <el-table-column label="验收数量" prop="accept_num" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="毛重" prop="gross_weight" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="净重" prop="net_weight" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="采购状态" prop="is_buyer_name" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="售后" prop="after_sales" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="损耗" prop="loss" show-overflow-tooltip /> -->
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="beforehandOrderCartInfoLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiBeforehandOrderCartInfoLists,
-    apiBeforehandOrderCartInfoDelete
-} from '@/api/beforehand_order_cart_info'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import moment from 'moment'
-
-// 查询条件
-const queryParams = reactive({
-    store_name: '',
-    bhoid: '',
-    start_time: '',
-    end_time: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-const startEndTime = ref([])
-
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiBeforehandOrderCartInfoLists,
-    params: queryParams
-})
-
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/order/purchase_order/component/details.vue b/src/views/order/purchase_order/component/details.vue
deleted file mode 100644
index 89918c960..000000000
--- a/src/views/order/purchase_order/component/details.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="订单详情" :size="1200">
-        <div class="flex items-center justify-between">
-            <div>门店：{{ formData.system_store }}</div>
-        </div>
-        <div class="flex items-center justify-between mt-3">
-            <div>订单编号：{{ formData.order_id }}</div>
-        </div>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">订单状态</div>
-                <div style="color: black">{{ formData.storage_name }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">实际支付</div>
-                <div style="color: black">￥{{ formData.money }}</div>
-            </div>
-            <div class="flex flex-col flex-2">
-                <div style="color: gray">时间</div>
-                <div style="color: black">{{ formData.create_time }}</div>
-            </div>
-        </div>
-        <el-tabs v-model="activeName" class="demo-tabs" type="border-card">
-            <el-tab-pane label="订单信息" name="second">
-                <div>
-                    <div>
-                        <el-table :data="pager.lists" v-loading="pager.loading">
-                            <el-table-column
-                                label="商品信息"
-                                prop="store_name"
-                                show-overflow-tooltip
-                            >
-                                <template #default="{ row }">
-                                    <div class="flex items-center">
-                                        <el-image
-                                            :src="row.image"
-                                            class="w-16 h-16 mr-2"
-                                            :preview-teleported="true"
-                                        ></el-image>
-                                        <div>{{ row.store_name }}</div>
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="规格" prop="store_info" show-overflow-tooltip />
-                            <el-table-column label="库存" prop="stock" show-overflow-tooltip />
-                            <el-table-column
-                                label="需求数量"
-                                prop="cart_num"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="是否需采购"
-                                prop="is_buyer"
-                                show-overflow-tooltip
-                                width="100"
-                            >
-                                <template #default="{ row }">
-                                    <div v-if="row.is_buyer == 0">
-                                        <el-button
-                                            type="danger"
-                                            round
-                                            size="small"
-                                            @click="handleBuyer(-1, row)"
-                                            >否</el-button
-                                        >
-                                        <el-button
-                                            type="success"
-                                            round
-                                            size="small"
-                                            @click="handleBuyer(1, row)"
-                                            >是</el-button
-                                        >
-                                    </div>
-                                    <div v-else>
-                                        <span>{{ row.is_buyer_name }}</span>
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="采购数量"
-                                prop="buyer_nums"
-                                show-overflow-tooltip
-                                width="100"
-                            />
-
-                            <el-table-column label="单价" prop="price" show-overflow-tooltip />
-                            <el-table-column
-                                label="合计"
-                                prop="total_price"
-                                show-overflow-tooltip
-                            />
-                        </el-table>
-                    </div>
-                    <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                        <pagination v-model="pager" @change="getLists" />
-                    </div>
-                </div>
-            </el-tab-pane>
-        </el-tabs>
-    </el-drawer>
-    <el-dialog v-model="dialogBuyer" title="设置采购" width="600">
-        <el-form ref="formRef" :model="updateInfo" label-width="90px">
-            <el-form-item label="采购数量" prop="buyer_nums">
-                <el-input
-                    v-model="updateInfo.buyer_nums"
-                    clearable
-                    placeholder="请输入采购数量"
-                    :readonly="false"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="dialogBuyer = false">取消</el-button>
-                <el-button type="primary" @click="goodsOfferUpdate"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import { ElMessage, type FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiPurchaseOrderDetail, apiPurchaseOrderInfoLists } from '@/api/purchase_order'
-import { apiPurchaseOrderInfoEdit } from '@/api/purchase_order_info'
-import type { PropType } from 'vue'
-import { usePaging } from '@/hooks/usePaging'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const showDialog = ref(false)
-const dialogBuyer = ref(false)
-const activeName = ref('second')
-const updateInfo = ref({
-    id: '',
-    oid: '',
-    poid: '',
-    product_id: '',
-    cart_num: '',
-    buyer_nums: '',
-    is_buyer: '',
-    type: ''
-})
-
-// 表单数据
-const formData = ref({
-    id: ''
-})
-const queryParams = reactive({
-    oid: '',
-    pay_type: ''
-})
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = { ...data }
-}
-/**
- * 是否需采购
- * @param e
- */
-const handleBuyer = (e, row) => {
-    if (e == 1) {
-        updateInfo.value.id = row.id
-        updateInfo.value.oid = row.oid
-        updateInfo.value.product_id = row.product_id
-        updateInfo.value.cart_num = row.cart_num
-        updateInfo.value.is_buyer = '1'
-        updateInfo.value.type = 'buyer'
-        dialogBuyer.value = true
-    } else {
-        apiPurchaseOrderInfoEdit({
-            id: row.id,
-            type: 'buyer',
-            is_buyer: -1
-        }).then((res) => {
-            getLists()
-        })
-    }
-}
-const goodsOfferUpdate = () => {
-    if (route.query.id == '') {
-        ElMessage({
-            message: '没有平台订单id',
-            type: 'warning'
-        })
-        return
-    }
-    updateInfo.value.poid = route.query.id
-    apiPurchaseOrderInfoEdit(updateInfo.value).then((res) => {
-        getLists()
-    })
-}
-const getDetail = async (row: Record<string, any>) => {
-    formData.value.id = row.id
-    queryParams.oid = row.id
-    const data = await apiPurchaseOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-    getLists()
-}
-
-//打开弹窗
-const open = () => {
-    showDialog.value = true
-}
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseOrderInfoLists,
-    params: queryParams
-})
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/purchase_order/component/goodsOffer.vue b/src/views/order/purchase_order/component/goodsOffer.vue
deleted file mode 100644
index a3022b06b..000000000
--- a/src/views/order/purchase_order/component/goodsOffer.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-    <div>
-        <!-- <div>
-            <el-radio-group v-model="queryParams.is_adopt" size="small" @change="changeType">
-                <el-radio-button label="全部" value="" />
-                <el-radio-button label="未采纳" value="0" />
-                <el-radio-button label="已采纳" value="1" />
-            </el-radio-group>
-        </div> -->
-        <el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
-            <el-table-column prop="id" label="ID" width="60" />
-            <el-table-column label="商品图片" prop="image" width="120">
-                <template #default="{ row }">
-                    <el-image
-                        style="width: 50px; height: 50px"
-                        :src="row.image"
-                        :preview-teleported="true"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip width="120" />
-            <el-table-column label="单位" prop="unit_name" width="80" show-overflow-tooltip />
-
-            <el-table-column label="需求数量" prop="need_num" show-overflow-tooltip width="100" />
-            <el-table-column
-                label="供应商"
-                prop="supplier_name"
-                show-overflow-tooltip
-                width="100"
-            />
-            <el-table-column label="采购数量" prop="buyer_nums" show-overflow-tooltip width="100" />
-            <el-table-column label="是否需采购" prop="is_buyer" show-overflow-tooltip width="100">
-                <template #default="{ row }">
-                    <div v-if="row.is_buyer == 0">
-                        <el-button type="danger" round size="small" @click="handleBuyer(-1, row)"
-                            >否</el-button
-                        >
-                        <el-button type="success" round size="small" @click="handleBuyer(1, row)"
-                            >是</el-button
-                        >
-                    </div>
-                    <div v-else>
-                        <span>{{ row.is_buyer_name }}</span>
-                    </div>
-                </template>
-            </el-table-column>
-            <el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip width="100">
-                <template #default="{ row }">
-                    <span
-                        v-if="row.buyer_confirm == 0"
-                        @click="handleBuyer(1, row)"
-                        style="color: #67c23a; cursor: pointer"
-                        >{{ row.buyer_name }}</span
-                    >
-                    <span v-else>
-                        {{ row.buyer_name }}
-                    </span>
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="采购状态"
-                prop="buyer_confirm_name"
-                show-overflow-tooltip
-                width="100"
-            />
-            <el-table-column
-                label="是否入库"
-                prop="is_storage_name"
-                show-overflow-tooltip
-                width="100"
-            />
-            <el-table-column label="操作" fixed="right">
-                <template #default="{ row }">
-                    <el-button type="primary" link @click="handleWarehouse(row)"> 入库 </el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-if="pager.lists" v-model="pager" @change="getLists" />
-        </div>
-        <el-dialog v-model="dialogBuyer" title="设置采购" width="600">
-            <el-form ref="formRef" :model="updateInfo" label-width="90px">
-                <el-form-item label="采购人员">
-                    <el-select
-                        v-model="updateInfo.buyer_id"
-                        placeholder="请选择采购人员"
-                        size="large"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in delivery_list"
-                            :label="item.nickname"
-                            :value="item.uid"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="采购数量" prop="buyer_nums">
-                    <el-input
-                        v-model="updateInfo.buyer_nums"
-                        clearable
-                        placeholder="请输入采购数量"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="dialogBuyer = false">取消</el-button>
-                    <el-button type="primary" @click="goodsOfferUpdate"> 确认 </el-button>
-                </div>
-            </template>
-        </el-dialog>
-        <warehouse-edit-popup
-            v-if="dialogWarehousing"
-            ref="warehouseRef"
-            @success="getLists"
-            @close="dialogWarehousing = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-import {
-    apiPurchaseProductOfferLists,
-    apiPurchaseProductOfferEdit
-} from '@/api/purchase_product_offer'
-import { useRoute } from 'vue-router'
-import { apiDeliveryServiceLists } from '@/api/delivery_service'
-import warehouseEditPopup from './warehouseEdit.vue'
-const warehouseRef = shallowRef<InstanceType<typeof warehouseEditPopup>>()
-
-const route = useRoute()
-
-const queryParams = reactive({
-    order_id: route.query.id,
-    is_adopt: '',
-    is_mer: 1
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseProductOfferLists,
-    params: queryParams
-})
-defineExpose({
-    getLists
-})
-
-const changeType = (e: any) => {
-    queryParams.is_adopt = e
-    getLists()
-}
-
-const dialogWarehousing = ref(false)
-const dialogBuyer = ref(false)
-const updateInfo = ref({
-    id: '',
-    type: '',
-    is_buyer: '',
-    buyer_id: '',
-    buyer_nums: ''
-})
-
-const handleWarehouse = async (row) => {
-    console.log(row)
-    dialogWarehousing.value = true
-    await nextTick()
-    warehouseRef.value?.open('edit')
-    row.nums = row.buyer_nums
-    row.purchase = row.price
-    warehouseRef.value?.setFormData(row)
-}
-const goodsOfferUpdate = () => {
-    apiPurchaseProductOfferEdit(updateInfo.value).then((res) => {
-        getLists()
-        dialogBuyer.value = false
-    })
-}
-const delivery_list = ref([])
-const DeliveryService = () => {
-    apiDeliveryServiceLists({ type: 3 }).then((res) => {
-        delivery_list.value = res.lists
-    })
-}
-
-/**
- * 是否需采购
- * @param e
- */
-const handleBuyer = (e, row) => {
-    if (e == 1) {
-        updateInfo.value.id = row.id
-        updateInfo.value.buyer_nums = row.need_num
-        updateInfo.value.is_buyer = '1'
-        updateInfo.value.type = 'buyer'
-        DeliveryService()
-        dialogBuyer.value = true
-    } else {
-        apiPurchaseProductOfferEdit({
-            id: row.id,
-            type: 'buyer',
-            is_buyer: -1
-        }).then((res) => {
-            getLists()
-        })
-    }
-}
-</script>
diff --git a/src/views/order/purchase_order/component/putStorage.vue b/src/views/order/purchase_order/component/putStorage.vue
deleted file mode 100644
index c94ca1210..000000000
--- a/src/views/order/purchase_order/component/putStorage.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-    <div>
-        <el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
-            <el-table-column prop="id" label="ID" width="120" />
-            <!-- <el-table-column prop="order_id" label="采购订单id" width="120" /> -->
-            <el-table-column label="商品名称" prop="goods_name" show-overflow-tooltip width="220" />
-            <el-table-column label="单位" prop="unit_name" width="80" show-overflow-tooltip />
-            <el-table-column
-                label="供应商"
-                prop="supplier_name"
-                show-overflow-tooltip
-                width="160"
-            />
-            <el-table-column label="入库数量" prop="nums" show-overflow-tooltip width="100" />
-            <el-table-column label="报价" prop="price" show-overflow-tooltip />
-            <el-table-column label="状态" prop="is_storage" show-overflow-tooltip>
-                <template #default="{ row }">
-                    <el-tag v-if="row.is_storage" type="success">已入库</el-tag>
-                    <el-tag v-else type="info">未入库</el-tag>
-                </template>
-            </el-table-column>
-            <el-table-column label="备注" prop="notes" show-overflow-tooltip />
-            <el-table-column
-                label="入库时间"
-                prop="update_time"
-                show-overflow-tooltip
-                width="160"
-            />
-            <el-table-column v-if="false" label="操作" fixed="right">
-                <template #default="{ row }">
-                    <el-button
-                        type="primary"
-                        v-if="row.is_adopt === 1 && row.price > 0"
-                        size="small"
-                        @click="offerGood(row, 0)"
-                        >采纳</el-button
-                    >
-                    <span v-if="row.is_storage">已入库</span>
-                    <el-button
-                        type="success"
-                        v-else-if="row.is_adopt === 2 && row.price > 0"
-                        size="small"
-                        @click="offerGood(row, 1)"
-                        >入库</el-button
-                    >
-                    <span v-if="row.is_adopt === 0 && row.price == 0" style="color: #e6a23c"
-                        >等待供应商报价</span
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-if="pager.lists" v-model="pager" @change="getLists" />
-        </div>
-        <el-dialog v-model="dialogVisible" title="入库" width="600">
-            <el-descriptions class="margin-top" :column="1" border>
-                <el-descriptions-item label="供应商名称">
-                    {{ updateInfo.supplier_name }}
-                </el-descriptions-item>
-                <el-descriptions-item label="商品名称">
-                    {{ updateInfo.goods_name }}
-                </el-descriptions-item>
-                <el-descriptions-item label="商品报价">
-                    ¥ {{ updateInfo.price }} / {{ updateInfo.unit_name }}
-                </el-descriptions-item>
-                <el-descriptions-item label="应入库数量">
-                    {{ updateInfo.q_nums }}
-                </el-descriptions-item>
-                <el-descriptions-item label="实际入库数量">
-                    <el-input-number v-model="updateInfo.nums" :step="1" :min="1" />
-                </el-descriptions-item>
-                <el-descriptions-item label="备注">
-                    <el-input
-                        v-model="updateInfo.notes"
-                        type="textarea"
-                        placeholder="请输入备注"
-                    ></el-input>
-                </el-descriptions-item>
-            </el-descriptions>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="dialogVisible = false">取消</el-button>
-                    <el-button type="primary" @click="goodsOfferUpdate"> 确认 </el-button>
-                </div>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-// import {
-//     opurchaseclassStorageListApi,
-//     apiOpurchaseclassGoodsOfferUpdate
-// } from '@/api/opurchaseclass'
-import { apiPurchaseOrderInfoLists } from '@/api/purchase_order'
-
-import { useRoute } from 'vue-router'
-
-const route = useRoute()
-
-const isAdopt = ref('')
-const queryParams = reactive({
-    order_id: route.query.id,
-    is_storage: 1
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseOrderInfoLists,
-    params: queryParams
-})
-defineExpose({
-    getLists
-})
-
-const changeType = (e: any) => {
-    queryParams.is_adopt = isAdopt.value
-    getLists()
-}
-
-const dialogVisible = ref(false)
-const updateInfo = ref({
-    id: '',
-    type: 0,
-    notes: '', //备注
-    nums: 0, //实际数量
-    q_nums: 0 //应到数量
-})
-const offerGood = (row: any, type: number) => {
-    //type:0 采纳，1 入库
-    updateInfo.value = Object.assign(
-        {
-            id: '',
-            type: type,
-            notes: '', //备注
-            nums: 0
-        },
-        row
-    )
-    if (type == 0) return goodsOfferUpdate() // 采纳时直接成功, 入库弹窗显示数量
-    updateInfo.value.q_nums = row.nums
-    dialogVisible.value = true
-}
-
-const goodsOfferUpdate = () => {
-    apiOpurchaseclassGoodsOfferUpdate({
-        id: updateInfo.value.id,
-        type: updateInfo.value.type,
-        notes: updateInfo.value.notes, //备注
-        nums: updateInfo.value.nums
-    }).then((res) => {
-        getLists()
-        dialogVisible.value = false
-    })
-}
-</script>
diff --git a/src/views/order/purchase_order/component/storeTable.vue b/src/views/order/purchase_order/component/storeTable.vue
deleted file mode 100644
index aebdefc18..000000000
--- a/src/views/order/purchase_order/component/storeTable.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table
-                :data="pager.lists"
-                v-loading="pager.loading"
-                @selection-change="handleSelectionChange"
-            >
-                <el-table-column
-                    label="商品信息"
-                    prop="store_name"
-                    show-overflow-tooltip
-                    width="400"
-                >
-                    <template #default="{ row }">
-                        <div class="flex items-center">
-                            <el-image
-                                :src="row.image"
-                                class="w-16 h-16 mr-2"
-                                :preview-teleported="true"
-                            ></el-image>
-                            <div>{{ row.store_name }}</div>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="规格" prop="store_info" show-overflow-tooltip />
-                <el-table-column label="数量" prop="cart_num" show-overflow-tooltip />
-                <el-table-column label="合计" prop="total_price" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiPurchaseOrderInfoLists } from '@/api/purchase_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const emit = defineEmits(['change'])
-
-// 选中的数据
-const selectionList = ref([])
-
-// 选中数据时触发
-const handleSelectionChange = (val: any) => {
-    selectionList.value = val
-    emit('change', selectionList.value)
-}
-
-// 查询条件
-const queryParams = reactive({
-    oid: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseOrderInfoLists,
-    params: queryParams
-})
-
-const getList = (e: any) => {
-    queryParams.oid = e.oid
-    getLists()
-}
-
-defineExpose({
-    getList,
-    getLists
-})
-</script>
diff --git a/src/views/order/purchase_order/component/subOrder.vue b/src/views/order/purchase_order/component/subOrder.vue
deleted file mode 100644
index 7b486461c..000000000
--- a/src/views/order/purchase_order/component/subOrder.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-    <div>
-        <el-table :data="pager.lists" border style="width: 100%">
-            <el-table-column prop="id" label="ID" width="120" />
-            <el-table-column label="门店" prop="system_store" show-overflow-tooltip />
-            <el-table-column label="单据编号" prop="order_id" show-overflow-tooltip />
-            <!-- <el-table-column label="单据金额" prop="total" show-overflow-tooltip /> -->
-            <!-- <el-table-column label="抵扣金额" prop="deduction_price" show-overflow-tooltip /> -->
-            <el-table-column label="总金额" prop="total" show-overflow-tooltip />
-            <el-table-column label="支付金额" prop="money" show-overflow-tooltip />
-            <!-- <el-table-column label="单据时间" prop="create_time" show-overflow-tooltip /> -->
-            <el-table-column label="操作" fixed="right">
-                <template #default="{ row }">
-                    <el-button type="primary" link @click="handleDetai(row)">详情</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-if="pager.lists" v-model="pager" @change="getLists" />
-        </div>
-        <!-- <detail
-            ref="detailRef"
-            v-if="showDetail"
-            :dictData="dictData"
-            @close="showDetail = false"
-        /> -->
-        <details-popup
-            v-if="showDetails"
-            ref="detailsRef"
-            @success="getLists"
-            @close="showDetails = false"
-            :dictData="dictData"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="subOrder">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiPurchaseOrderLists } from '@/api/purchase_order'
-import { useRoute } from 'vue-router'
-import DetailsPopup from './details.vue'
-
-//   import detail from "@/views/retail/cashierclass/detail.vue";
-// 是否显示编辑框
-const showDetails = ref(false)
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-const route = useRoute()
-
-const queryParams = reactive({
-    o_id: route.query.id,
-    is_mer: 1
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseOrderLists,
-    params: queryParams
-})
-
-defineExpose({
-    getLists
-})
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-// 获取字典数据
-const { dictData } = useDictData('pay_type,auditing_type')
-
-const showDetail = ref(false)
-const detailRef = ref(null)
-const openDetail = async (row: any) => {
-    showDetail.value = true
-    await nextTick()
-    detailRef.value?.open('edit')
-    detailRef.value?.getDetail(row)
-}
-</script>
diff --git a/src/views/order/purchase_order/component/warehouseEdit.vue b/src/views/order/purchase_order/component/warehouseEdit.vue
deleted file mode 100644
index 2cb7b7c3d..000000000
--- a/src/views/order/purchase_order/component/warehouseEdit.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="warehouseRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="仓库" prop="warehouse_id">
-                    <el-input
-                        v-model="formData.warehouse_name"
-                        clearable
-                        placeholder="请选择仓库"
-                        :readonly="false"
-                        @click="showWarehouse = true"
-                    />
-                </el-form-item>
-                <el-form-item label="商品" prop="product_id">
-                    <el-input
-                        v-model="formData.store_name"
-                        clearable
-                        placeholder="请选择商品"
-                        :readonly="false"
-                        @click="showProduct = true"
-                    />
-                </el-form-item>
-                <el-form-item label="供应商" prop="supplier_id">
-                    <el-select
-                        v-model="formData.supplier_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入供应商名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="item.mer_name"
-                            :value="item.id"
-                            selected
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="状态" prop="financial_pm">
-                    <el-select v-model="formData.financial_pm" clearable placeholder="请选择出入库">
-                        <el-option label="入库" value="1" />
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item label="单号" prop="code">
-                    <el-input
-                        v-model="formData.code"
-                        clearable
-                        placeholder="请输入单号"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="生产日期" prop="manufacture">
-                    <el-date-picker
-                        :readonly="false"
-                        class="flex-1 !flex"
-                        v-model="formData.manufacture"
-                        clearable
-                        type="datetime"
-                        value-format="YYYY-MM-DD"
-                        placeholder="选择生产日期"
-                    >
-                    </el-date-picker>
-                </el-form-item>
-
-                <el-form-item label="保质期" prop="expiration_date">
-                    <el-date-picker
-                        :readonly="false"
-                        class="flex-1 !flex"
-                        v-model="formData.expiration_date"
-                        clearable
-                        type="datetime"
-                        value-format="YYYY-MM-DD"
-                        placeholder="选择保质期"
-                    >
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input
-                        v-model="formData.nums"
-                        clearable
-                        placeholder="请输入数量"
-                        :readonly="false"
-                        @change="changePrice"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <span style="color: red">注意:下面价格会同步到商品中，请仔细检查</span>
-                </el-form-item>
-
-                <el-form-item label="采购价" prop="purchase">
-                    <el-input
-                        v-model="formData.purchase"
-                        clearable
-                        placeholder="请输入采购价"
-                        :readonly="false"
-                        @change="changePrice"
-                    />
-                </el-form-item>
-                <el-form-item label="总价" prop="total_price">
-                    <el-input
-                        v-model="formData.total_price"
-                        clearable
-                        placeholder="请输入总价"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-        </popup>
-        <el-dialog v-model="showWarehouse" title="选择仓库" width="70%">
-            <warehouse-pop @onBindWarehouse="onBindWarehouse"></warehouse-pop>
-        </el-dialog>
-        <el-dialog v-model="showProduct" title="选择商品" width="70%">
-            <product-pop @onBindStore="onBindStore"></product-pop>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseProductEdit">
-import { watermarkProps, type FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiWarehouseProductAdd, apiWarehouseProductDetail } from '@/api/warehouse_product'
-import { apiSupplierLists } from '@/api/supplier'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const warehouseRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-const showWarehouse = ref(false) // 选择仓库列表是否显示
-const showProduct = ref(false) // 选择商品列表是否显示
-// const productList = ref([])
-
-const onBindWarehouse = (e: any[]) => {
-    formData.warehouse_name = e.name
-    formData.warehouse_id = e.id
-    // e.forEach((item: any) => {
-    //     if (!productList.value.find((t: any) => t.id == item.id)) {
-    //         productList.value.push(item)
-    //     }
-    // })
-    showWarehouse.value = false
-}
-const onBindStore = (e: any[]) => {
-    formData.store_name = e[0].store_name
-    formData.product_id = e[0].id
-    formData.purchase = e[0].purchase
-    formData.cost = e[0].cost
-    formData.price = e[0].price
-    showProduct.value = false
-}
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == '新增入库'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    purchase_product_offer_id: '',
-    warehouse_id: '',
-    product_id: '',
-    supplier_id: '',
-    financial_pm: '1',
-    batch: '',
-    nums: '',
-    price: '',
-    total_price: '',
-    status: '',
-    warehouse_name: '',
-    store_name: '',
-    manufacture: '',
-    expiration_date: '',
-    code: '',
-    purchase: '',
-    cost: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    warehouse_id: [
-        {
-            required: true,
-            message: '请输入仓库ID',
-            trigger: ['blur']
-        }
-    ],
-    product_id: [
-        {
-            required: true,
-            message: '请输入商品ID',
-            trigger: ['blur']
-        }
-    ],
-    financial_pm: [
-        {
-            required: true,
-            message: '请选择0 = 出库 1 = 获得',
-            trigger: ['blur']
-        }
-    ],
-    nums: [
-        {
-            required: true,
-            message: '请输入数量',
-            trigger: ['blur']
-        }
-    ],
-    purchase: [
-        {
-            required: true,
-            message: '请输入采购价',
-            trigger: ['blur']
-        }
-    ],
-    total_price: [
-        {
-            required: true,
-            message: '请输入总价',
-            trigger: ['blur']
-        }
-    ]
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    formData.purchase_product_offer_id = data.id
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiWarehouseProductDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-const changePrice = () => {
-    if (formData.purchase > 0 && formData.nums > 0) {
-        formData.total_price = formData.purchase * formData.nums
-    }
-}
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == (await apiWarehouseProductAdd(data))
-    warehouseRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    warehouseRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiSupplierLists({})
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/purchase_order/details.vue b/src/views/order/purchase_order/details.vue
deleted file mode 100644
index b3c27c6ea..000000000
--- a/src/views/order/purchase_order/details.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabChange">
-                <el-tab-pane label="概况" name="detail">
-                    <el-descriptions class="margin-top" :column="4" border>
-                        <el-descriptions-item :span="4" label="单据编号">
-                            {{ form.order_id }}
-                        </el-descriptions-item>
-                        <el-descriptions-item :span="2" label="单据金额">
-                            {{ form.total }}
-                        </el-descriptions-item>
-                        <el-descriptions-item :span="2" label="实际金额">
-                            {{ form.actual }}
-                        </el-descriptions-item>
-                        <el-descriptions-item :span="2" label="实收金额">
-                            {{ form.money }}
-                        </el-descriptions-item>
-                        <el-descriptions-item label="所属商户">
-                            {{ form.system_store }}
-                        </el-descriptions-item>
-                    </el-descriptions>
-                    <el-table :data="pager.lists" border style="width: 100%; margin-top: 20px">
-                        <el-table-column prop="id" label="ID" width="120" />
-                        <el-table-column prop="store_name" label="商品名称" />
-                        <el-table-column prop="unit_name" label="单位" />
-                        <el-table-column prop="store_info" label="规格" />
-                        <el-table-column prop="need_num" label="数量" />
-                        <el-table-column prop="price" label="单价(元)" />
-                        <el-table-column prop="total_price" label="总价" />
-                    </el-table>
-                </el-tab-pane>
-                <el-tab-pane label="商户订单" name="order" v-if="form.is_mer == 2">
-                    <subOrder ref="subOrderRef" />
-                </el-tab-pane>
-                <el-tab-pane label="采购列表" name="offer">
-                    <goodsOffer ref="goodsOfferRef" />
-                </el-tab-pane>
-                <!-- <el-tab-pane label="入库记录" name="putStorage">
-                    <putStorage ref="putStorageRef" />
-                </el-tab-pane> -->
-                <!--  <el-tab-pane label="出库记录" name="outStorage">
-            <outStorage ref="outStorageRef" />
-          </el-tab-pane> -->
-            </el-tabs>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="purchaseOrderDetail">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiPurchaseOrderDetail, apiPurchaseOrderInfoLists } from '@/api/purchase_order'
-import { apiPurchaseProductOfferLists } from '@/api/purchase_product_offer'
-import { useRoute } from 'vue-router'
-import subOrder from './component/subOrder.vue'
-import goodsOffer from './component/goodsOffer.vue'
-//   import noPush from "./component/noPush.vue";
-//   import putStorage from "./component/putStorage.vue";
-//   import outStorage from "./component/outStorage.vue";
-
-const route = useRoute()
-const form = ref({})
-
-const activeName = ref('detail')
-
-const getDetail = async () => {
-    const data = await apiPurchaseOrderDetail({
-        id: route.query.id
-    })
-    form.value = data
-}
-getDetail()
-
-const subOrderRef = ref(null)
-const goodsOfferRef = ref(null)
-const noPushRef = ref(null)
-const putStorageRef = ref(null)
-const outStorageRef = ref(null)
-const tabChange = (type: any) => {
-    if (type == 'order') subOrderRef.value?.getLists()
-    if (type == 'offer') goodsOfferRef.value?.getLists()
-    // if (type == 'notPushedGoods') noPushRef.value?.getLists()
-    // if (type == 'putStorage') putStorageRef.value?.getLists()
-    // if (type == 'outStorage') outStorageRef.value?.getLists()
-}
-
-// 查询条件
-const queryParams = reactive({
-    order_id: route.query.id
-})
-
-// 分页相关
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseProductOfferLists,
-    params: queryParams
-})
-getLists()
-</script>
diff --git a/src/views/order/purchase_order/edit.vue b/src/views/order/purchase_order/edit.vue
deleted file mode 100644
index 0e73514c9..000000000
--- a/src/views/order/purchase_order/edit.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="1200px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <div class="flex-1 w-full">
-                    <div class="mb-2">
-                        <el-button type="primary" @click="showOrder = true">添加订单</el-button>
-                    </div>
-                    <el-table :data="orderList">
-                        <el-table-column label="订单ID" prop="id" show-overflow-tooltip />
-
-                        <el-table-column
-                            label="订单编号"
-                            prop="order_id"
-                            min-width="200"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column
-                            label="门店"
-                            prop="store_name"
-                            min-width="80"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column
-                            label="用户"
-                            prop="nickname"
-                            min-width="80"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column
-                            label="支付金额"
-                            prop="pay_price"
-                            min-width="80"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column
-                            label="创建时间"
-                            prop="create_time"
-                            min-width="80"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column label="操作" width="120" fixed="right">
-                            <template #default="{ row }">
-                                <el-button
-                                    v-perms="['system_store.system_store/delete']"
-                                    type="danger"
-                                    link
-                                    @click="handleDeleteProdut(row.id)"
-                                >
-                                    删除
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </div>
-            </el-form>
-        </popup>
-        <el-dialog v-model="showOrder" title="选择订单" width="70%">
-            <order-pop @onBindOrder="onBindOrder"></order-pop>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="purchaseOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiPurchaseOrderAdd,
-    apiPurchaseOrderEdit,
-    apiPurchaseOrderDetail
-} from '@/api/purchase_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑采购订单' : '新增采购订单'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    store_id: '',
-    order_arr: '',
-    order_id: '',
-    total: '',
-    actual: '',
-    money: '',
-    paid: '',
-    file: '',
-    data: '',
-    is_opurchase: '',
-    is_mer: '',
-    storage: ''
-})
-const showOrder = ref(false) // 选择商品列表是否显示
-// 商品列表
-const orderList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    orderList.value = orderList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindOrder = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!orderList.value.find((t: any) => t.id == item.id)) {
-            orderList.value.push(item)
-        }
-    })
-    showOrder.value = false
-}
-// 表单验证
-const formRules = reactive<any>({
-    store_id: [
-        {
-            required: true,
-            message: '请输入所属商户',
-            trigger: ['blur']
-        }
-    ],
-    order_id: [
-        {
-            required: true,
-            message: '请输入单据编号',
-            trigger: ['blur']
-        }
-    ]
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiPurchaseOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    const order_arr = orderList.value.map((item: any) => {
-        return {
-            oid: item.id,
-            order_id: item.order_id,
-            store_id: item.store_id
-        }
-    })
-    mode.value == (await apiPurchaseOrderAdd(order_arr))
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/purchase_order/index.vue b/src/views/order/purchase_order/index.vue
deleted file mode 100644
index e25a3b2f8..000000000
--- a/src/views/order/purchase_order/index.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="单据编号" prop="order_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.order_id"
-                        clearable
-                        placeholder="请输入单据编号"
-                    />
-                </el-form-item>
-
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button
-                v-perms="['purchase_order.purchase_order/add']"
-                type="primary"
-                @click="handleAdd"
-            >
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                生成采购订单
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="单据编号" prop="order_id" show-overflow-tooltip />
-                    <el-table-column label="单据金额" prop="total" show-overflow-tooltip />
-                    <el-table-column label="备注信息" prop="data" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleDetail(row)">
-                                详情
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="purchaseOrderLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiPurchaseOrderLists,
-    apiPurchaseOrderDelete,
-    apiPurchaseOrderAdd,
-    apiPurchaseOrderPlatform
-} from '@/api/purchase_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import { ElMessage, type FormInstance } from 'element-plus'
-import { apiSystemStoreLists } from '@/api/system_store'
-import { useRouter, useRoute } from 'vue-router'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const storeloading = ref(false)
-const storeList = ref([])
-const router = useRouter()
-
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    order_id: '',
-    is_mer: 2,
-    storage: ''
-})
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseOrderLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-const handleDetail = async (data: any) => {
-    router.push({
-        path: '/order/purchase_order/details',
-        query: {
-            id: data.id
-        }
-    })
-}
-
-getLists()
-</script>
diff --git a/src/views/order/purchase_product_offer/index.vue b/src/views/order/purchase_product_offer/index.vue
deleted file mode 100644
index ceaf73d13..000000000
--- a/src/views/order/purchase_product_offer/index.vue
+++ /dev/null
@@ -1,503 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_name"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item label="订单id" prop="order_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.order_id"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入订单id"
-                    />
-                </el-form-item>
-                <el-form-item label="订单号" prop="order_sn">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.order_sn"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入订单号"
-                    />
-                </el-form-item>
-                <el-form-item label="采购人员" prop="buyer_id">
-                    <div class="flex items-center mr-4">
-                        <el-select
-                            v-model="queryParams.buyer_id"
-                            placeholder="选择选择采购人员"
-                            style="width: 240px"
-                            @change="resetPage"
-                        >
-                            <el-option
-                                v-for="item in delivery_list"
-                                :key="item.uid"
-                                :label="item.nickname"
-                                :value="item.uid"
-                            />
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item label="采购状态">
-                    <el-select
-                        v-model="queryParams.buyer_confirm"
-                        placeholder="请选择采购状态"
-                        style="width: 240px"
-                    >
-                        <el-option label="采购完成" value="1" />
-                        <el-option label="未完成" value="0" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button type="primary" @click="batchProcureShow = true">
-                批量采购信息设置
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="订单id" prop="order_id" show-overflow-tooltip />
-                    <el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span>{{ row.store_name }}|{{ row.product_id }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="分类" prop="cate_name" show-overflow-tooltip />
-                    <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-
-                    <el-table-column label="供应商" prop="supplier_name" show-overflow-tooltip />
-                    <el-table-column label="需求数量" prop="need_num" show-overflow-tooltip />
-
-                    <el-table-column label="采购数量" prop="buyer_nums" show-overflow-tooltip />
-                    <el-table-column label="采购价" prop="price" show-overflow-tooltip />
-                    <el-table-column label="采购总价" prop="total_price" show-overflow-tooltip />
-                    <el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip />
-
-                    <el-table-column
-                        label="采购状态"
-                        prop="buyer_confirm_name"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="是否入库"
-                        prop="is_storage_name"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="操作" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="procureClick(row)"
-                                v-if="row.is_storage == 0"
-                                >设置采购信息</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
-    <el-dialog v-model="procureShow" title="采购信息设置" width="600">
-        <el-form ref="formRef" :model="formData" label-width="90px">
-            <el-form-item label="供应商">
-                <el-select
-                    v-model="formData.supplier_id"
-                    filterable
-                    remote
-                    reserve-keyword
-                    placeholder="输入供应商名称搜索"
-                    remote-show-suffix
-                    :remote-method="remoteMethodSupplier"
-                    :loading="supplierLoading"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in supplierList"
-                        :key="item.id"
-                        :label="item.mer_name"
-                        :value="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="数量" prop="buyer_nums">
-                <el-input
-                    v-model="formData.buyer_nums"
-                    clearable
-                    placeholder="请输入采购数量"
-                    :readonly="false"
-                    @change="compute"
-                />
-            </el-form-item>
-            <el-form-item label="采购价" prop="purchase">
-                <el-input
-                    v-model="formData.purchase"
-                    clearable
-                    placeholder="请输入采购价"
-                    :readonly="false"
-                    @change="compute"
-                />
-            </el-form-item>
-            <el-form-item label="采购总价" prop="total_price">
-                <el-input
-                    v-model="formData.total_price"
-                    clearable
-                    placeholder="请输入采购总价"
-                    :readonly="false"
-                />
-            </el-form-item>
-            <el-form-item label="付款方式" prop="pay_type">
-                <el-radio-group v-model="formData.pay_type">
-                    <el-radio :label="1">赊账</el-radio>
-                    <el-radio :label="2">现金</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="包装" prop="package">
-                <el-input
-                    v-model="formData.package"
-                    clearable
-                    placeholder="请输入包装"
-                    :readonly="false"
-                />
-            </el-form-item>
-            <el-form-item label="规格" prop="store_info">
-                <el-input
-                    v-model="formData.store_info"
-                    clearable
-                    placeholder="请输入规格"
-                    :readonly="false"
-                />
-            </el-form-item>
-            <el-form-item label="型号" prop="marques">
-                <el-input
-                    v-model="formData.marques"
-                    clearable
-                    placeholder="请输入型号"
-                    :readonly="false"
-                />
-            </el-form-item>
-            <el-form-item label="售后" prop="after_sales">
-                <el-input
-                    v-model="formData.after_sales"
-                    clearable
-                    placeholder="请输入售后"
-                    :readonly="false"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="procureShow = false">取消</el-button>
-                <el-button type="primary" @click="setProcureInfo"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-
-    <el-dialog v-model="batchProcureShow" title="批量采购信息设置" width="1200">
-        <el-form ref="formRef" :model="formBatchData">
-            <el-form-item label="供应商">
-                <el-select
-                    v-model="formBatchData.supplier_id"
-                    filterable
-                    remote
-                    reserve-keyword
-                    placeholder="输入供应商名称搜索"
-                    remote-show-suffix
-                    :remote-method="remoteMethodSupplier"
-                    :loading="supplierLoading"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="item in supplierList"
-                        :key="item.id"
-                        :label="item.mer_name"
-                        :value="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="订单id">
-                <el-input
-                    v-model="formBatchData.order_id"
-                    clearable
-                    placeholder="请输入订单id"
-                    :readonly="false"
-                    style="width: 240px"
-                />
-            </el-form-item>
-            <el-form-item label="商品" prop="store_id">
-                <div class="flex-1 w-full">
-                    <div class="mb-2">
-                        <el-button type="primary" @click="showProduct = true">添加商品</el-button>
-                    </div>
-                    <el-table :data="productList">
-                        <el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
-                        <el-table-column label="商品图片" prop="image" min-width="80">
-                            <template #default="{ row }">
-                                <el-image
-                                    style="width: 50px; height: 50px"
-                                    :src="row.image"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-
-                        <el-table-column label="数量">
-                            <template #default="{ row }">
-                                <el-input v-model="row.buyer_nums" @change="handleNmus(row)" />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="采购价">
-                            <template #default="{ row }">
-                                <el-input v-model="row.purchase" @change="handleNmus(row)" />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="采购总价">
-                            <template #default="{ row }">
-                                <el-input v-model="row.total_price" />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="支付类型" width="160">
-                            <template #default="{ row }">
-                                <el-radio-group v-model="row.pay_type">
-                                    <el-radio :label="1">赊账</el-radio>
-                                    <el-radio :label="2">现金</el-radio>
-                                </el-radio-group>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="包装" width="80">
-                            <template #default="{ row }">
-                                <el-input
-                                    v-model="row.package"
-                                    clearable
-                                    placeholder="请输入包装"
-                                    :readonly="false"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="规格" width="80">
-                            <template #default="{ row }">
-                                <el-input
-                                    v-model="row.store_info"
-                                    clearable
-                                    placeholder="请输入规格"
-                                    :readonly="false"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="规格" width="80">
-                            <template #default="{ row }">
-                                <el-input
-                                    v-model="row.marques"
-                                    clearable
-                                    placeholder="请输入规格"
-                                    :readonly="false"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="售后" width="80">
-                            <template #default="{ row }">
-                                <el-input
-                                    v-model="row.after_sales"
-                                    clearable
-                                    placeholder="请输入售后"
-                                    :readonly="false"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="操作" width="120" fixed="right">
-                            <template #default="{ row }">
-                                <el-button type="danger" link @click="handleDeleteProdut(row.id)">
-                                    删除
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </div>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="batchProcureShow = false">取消</el-button>
-                <el-button type="primary" @click="setBatchProcureInfo"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="showProduct" title="选择商品" width="70%">
-        <product-offer-pop
-            @onBindStore="onBindProduct"
-            :order_id="formBatchData.order_id"
-        ></product-offer-pop>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="storeProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import {
-    apiPurchaseProductOfferLists,
-    apiPurchaseProductOfferSetProcureInfo,
-    apiPurchaseProductOfferSetBatchProcureInfo
-} from '@/api/purchase_product_offer'
-import { apiSupplierLists } from '@/api/supplier'
-import { apiDeliveryServiceLists } from '@/api/delivery_service'
-
-const procureShow = ref(false)
-const batchProcureShow = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    buyer_id: '',
-    order_id: '',
-    store_name: '',
-    buyer_confirm: '',
-    order_sn: '',
-    is_user: 1
-})
-const formData = ref({
-    id: '',
-    bhoid: 0,
-    supplier_id: '',
-    purchase: 0,
-    outbound_price: 0,
-    total_price: 0,
-    buyer_nums: 0,
-    package: '',
-    store_info: '',
-    marques: '',
-    after_sales: '',
-    pay_type: 1
-})
-const formBatchData = ref({
-    supplier_id: '',
-    order_id: ''
-})
-const compute = () => {
-    formData.value.total_price = (formData.value.buyer_nums * formData.value.purchase).toFixed(2)
-}
-const procureClick = (data: any) => {
-    formData.value.id = data.id
-    formData.value.bhoid = data.order_id
-    formData.value.buyer_nums = data.need_num
-    formData.value.purchase = data.price
-    formData.value.total_price = data.total_price
-
-    formData.value.package = data.package
-    formData.value.store_info = data.store_info
-    formData.value.marques = data.marques
-    formData.value.after_sales = data.after_sales
-
-    procureShow.value = true
-}
-
-/**
- * 采购信息设置
- */
-const setProcureInfo = () => {
-    apiPurchaseProductOfferSetProcureInfo(formData.value).then((res) => {
-        procureShow.value = false
-        getLists()
-    })
-}
-const setBatchProcureInfo = () => {
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            id: item.id,
-            buyer_nums: item.buyer_nums,
-            purchase: item.purchase,
-            total_price: item.total_price,
-            pay_type: item.pay_type
-        }
-    })
-    apiPurchaseProductOfferSetBatchProcureInfo({
-        supplier_id: formBatchData.value.supplier_id,
-        product_arr
-    }).then((res) => {
-        batchProcureShow.value = false
-        getLists()
-    })
-}
-const supplierLoading = ref(false)
-const supplierList = ref([])
-const remoteMethodSupplier = (e = '') => {
-    supplierLoading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            supplierList.value = res.lists
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-}
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-
-function handleNmus(row) {
-    if (row.buyer_nums > 0 && row.purchase > 0) {
-        row.total_price = (row.buyer_nums * row.purchase).toFixed(2)
-    }
-}
-
-const delivery_list = ref([])
-const DeliveryService = () => {
-    apiDeliveryServiceLists({ type: 3 }).then((res) => {
-        delivery_list.value = res.lists
-    })
-}
-// 分页相关
-
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiPurchaseProductOfferLists,
-    params: queryParams
-})
-
-onMounted(() => {
-    getLists()
-    DeliveryService()
-})
-</script>
diff --git a/src/views/order/sort_list/components/deliverTable.vue b/src/views/order/sort_list/components/deliverTable.vue
deleted file mode 100644
index 42f987a9b..000000000
--- a/src/views/order/sort_list/components/deliverTable.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                <el-table-column label="订单号" prop="id" show-overflow-tooltip />
-                <el-table-column label="商品信息" prop="status" show-overflow-tooltip width="400">
-                    <template #default="{ row }">
-                        <el-image :src="row.image" class="w-16 h-16" :preview-teleported="true"></el-image>
-                        <div>{{ row.store_name }}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="发货时间" prop="id" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end"  v-if="pager.lists.length<pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="deliverTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderLists,
-    params: queryParams
-})
-
-defineExpose({
-    getLists
-})
-
-
-</script>
diff --git a/src/views/order/sort_list/components/orderInfo.vue b/src/views/order/sort_list/components/orderInfo.vue
deleted file mode 100644
index 1bd6827bc..000000000
--- a/src/views/order/sort_list/components/orderInfo.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-    <div>
-        <div>
-            <div class="font-bold text-lg">用户信息</div>
-            <div class="flex flex-wrap">
-                <div class="mt-4 w-1/3">用户uid：{{ datas.uid }}</div>
-                <div class="mt-4 w-1/3">用户昵称：{{ datas.real_name }}</div>
-                <div class="mt-4 w-1/3">手机号：{{ datas.user_phone }}</div>
-            </div>
-        </div>
-        <div class="mt-6">
-            <div class="font-bold text-lg">收货信息</div>
-            <div class="mt-4">收货人：{{ datas.real_name }}</div>
-            <div class="mt-4">收货电话：{{ datas.user_phone }}</div>
-            <div class="mt-4">收货地址：{{ datas.user_address }}</div>
-        </div>
-        <div class="mt-6">
-            <div class="font-bold text-lg">订单信息</div>
-            <div class="flex flex-wrap">
-                <div class="mt-4 w-1/3">创建时间：{{ datas.create_time }}</div>
-                <div class="mt-4 w-1/3">商品总数：{{ datas.total_num }}</div>
-                <div class="mt-4 w-1/3">商品总价：{{ datas.total_price }}</div>
-                <div class="mt-4 w-1/3">优惠券金额：{{ datas.coupon_price }}</div>
-                <div class="mt-4 w-1/3">积分抵扣：{{ datas.deduction_price }}</div>
-                <div class="mt-4 w-1/3">支付时间：{{ datas.pay_time }}</div>
-                <div class="mt-4 w-1/3 flex">支付方式：<dict-value :options="dictData.pay_type" :value="datas.pay_type"></dict-value></div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="orderInfo">
-
-import type { PropType } from 'vue'
-const props = defineProps({
-    datas: {
-        type: Object,
-        required: true
-    },
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-
-</script>
diff --git a/src/views/order/sort_list/components/orderTable.vue b/src/views/order/sort_list/components/orderTable.vue
deleted file mode 100644
index 8e0059935..000000000
--- a/src/views/order/sort_list/components/orderTable.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                <el-table-column label="订单ID" prop="id" show-overflow-tooltip />
-                <el-table-column label="操作记录" prop="id" show-overflow-tooltip />
-                <el-table-column label="操作时间" prop="id" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length<pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="orderTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderLists,
-    params: queryParams
-})
-
-defineExpose({
-    getLists
-})
-
-
-</script>
diff --git a/src/views/order/sort_list/components/storeTable.vue b/src/views/order/sort_list/components/storeTable.vue
deleted file mode 100644
index c20b3e1db..000000000
--- a/src/views/order/sort_list/components/storeTable.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" v-loading="pager.loading" @selection-change="handleSelectionChange">
-                <el-table-column label="商品信息" prop="store_name" show-overflow-tooltip width="400">
-                    <template #default="{ row }">
-                        <div class="flex items-center">
-                            <el-image :src="row.image" class="w-16 h-16 mr-2" :preview-teleported="true"></el-image>
-                            <div>{{ row.store_name }}</div>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="数量" prop="cart_info.cart_num" show-overflow-tooltip />
-                <el-table-column label="合计" prop="cart_info.total" show-overflow-tooltip />
-                <el-table-column label="实付金额" prop="cart_info.price" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length<pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderCartInfo } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const props = defineProps({
-    oid: {
-        type: [String,Number],
-        required: true
-    }
-})
-
-
-const emit = defineEmits(['change'])
-
-// 选中的数据
-const selectionList = ref([])
-
-// 选中数据时触发
-const handleSelectionChange = (val: any) => {
-    selectionList.value = val
-    emit('change', selectionList.value)
-}
-
-// 查询条件
-const queryParams = reactive({
-    oid: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderCartInfo,
-    params: {
-        ...queryParams,
-        oid: props.oid
-    }
-})
-
-defineExpose({
-    getLists
-})
-
-
-</script>
diff --git a/src/views/order/sort_list/details.vue b/src/views/order/sort_list/details.vue
deleted file mode 100644
index dd9cbc621..000000000
--- a/src/views/order/sort_list/details.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="订单详情" :size="1000">
-        <div class="flex items-center justify-between">
-            <div>订单编号：{{formData.order_id}}</div>
-            <!-- <el-button type="primary">发送货</el-button> -->
-        </div>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray;">订单状态</div>
-                <div style="color: black;">{{ formData.status_name }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray;">实际支付</div>
-                <div style="color: black;">￥{{ formData.pay_price }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray;">支付方式</div>
-                <div style="color: black;">
-                    <dict-value :options="dictData.pay_type" :value="formData.pay_type"></dict-value>
-                </div>
-            </div>
-            <div class="flex flex-col flex-2">
-                <div style="color: gray;">支付时间</div>
-                <div style="color: black;">{{ formData.pay_time }}</div>
-            </div>
-            
-        </div>
-        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="border-card">
-            <el-tab-pane label="订单信息" name="first">
-                <orderInfo :datas="formData" :dictData="dictData"></orderInfo>
-            </el-tab-pane>
-            <el-tab-pane label="商品信息" name="second">
-                <storeTable :oid="formData.id" ref="storeRef"></storeTable>
-            </el-tab-pane>
-            <!-- <el-tab-pane label="订单记录" name="third">
-                <orderTable ref="orderRef"></orderTable>
-            </el-tab-pane>
-            <el-tab-pane label="发货记录" name="fourth">
-                <deliverTable ref="deliverRef"></deliverTable>
-            </el-tab-pane> -->
-        </el-tabs>
-    </el-drawer>
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreOrderAdd, apiStoreOrderEdit, apiStoreOrderDetail } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import moment from 'moment'
-import orderInfo from './components/orderInfo.vue'
-import storeTable from './components/storeTable.vue'
-import orderTable from './components/orderTable.vue'
-import deliverTable from './components/deliverTable.vue'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const showDialog = ref(false)
-const mode = ref('add')
-
-const storeRef = ref(null);
-const orderRef = ref(null);
-const deliverRef = ref(null);
-
-// 表单数据
-const formData = ref({
-    id: ''
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = {...data};
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    formData.value.id = row.id;
-    handleClick({
-        paneName:activeName.value
-    });
-    const data = await apiStoreOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    showDialog.value = true;
-}
-
-const activeName = ref('first')
-
-const handleClick = (tab:any) => {
-  if(tab.paneName == 'second') storeRef.value?.getLists();
-  else if(tab.paneName == 'third') orderRef.value?.getLists();
-  else if(tab.paneName == 'fourth') deliverRef.value?.getLists();
-}
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/sort_list/edit.vue b/src/views/order/sort_list/edit.vue
deleted file mode 100644
index fa2c862a2..000000000
--- a/src/views/order/sort_list/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreOrderAdd, apiStoreOrderEdit, apiStoreOrderDetail } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑订单表' : '新增订单表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreOrderEdit(data) 
-        : await apiStoreOrderAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/sort_list/index.vue b/src/views/order/sort_list/index.vue
deleted file mode 100644
index 8e215fb37..000000000
--- a/src/views/order/sort_list/index.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="订单号" prop="order_sn">
-					<el-input class="w-[280px]" v-model="queryParams.order_sn" @keydown.enter="resetPage" clearable
-						placeholder="请输入订单号" />
-				</el-form-item>
-				<el-form-item label="商品名称" prop="product_name">
-					<el-input class="w-[280px]" v-model="queryParams.product_name" @keydown.enter="resetPage" clearable
-						placeholder="请输入商品名称" />
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<div class="mt-4">
-				<el-table :data="pager.lists">
-					<el-table-column label="ID" prop="id" show-overflow-tooltip />
-					<el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
-					<el-table-column label="商品ID" prop="product_id" show-overflow-tooltip />
-					<el-table-column label="商品信息" prop="product_info" min-width="150" show-overflow-tooltip>
-						<template #default="{ row }">
-							<div class="flex items-center mb-2">
-								<el-image class="w-[30px] h-[30px] mr-2 flex-shrink-0" :src="row.image" fit="cover"
-									:preview-src-list="[row.image]" :preview-teleported="true" />
-								<p class="truncate text-[12px]">{{ row.store_name }}</p>
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="总金额" prop="total_price" show-overflow-tooltip />
-					<el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip />
-					<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-					<el-table-column label="操作" width="120" fixed="right">
-						<template #default="{ row }">
-							<el-button type="primary" link @click="storeroomClick(row)">分拣入库</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-	</div>
-	<el-dialog v-model="storeroomShow" title="分拣设置" width="600">
-		<el-form ref="formRef" :model="storeroom" label-width="90px">
-			<el-form-item label="仓库">
-				<el-select v-model="storeroom.warehouse_id" placeholder="请选择仓库" size="large" style="width: 240px">
-					<el-option v-for="item in warehouse_list" :label="item.name" :value="item.id" :key="item.id" />
-				</el-select>
-			</el-form-item>
-			<el-form-item label="采购数量" prop="buyer_nums">
-				<el-input v-model="storeroom.buyer_nums" readonly />
-			</el-form-item>
-			<el-form-item label="分拣数量" prop="warehouse_num">
-				<el-input v-model="storeroom.warehouse_num" clearable placeholder="请输入分拣数量" />
-			</el-form-item>
-			<el-form-item label="备注" prop="mark">
-				<el-input v-model="storeroom.mark" clearable placeholder="请输入备注" :readonly="false" />
-			</el-form-item>
-		</el-form>
-		<template #footer>
-			<div class="dialog-footer">
-				<el-button @click="storeroomShow = false">取消</el-button>
-				<el-button type="primary" @click="putInStorage" :disabled="disableClick"> 确认 </el-button>
-			</div>
-		</template>
-	</el-dialog>
-</template>
-
-<script lang="ts" setup name="store_order_transshipment">
-	import { usePaging } from '@/hooks/usePaging'
-	import { apiPurchaseProductOfferLists } from '@/api/purchase_product_offer'
-	import { apiBeforehandOrderCartInfoPutInStorage } from '@/api/beforehand_order_cart_info'
-	import { apiWarehouseLists } from '@/api/warehouse'
-	import feedback from '@/utils/feedback'
-
-	const warehouse_list = ref([])
-	const disableClick = ref(false)
-	const storeroomShow = ref(false)
-	const storeroom = ref({
-		id: '',
-		bhoid: '',
-		product_id: '',
-		buyer_nums: '',
-		warehouse_num: '',
-		warehouse_id: '',
-		mark: ''
-	})
-	const storeroomClick = (data : any) => {
-		storeroom.value.id = data.id
-		storeroom.value.bhoid = data.order_id
-		storeroom.value.product_id = data.product_id
-		storeroom.value.buyer_nums = data.buyer_nums
-		storeroom.value.warehouse_num = ''
-		storeroomShow.value = true
-		apiWarehouseLists({}).then((res) => {
-			warehouse_list.value = res.lists
-		})
-	}
-
-	const putInStorage = () => {
-		try {
-			apiBeforehandOrderCartInfoPutInStorage(storeroom.value).then((res => {
-				storeroomShow.value = false
-				disableClick.value = false
-				getLists()
-			}))
-		} catch (error) {
-			setTimeout(() => {
-				disableClick.value = false
-			}, 2000)
-		}
-	}
-
-	// 查询条件
-	const queryParams = reactive({
-		order_sort_list: 1,
-		order_sn: '',
-		product_name: ''
-	})
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiPurchaseProductOfferLists,
-		params: queryParams
-	})
-
-	getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/order/store_order/add.vue b/src/views/order/store_order/add.vue
deleted file mode 100644
index 3f85b1237..000000000
--- a/src/views/order/store_order/add.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<template>
-	<el-card>
-		<div class="mb-4 text-lg font-bold">新增订单</div>
-		<div>
-			<el-form ref="formRef" :model="formData" label-width="90px">
-				<el-form-item label="仓库" prop="uid">
-					<el-select v-model="formData.warehouse_id" style="width: 240px">
-						<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户" prop="uid">
-					<el-select v-model="formData.user_id" filterable remote reserve-keyword placeholder="输入用户名称搜索"
-						remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading"
-						style="width: 240px">
-						<el-option v-for="item in userList" :key="item.id"
-							:label="`${item.real_name}|${item.mobile}  (ID:${item.id})`" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="优惠金额" prop="deduction_price">
-					<el-input style="width: 240px" v-model="formData.deduction_price" clearable placeholder="请输入优惠金额" :readonly="false" />
-				</el-form-item>
-				<el-form-item label="支付方式" prop="pay_type">
-					<el-select v-model="formData.pay_type" placeholder="请选择支付方式" size="large" style="width: 240px">
-						<el-option label="微信小程序支付" value="7" />
-						<el-option label="采购款支付" value="18" />
-						<el-option label="余额支付" value="3" />
-						<el-option label="现金支付" value="17" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="备注" prop="mark">
-					<el-input style="width: 240px" type="textarea" :arows="3" v-model="formData.mark" clearable placeholder="请输入订单备注" :readonly="false" />
-				</el-form-item>
-				<el-form-item label="门店" prop="store_id">
-					<div class="flex-1 w-full">
-						<div class="mb-2">
-							<el-button type="primary" @click="showStore = true">选择门店</el-button>
-						</div>
-						<el-table :data="storeList">
-							<el-table-column label="ID" prop="id" show-overflow-tooltip />
-							<el-table-column label="门店名称" prop="name" show-overflow-tooltip />
-							<el-table-column label="手机号码" prop="phone" show-overflow-tooltip />
-							<el-table-column label="详细地址" prop="detailed_address" show-overflow-tooltip />
-							<el-table-column label="门店logo" prop="image" show-overflow-tooltip>
-								<template #default="{ row }">
-									<el-image :src="row.image" class="w-[40px] h-[40px]" :preview-teleported="true" />
-								</template>
-							</el-table-column>
-							<el-table-column label="营业状态" prop="is_show" show-overflow-tooltip>
-								<template #default="{ row }">
-									{{ row.is_show ? '营业' : '打烊' }}
-								</template>
-							</el-table-column>
-							<el-table-column label="操作" width="120" fixed="right">
-								<template #default="{ row }">
-									<el-button type="danger" link @click="handleDelete(row.id)">
-										删除
-									</el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</div>
-				</el-form-item>
-				<el-form-item label="商品" prop="store_id">
-					<div class="flex-1 w-full">
-						<div class="mb-2">
-							<el-button type="primary" @click="showProduct = true">添加商品</el-button>
-						</div>
-						<el-table :data="productList">
-							<el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-							<el-table-column label="商品图片" prop="image" min-width="80">
-								<template #default="{ row }">
-									<el-image style="width: 50px; height: 50px" :src="row.image"
-										:preview-teleported="true" />
-								</template>
-							</el-table-column>
-							<el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
-							<el-table-column label="分类" prop="cate_name" min-width="120" show-overflow-tooltip />
-							<el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
-							<el-table-column label="供货价格" prop="purchase" min-width="100" show-overflow-tooltip>
-								<template #default="{ row }">
-									<el-input v-model="row.purchase" />
-								</template>
-							</el-table-column>
-							<el-table-column label="商品价格" prop="price" min-width="100" show-overflow-tooltip>
-								<template #default="{ row }">
-									<el-input v-model="row.price" />
-								</template>
-							</el-table-column>
-							<el-table-column label="库存" prop="stock" min-width="100" show-overflow-tooltip />
-							<el-table-column label="需求量" min-width="150">
-								<template #default="{ row }">
-									<el-input v-model="row.new_stock" />
-								</template>
-							</el-table-column>
-							<el-table-column label="操作" width="120" fixed="right">
-								<template #default="{ row }">
-									<el-button type="danger" link @click="handleDeleteProdut(row.id)">
-										删除
-									</el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</div>
-				</el-form-item>
-				<el-form-item label="">
-					<el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
-		<el-dialog v-model="showStore" title="选择门店" width="70%">
-			<store-pop @onBindStore="onBindStore" :is_selection="0"></store-pop>
-		</el-dialog>
-		<el-dialog v-model="showProduct" title="选择商品" width="70%">
-			<product-pop @onBindStore="onBindProduct" :store_id="store_id" :is_branch="1"></product-pop>
-		</el-dialog>
-	</el-card>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-	import { ElMessage, type FormInstance } from 'element-plus'
-	import useMultipleTabs from '@/hooks/useMultipleTabs'
-	import { apiStoreOrderAdd } from '@/api/store_order'
-	import type { PropType } from 'vue'
-	import { onMounted } from 'vue'
-	import { useRouter, useRoute } from 'vue-router'
-	import { apiStoreProductUnitLists } from '@/api/store_product_unit'
-	import { apiUserLists } from '@/api/user'
-	import { apiWarehouseLists } from '@/api/warehouse'
-
-	const route = useRoute()
-	const warehouseList = ref([])
-
-	defineProps({
-		dictData: {
-			type: Object as PropType<Record<string, any[]>>,
-			default: () => ({})
-		}
-	})
-	const emit = defineEmits(['success', 'close'])
-	const formRef = shallowRef<FormInstance>()
-	const { removeTab } = useMultipleTabs()
-	const store_id = ref(0)
-
-	// 表单数据
-	const formData = reactive({
-		user_id: '',
-		store_id: '',
-		warehouse_id: '',
-		mark: '',
-		deduction_price: '0.00',
-		pay_type: ''
-	})
-	const warehouse = () => {
-		apiWarehouseLists({}).then((res) => {
-			warehouseList.value = res.lists
-		})
-	}
-	const showStore = ref(false) // 选择门店列表是否显示
-	// 门店列表
-	const storeList = ref([])
-	// 删除已有门店
-	const handleDelete = (id : number) => {
-		storeList.value = storeList.value.filter((item : any) => item.id !== id)
-	}
-	// 选择门店
-	const onBindStore = (e : any[]) => {
-		storeList.value = []
-		storeList.value.push(e)
-		formData.store_id = e.id
-		store_id.value = e.id
-		showStore.value = false
-	}
-
-	const showProduct = ref(false) // 选择商品列表是否显示
-	// 商品列表
-	const productList = ref([])
-	// 删除已有商品
-	const handleDeleteProdut = (id : number) => {
-		productList.value = productList.value.filter((item : any) => item.id !== id)
-	}
-	// 选择商品
-	const onBindProduct = (e : any[]) => {
-		e.forEach((item : any) => {
-			if (!productList.value.find((t : any) => t.id == item.id)) {
-				productList.value.push(item)
-			}
-		})
-		showProduct.value = false
-	}
-
-	const unitList = ref([])
-	const getUnitList = () => {
-		apiStoreProductUnitLists({}).then((res) => {
-			unitList.value = res.lists
-		})
-	}
-	getUnitList()
-
-	const userloading = ref(false)
-	const userList = ref([])
-	const remoteMethodUser = (e = '') => {
-		userloading.value = true
-		apiUserLists({
-			nickname: e,
-			page_size: 10
-		})
-			.then((res) => {
-				userList.value = res.lists
-				setTimeout(() => {
-					userloading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					userloading.value = false
-				}, 300)
-			})
-	}
-	const router = useRouter()
-	// 提交按钮
-	const handleSubmit = async () => {
-		const product_arr = productList.value.map((item : any) => {
-			return {
-				id: item.id,
-				product_id: item.product_id,
-				stock: item.new_stock || 0,
-				price: item.price || 0,
-				purchase: item.purchase || 0
-			}
-		})
-		console.log(storeList.value)
-		apiStoreOrderAdd({
-			product_arr,
-			...formData
-		}).then((res) => {
-			// removeTab()
-			// if (res.code == 1) {
-			// ElMessage.success(res.msg)
-			setTimeout(() => {
-				removeTab()
-			}, 2000)
-			// } else {
-			//     ElMessage.error(res.msg)
-			// }
-
-			// router.push({
-			//     path: '/warehouse/warehouse_product'
-			// })
-		})
-	}
-	warehouse()
-</script>
\ No newline at end of file
diff --git a/src/views/order/store_order/addBeforehand.vue b/src/views/order/store_order/addBeforehand.vue
deleted file mode 100644
index 84b055417..000000000
--- a/src/views/order/store_order/addBeforehand.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="1000px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <!-- <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="用户" prop="nickname">
-                            <el-input v-model="formData.nickname" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="电话" prop="phone">
-                            <el-input v-model="formData.phone" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="地址" prop="address">
-                            <el-input
-                                v-model="formData.address"
-                                type="input"
-                                style="width: 400px"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row> -->
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="到货时间" prop="arrival_time">
-                            <el-date-picker
-                                v-model="formData.arrival_time"
-                                type="datetime"
-                                :readonly="false"
-                                clearable
-                                value-format="YYYY-MM-DD HH:mm:ss"
-                                placeholder="请选择到货时间"
-                                style="width: 180px"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="桌数" prop="tables">
-                            <el-input-number v-model="formData.tables" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="办事天数" prop="days">
-                            <el-input-number v-model="formData.days" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="厨师" prop="chef">
-                            <el-input v-model="formData.chef" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="电话" prop="chef_phone">
-                            <el-input v-model="formData.chef_phone" type="input" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="备注" prop="purpose">
-                            <el-input
-                                v-model="formData.purpose"
-                                type="input"
-                                style="width: 480px"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="内部备注" prop="mark">
-                            <el-input v-model="formData.mark" type="input" style="width: 480px" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="4">
-                        <el-form-item label="分单员" prop="splitting_officer">
-                            <el-input v-model="formData.splitting_officer" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="跟单员" prop="merchandiser">
-                            <el-input v-model="formData.merchandiser" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="仓管员" prop="distribution_personnel">
-                            <el-input v-model="formData.distribution_personnel" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="运输员" prop="transporter">
-                            <el-input v-model="formData.transporter" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="门店员" prop="system_store_name">
-                            <el-input v-model="formData.system_store_name" type="input" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-form-item label="区域经理" prop="regional_manager">
-                            <el-input v-model="formData.regional_manager" type="input" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreOrderSetSystemStore } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { apiPurchaseOrderTransferAdvanceOrder } from '@/api/beforehand_order'
-
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return (mode.value = '转预订单设置')
-})
-// 表单数据
-const formData = reactive({
-    id: 0,
-    order_type: 4,
-    store_id: '',
-    // nickname: '',
-    // phone: '',
-    // address: '',
-    arrival_time: '',
-    purpose: '',
-    tables: 0,
-    days: 0,
-    chef: '',
-    chef_phone: '',
-    splitting_officer: '',
-    merchandiser: '何月英',
-    distribution_personnel: '余友',
-    transporter: '',
-    system_store_name: '',
-    regional_manager: '张波',
-    mark: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({})
-
-const getDetail = (data: any[]) => {
-    // formData.nickname = data.real_name
-    // formData.phone = data.user_phone
-    // formData.address = data.user_address
-    formData.store_id = data.store_id
-    formData.id = data.id
-}
-// 提交按钮
-const handleSubmit = async () => {
-    const data = { ...formData }
-    await apiPurchaseOrderTransferAdvanceOrder(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-const storeList = ref([])
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    getDetail
-})
-</script>
diff --git a/src/views/order/store_order/components/deliverTable.vue b/src/views/order/store_order/components/deliverTable.vue
deleted file mode 100644
index 42f987a9b..000000000
--- a/src/views/order/store_order/components/deliverTable.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                <el-table-column label="订单号" prop="id" show-overflow-tooltip />
-                <el-table-column label="商品信息" prop="status" show-overflow-tooltip width="400">
-                    <template #default="{ row }">
-                        <el-image :src="row.image" class="w-16 h-16" :preview-teleported="true"></el-image>
-                        <div>{{ row.store_name }}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="发货时间" prop="id" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end"  v-if="pager.lists.length<pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="deliverTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderLists,
-    params: queryParams
-})
-
-defineExpose({
-    getLists
-})
-
-
-</script>
diff --git a/src/views/order/store_order/components/editProduct.vue b/src/views/order/store_order/components/editProduct.vue
deleted file mode 100644
index 2951e1ef3..000000000
--- a/src/views/order/store_order/components/editProduct.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input v-model="formData.store_name" disabled />
-                </el-form-item>
-                <el-form-item label="数量" prop="cart_num">
-                    <el-input
-                        v-model="formData.cart_num"
-                        clearable
-                        placeholder="请输入数量"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreOrderCartInfoEdit } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品' : '新增商品仓储订单'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    oid: '',
-    store_name: '',
-    total_price: '',
-    cart_num: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    total_price: [
-        {
-            required: true,
-            message: '请输入总价格',
-            trigger: ['blur']
-        }
-    ]
-})
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    await apiStoreOrderCartInfoEdit(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/order/store_order/components/orderInfo.vue b/src/views/order/store_order/components/orderInfo.vue
deleted file mode 100644
index 09a35eecf..000000000
--- a/src/views/order/store_order/components/orderInfo.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-    <div>
-        <div>
-            <div class="font-bold text-lg">用户信息</div>
-            <div class="flex flex-wrap">
-                <div class="mt-4 w-1/3">用户uid：{{ datas.uid }}</div>
-                <div class="mt-4 w-1/3">用户昵称：{{ datas.real_name }}</div>
-                <div class="mt-4 w-1/3">手机号：{{ datas.user_phone }}</div>
-            </div>
-        </div>
-        <div class="mt-6">
-            <div class="font-bold text-lg">收货信息</div>
-            <div class="mt-4">收货人：{{ datas.real_name }}</div>
-            <div class="mt-4">收货电话：{{ datas.user_phone }}</div>
-            <div class="mt-4">收货地址：{{ datas.user_address }}</div>
-        </div>
-        <div class="mt-6">
-            <div class="font-bold text-lg">订单信息</div>
-            <div class="flex flex-wrap">
-                <div class="mt-4 w-1/3">创建时间：{{ datas.create_time }}</div>
-                <div class="mt-4 w-1/3">商品总数：{{ datas.total_num }}</div>
-                <div class="mt-4 w-1/3">商品总价：{{ datas.total_price }}</div>
-                <div class="mt-4 w-1/3">优惠券金额：{{ datas.coupon_price }}</div>
-                <div class="mt-4 w-1/3" style="color: red">
-                    金额抵扣：{{ datas.deduction_price }}
-                </div>
-                <div class="mt-4 w-1/3">支付时间：{{ datas.pay_time }}</div>
-                <div class="mt-4 w-1/3 flex">
-                    支付方式：<dict-value
-                        :options="dictData.pay_type"
-                        :value="datas.pay_type"
-                    ></dict-value>
-                </div>
-                <div class="mt-4 w-1/3" style="color: red">
-                    退款金额：￥{{ datas.refund_price }}
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="orderInfo">
-import type { PropType } from 'vue'
-const props = defineProps({
-    datas: {
-        type: Object,
-        required: true
-    },
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-</script>
diff --git a/src/views/order/store_order/components/orderTable.vue b/src/views/order/store_order/components/orderTable.vue
deleted file mode 100644
index 8e0059935..000000000
--- a/src/views/order/store_order/components/orderTable.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                <el-table-column label="订单ID" prop="id" show-overflow-tooltip />
-                <el-table-column label="操作记录" prop="id" show-overflow-tooltip />
-                <el-table-column label="操作时间" prop="id" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length<pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="orderTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderLists,
-    params: queryParams
-})
-
-defineExpose({
-    getLists
-})
-
-
-</script>
diff --git a/src/views/order/store_order/components/refundOrderProduct.vue b/src/views/order/store_order/components/refundOrderProduct.vue
deleted file mode 100644
index dc243b621..000000000
--- a/src/views/order/store_order/components/refundOrderProduct.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-    <div>
-        <el-form ref="formRef" :model="formData">
-            <el-form-item label="总价" prop="total_price">
-                <el-input
-                    v-model="formData.total_price"
-                    clearable
-                    placeholder="请输入总价"
-                    :readonly="false"
-                    style="width: 240px"
-                />
-            </el-form-item>
-            <el-form-item label="商品" prop="store_id">
-                <div class="flex-1 w-full">
-                    <div class="mb-2">
-                        <el-button type="primary" @click="showProduct = true">添加商品</el-button>
-                    </div>
-                    <el-table :data="productList">
-                        <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-                        <el-table-column label="商品图片" prop="image" min-width="80">
-                            <template #default="{ row }">
-                                <el-image
-                                    style="width: 50px; height: 50px"
-                                    :src="row.image"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column
-                            label="商品名称"
-                            prop="store_name"
-                            min-width="200"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column
-                            label="单位"
-                            prop="unit_name"
-                            min-width="80"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column label="数量">
-                            <template #default="{ row }">
-                                <el-input v-model="row.cart_num" @change="handleChange(row)" />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="价格" prop="price" />
-                        <el-table-column label="总价" prop="total_price" />
-                        <el-table-column label="操作" width="120" fixed="right">
-                            <template #default="{ row }">
-                                <el-button type="danger" link @click="handleDeleteProdut(row.id)">
-                                    删除
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </div>
-            </el-form-item>
-            <el-form-item label="">
-                <el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-    <el-dialog v-model="showProduct" title="选择商品" width="70%">
-        <refund-product-pop
-            @onBindRefundProduct="onBindRefundProduct"
-            :oid="props.id"
-        ></refund-product-pop>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="refundOrderProduct">
-import { ElMessage, type FormInstance } from 'element-plus'
-import useMultipleTabs from '@/hooks/useMultipleTabs'
-import { useRouter } from 'vue-router'
-import { apiStoreOrderRefund } from '@/api/store_order'
-const props = defineProps<{
-    id: number | string
-    order_id: number | string
-}>()
-// 表单数据
-const formData = reactive({
-    warehouse_id: '',
-    supplier_id: '',
-    code: '',
-    total_price: 0,
-    order_type: 1,
-    mark: ''
-})
-
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindRefundProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-function handleChange(row) {
-    row.total_price = (row.cart_num * row.price).toFixed(2)
-    if (row.total_price > 0) {
-        formData.total_price = (
-            parseFloat(formData.total_price) + parseFloat(row.total_price)
-        ).toFixed(2)
-    }
-}
-
-const router = useRouter()
-// 提交按钮
-const handleSubmit = async () => {
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            product_id: item.product_id,
-            cart_num: item.cart_num
-        }
-    })
-    apiStoreOrderRefund({
-        order_id: props.order_id,
-        product_arr,
-        refund_price: formData.total_price
-    }).then((res) => {
-        setTimeout(() => {
-            location.reload()
-        }, 2000)
-    })
-}
-</script>
diff --git a/src/views/order/store_order/components/storeTable.vue b/src/views/order/store_order/components/storeTable.vue
deleted file mode 100644
index a77a9cc3e..000000000
--- a/src/views/order/store_order/components/storeTable.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-button
-                type="primary"
-                @click="dialogShop = true"
-                v-perms="['store_order.store_order/cart_info_add']"
-            >
-                追加商品
-            </el-button>
-            <el-table
-                :data="pager.lists"
-                v-loading="pager.loading"
-                @selection-change="handleSelectionChange"
-            >
-                <el-table-column
-                    label="商品信息"
-                    prop="store_name"
-                    show-overflow-tooltip
-                    width="400"
-                >
-                    <template #default="{ row }">
-                        <div class="flex items-center">
-                            <el-image
-                                :src="row.image"
-                                class="w-16 h-16 mr-2"
-                                :preview-teleported="true"
-                            ></el-image>
-                            <div>{{ row.store_name }}</div>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="规格" prop="sku_name" show-overflow-tooltip />
-                <el-table-column label="结算单价" prop="price" show-overflow-tooltip />
-                <el-table-column label="数量" prop="cart_num" show-overflow-tooltip />
-                <el-table-column label="合计" prop="total_price" show-overflow-tooltip />
-                <el-table-column label="操作" width="120" fixed="right">
-                    <template #default="{ row }">
-                        <el-button
-                            v-perms="['store_order.store_order/cart_info_edit']"
-                            type="primary"
-                            link
-                            @click="handleEdit(row)"
-                        >
-                            编辑
-                        </el-button>
-                        <el-button
-                            v-perms="['store_order.store_order/cart_info_delete']"
-                            type="danger"
-                            link
-                            @click="handleDelete(row.id)"
-                        >
-                            删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-    <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
-    <el-dialog v-model="dialogShop" title="追加商品" width="1200">
-        <el-form ref="formRef" :model="updateInfo" label-width="90px">
-            <div class="mb-2">
-                <el-button type="primary" @click="showProduct = true">添加商品</el-button>
-            </div>
-            <el-table :data="productList">
-                <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-
-                <el-table-column label="商品图片" prop="image" min-width="80">
-                    <template #default="{ row }">
-                        <el-image
-                            style="width: 50px; height: 50px"
-                            :src="row.image"
-                            :preview-teleported="true"
-                        />
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="商品名称"
-                    prop="store_name"
-                    min-width="180"
-                    show-overflow-tooltip
-                />
-                <el-table-column
-                    label="分类"
-                    prop="cate_name"
-                    min-width="80"
-                    show-overflow-tooltip
-                />
-                <el-table-column
-                    label="单位"
-                    prop="unit_name"
-                    min-width="80"
-                    show-overflow-tooltip
-                />
-                <el-table-column label="数量" min-width="150">
-                    <template #default="{ row }">
-                        <el-input v-model="row.cart_num" @change="handleChange(row)" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="价格" min-width="150">
-                    <template #default="{ row }">
-                        <el-input v-model="row.price" @change="handleChange(row)" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="总价" min-width="150">
-                    <template #default="{ row }">
-                        <el-input v-model="row.total_price" />
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="操作" width="120" fixed="right">
-                    <template #default="{ row }">
-                        <el-button type="danger" link @click="handleDeleteProdut(row.id)">
-                            删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="dialogShop = false">取消</el-button>
-                <el-button type="primary" @click="goodsOfferUpdate"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="showProduct" title="选择商品" width="70%">
-        <product-pop @onBindStore="onBindProduct" :store_id="store_id" :is_branch="1"></product-pop>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="storeTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiStoreOrderCartInfo,
-    apiStoreOrderCartInfoAdd,
-    apiStoreOrderCartInfoDel
-} from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './editProduct.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const store_id = ref(0)
-const showEdit = ref(false)
-const dialogShop = ref(false)
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-const emit = defineEmits(['change'])
-
-// 选中的数据
-const selectionList = ref([])
-
-// 选中数据时触发
-const handleSelectionChange = (val: any) => {
-    selectionList.value = val
-    emit('change', selectionList.value)
-}
-
-// 查询条件
-const queryParams = reactive({
-    oid: '',
-    pay_type: ''
-})
-function handleChange(row) {
-    row.total_price = row.cart_num * row.price
-}
-const updateInfo = ref({})
-
-const goodsOfferUpdate = () => {
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            product_id: item.product_id,
-            cart_num: item.cart_num || 0,
-            price: item.price || 0
-        }
-    })
-    apiStoreOrderCartInfoAdd({
-        oid: queryParams.oid,
-        product_arr: product_arr
-    }).then((res) => {
-        dialogShop.value = false
-        getLists()
-    })
-}
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderCartInfo,
-    params: queryParams
-})
-
-const getList = (e: any) => {
-    queryParams.oid = e.oid
-    store_id.value = e.store_id
-    console.log(store_id.value)
-    getLists()
-}
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreOrderCartInfoDel({ id: id })
-    getLists()
-}
-defineExpose({
-    getList,
-    getLists
-})
-</script>
diff --git a/src/views/order/store_order/details.vue b/src/views/order/store_order/details.vue
deleted file mode 100644
index 4ee4ac1c6..000000000
--- a/src/views/order/store_order/details.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="订单详情" :size="1000">
-        <div class="flex items-center justify-between">
-            <div>订单编号：{{ formData.order_id }}</div>
-            <el-button v-perms="['store_order.store_order/refund']" @click="command(1)">
-                立即退款
-            </el-button>
-            <el-button
-                v-perms="['store_order.store_order/refund']"
-                @click="refundProductShow = true"
-            >
-                部分退款
-            </el-button>
-            <el-button v-perms="['store_order.store_order/refund']" @click="writeoff_order()">
-                核销
-            </el-button>
-            <el-button
-                @click="dialogShop = true"
-                v-perms="['store_order.store_order/one_outbound']"
-            >
-                一键生成出库单
-            </el-button>
-            <el-dropdown trigger="click">
-                <el-button>•••</el-button>
-                <template #dropdown>
-                    <el-dropdown-menu>
-                        <el-dropdown-item @click="xlsx(formData.id, formData.order_id)"
-                            >导出</el-dropdown-item
-                        >
-                        <el-dropdown-item @click="xlsxTwo(formData.id, formData.system_store)"
-                            >导出配送表格</el-dropdown-item
-                        >
-                        <el-dropdown-item @click="xlsx3(formData.id, formData.system_store)"
-                            >导出商品标签</el-dropdown-item
-                        >
-                    </el-dropdown-menu>
-                </template>
-            </el-dropdown>
-        </div>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">订单状态</div>
-                <div style="color: black">{{ formData.status_name }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">实际支付</div>
-                <div style="color: black">￥{{ formData.pay_price }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">支付方式</div>
-                <div style="color: black">
-                    <dict-value
-                        :options="dictData.pay_type"
-                        :value="formData.pay_type"
-                    ></dict-value>
-                </div>
-            </div>
-            <div class="flex flex-col flex-2">
-                <div style="color: gray">支付时间</div>
-                <div style="color: black">{{ formData.pay_time }}</div>
-            </div>
-        </div>
-        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="border-card">
-            <el-tab-pane label="订单信息" name="first">
-                <orderInfo :datas="formData" :dictData="dictData"></orderInfo>
-            </el-tab-pane>
-            <el-tab-pane label="商品信息" name="second">
-                <storeTable ref="storeRef"></storeTable>
-            </el-tab-pane>
-        </el-tabs>
-    </el-drawer>
-    <el-dialog v-model="dialogShop" title="设置出库单信息" width="500">
-        <el-form :model="formArr">
-            <el-form-item label="门店">
-                <el-input
-                    v-model="formArr.store_name"
-                    placeholder="请选择门店"
-                    autocomplete="off"
-                    @click="showStore = true"
-                />
-            </el-form-item>
-            <el-form-item label="仓库">
-                <el-select v-model="formArr.warehouse_id" style="width: 240px">
-                    <el-option
-                        v-for="item in warehouseList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="送货时间">
-                <el-date-picker
-                    :readonly="false"
-                    class="flex-1 !flex"
-                    v-model="formArr.delivery_time"
-                    clearable
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    placeholder="选择生产日期"
-                >
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item label="备注">
-                <el-input v-model="formArr.mark" placeholder="请输入备注" autocomplete="off" />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="dialogShop = false">取消</el-button>
-                <el-button type="primary" @click="create_outbound_order"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="showStore" title="选择门店" width="70%">
-        <store-pop @onBindStore="onBindStore" :is_selection="0"></store-pop>
-    </el-dialog>
-    <el-dialog v-model="refundProductShow" title="退款商品设置" width="70%">
-        <refundOrderProduct :id="formArr.id" :order_id="formData.order_id" />
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import { ElMessage, type FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiStoreOrderDetail,
-    apiStoreOrderRefund,
-    apiStoreOrderWriteoffOrder
-} from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import {
-    apiStoreOrderCartInfo,
-    apiStoreOrderExport,
-    createOutboundOrder,
-    apiStoreOrderExportTags
-} from '@/api/store_order'
-import moment from 'moment'
-import orderInfo from './components/orderInfo.vue'
-import storeTable from './components/storeTable.vue'
-import refundOrderProduct from './components/refundOrderProduct.vue'
-import { apiWarehouseLists } from '@/api/warehouse'
-
-import type { PropType } from 'vue'
-import feedback from '@/utils/feedback'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const showDialog = ref(false)
-
-const storeRef = ref(null)
-const orderRef = ref(null)
-const deliverRef = ref(null)
-const dialogShop = ref(false)
-const showStore = ref(false)
-const refundProductShow = ref(false)
-
-// 表单数据
-const formData = ref({
-    id: '',
-    store_id: '',
-    verify_code: ''
-})
-// 表单数据
-const formArr = ref({
-    id: '',
-    store_id: '',
-    store_name: '',
-    warehouse_id: '',
-    delivery_time: '',
-    mark: ''
-})
-// 选择门店
-const onBindStore = (e: any[]) => {
-    formArr.value.store_id = e.id
-    formArr.value.store_name = e.name
-    showStore.value = false
-}
-const create_outbound_order = () => {
-    createOutboundOrder(formArr.value).then((res) => {
-        dialogShop.value = false
-    })
-}
-const warehouseList = ref([])
-const warehouse = () => {
-    apiWarehouseLists({}).then((res) => {
-        warehouseList.value = res.lists
-    })
-}
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formArr.value.id = data.id
-    formData.value = { ...data }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    formData.value.id = row.id
-    formData.value.store_id = row.store_id
-    handleClick({
-        paneName: activeName.value
-    })
-    const data = await apiStoreOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-const writeoff_order = () => {
-    apiStoreOrderWriteoffOrder({
-        store_id: formData.value.store_id,
-        verify_code: formData.value.verify_code
-    }).then((res) => {
-        if (res.code == 1) {
-            ElMessage.success('操作成功')
-        }
-    })
-}
-//打开弹窗
-const open = () => {
-    showDialog.value = true
-}
-
-const activeName = ref('first')
-
-const handleClick = (tab: any) => {
-    if (tab.paneName == 'second')
-        storeRef.value?.getList({ oid: formData.value.id, store_id: formData.value.store_id })
-    else if (tab.paneName == 'third') orderRef.value?.getLists()
-    else if (tab.paneName == 'fourth') deliverRef.value?.getLists()
-}
-
-const command = (type: any) => {
-    if (type == 1) return refund()
-}
-const xlsx = (id, order_id) => {
-    apiStoreOrderCartInfo({
-        oid: id,
-        page_type: 0,
-        page_start: 1,
-        page_end: 1,
-        file_name: '订单' + order_id + '详情',
-        page_size: 100,
-        export: 2
-    }).then((res) => {
-        ElMessage.success('导出成功')
-    })
-}
-const xlsxTwo = (id, system_store) => {
-    apiStoreOrderExport({
-        id: id,
-        system_store: system_store
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-/**
- * 导出标签
- */
-const xlsx3 = (id, system_store) => {
-    apiStoreOrderExportTags({
-        id: id,
-        system_store: system_store
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-const refund = async () => {
-    await feedback.confirm('确定要退款吗？')
-    apiStoreOrderRefund({
-        order_id: formData.value.order_id
-    }).then((res) => {
-        ElMessage.success('退款成功')
-    })
-}
-
-warehouse()
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/store_order/edit.vue b/src/views/order/store_order/edit.vue
deleted file mode 100644
index 1042f0af3..000000000
--- a/src/views/order/store_order/edit.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="设置门店">
-                    <el-select
-                        v-model="formData.store_id"
-                        placeholder="选择门店"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreOrderSetSystemStore } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { apiSystemStoreLists } from '@/api/system_store'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return (mode.value = '设置配送人员')
-})
-const delivery_list = ref([])
-// 表单数据
-const formData = reactive({
-    id: '',
-    store_id: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({})
-
-const getDetail = () => {
-    apiSystemStoreLists({
-        page_size: 50
-    }).then((res) => {
-        storeList.value = res.lists
-    })
-}
-getDetail()
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    await apiStoreOrderSetSystemStore(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-const setFormData = async (data: Record<any, any>) => {
-    formData.id = data.id
-}
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-const storeList = ref([])
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/order/store_order/index.vue b/src/views/order/store_order/index.vue
deleted file mode 100644
index 9f31b4131..000000000
--- a/src/views/order/store_order/index.vue
+++ /dev/null
@@ -1,505 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="订单号" prop="order_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.order_id"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入订单号"
-                    />
-                </el-form-item>
-                <el-form-item label="门店" prop="store_id">
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="用户" prop="uid">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户id" /> -->
-                    <el-select
-                        v-model="queryParams.uid"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入用户名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="`${item.real_name}|${item.mobile}  (ID:${item.id})`"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="日期" prop="order_id">
-                    <el-date-picker
-                        v-model="queryParams.timeScope"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        :shortcuts="shortcuts"
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item label="支付方式" prop="pay_type">
-                    <el-select
-                        class="w-[280px]"
-                        v-model="queryParams.pay_type"
-                        placeholder="请选择支付方式"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            :label="item.name"
-                            :value="item.value"
-                            v-for="item in dictData.pay_type"
-                            :key="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="订单类型" prop="source">
-                    <el-select
-                        class="w-[280px]"
-                        v-model="queryParams.source"
-                        placeholder="请选择订单类型"
-                        @change="resetPage"
-                    >
-                        <el-option label="普通订单" value="1" />
-                        <el-option label="批发订单" value="4" />
-                        <el-option label="铺货订单" value="11" />
-                        <el-option label="摊贩订单" value="12" />
-                        <el-option label="一条龙订单" value="13" />
-                        <el-option label="仓库补货" value="15" />
-                        <el-option label="其他订单" value="17" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams()">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiStoreOrderLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-radio-group v-model="orderStatus" @change="changeOrderStatus">
-                <router-link
-                    v-perms="['order/store_order/add']"
-                    :to="{
-                        path: 'store_order/add'
-                    }"
-                    class="ml-4 mr-4"
-                >
-                    <el-button type="primary"> 添加订单 </el-button>
-                </router-link>
-                <el-radio-button label="0">全部</el-radio-button>
-                <el-radio-button label="1">待支付</el-radio-button>
-                <el-radio-button label="2">待核销</el-radio-button>
-                <el-radio-button label="60">已设置配送人员</el-radio-button>
-                <el-radio-button label="3">已完成</el-radio-button>
-                <el-radio-button label="4">已退款</el-radio-button>
-            </el-radio-group>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip width="100" />
-                    <el-table-column
-                        label="订单号"
-                        prop="order_id"
-                        show-overflow-tooltip
-                        width="200"
-                    />
-                    <el-table-column
-                        label="商品信息"
-                        prop="order_id"
-                        width="150"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <div
-                                class="flex items-center mb-2"
-                                v-for="(item, index) in row.product?.slice(0, 3)"
-                                :key="index"
-                            >
-                                <el-image
-                                    class="w-[30px] h-[30px] mr-2 flex-shrink-0"
-                                    :src="item.image"
-                                    fit="cover"
-                                    :preview-src-list="[item.image]"
-                                    :preview-teleported="true"
-                                />
-                                <p class="truncate text-[12px]">{{ item.store_name }}</p>
-                            </div>
-                            <div v-if="row.product?.length > 3" style="text-align: left">...</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="门店"
-                        prop="store_name"
-                        show-overflow-tooltip
-                        width="150"
-                    />
-                    <el-table-column
-                        label="用户"
-                        prop="nickname"
-                        show-overflow-tooltip
-                        width="150"
-                    />
-                    <el-table-column
-                        label="实际支付金额"
-                        prop="pay_price"
-                        show-overflow-tooltip
-                        width="150"
-                    />
-                    <el-table-column label="订单状态" prop="status_name" width="100">
-                        <template #default="{ row }">
-                            <div v-if="row.refund_status == 2">
-                                <el-tag type="danger">已退款</el-tag>
-                            </div>
-                            <div v-else>
-                                <el-tag v-if="row.status_name == '待收货'" type="success">{{
-                                    row.status_name
-                                }}</el-tag>
-                                <el-tag
-                                    v-else-if="
-                                        row.status_name == '已收货' || row.status_name == '已完成'
-                                    "
-                                    type="info"
-                                    >{{ row.status_name }}</el-tag
-                                >
-                                <el-tag
-                                    v-else-if="
-                                        row.status_name == '待发货' || row.status_name == '待核销'
-                                    "
-                                    type="warning"
-                                    >{{ row.status_name }}</el-tag
-                                >
-                                <el-tag v-else type="danger">{{ row.status_name }}</el-tag>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="支付方式"
-                        prop="pay_type"
-                        show-overflow-tooltip
-                        width="100"
-                    >
-                        <template #default="{ row }">
-                            <dict-value
-                                :options="dictData.pay_type"
-                                :value="row.pay_type"
-                            ></dict-value>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="订单类型"
-                        prop="source_name"
-                        show-overflow-tooltip
-                        width="100"
-                    />
-
-                    <el-table-column
-                        label="支付时间"
-                        prop="pay_time"
-                        show-overflow-tooltip
-                        width="200"
-                    />
-                    <!-- <el-table-column label="配送人员" prop="delivery_name" show-overflow-tooltip /> -->
-                    <el-table-column label="操作" fixed="right">
-                        <template #default="{ row }">
-                            <!-- <el-button v-perms="['store_order.store_order/edit']" type="primary" link
-                                @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button v-perms="['store_order.store_order/delete']" type="danger" link
-                                @click="handleDelete(row.id)">
-                                删除
-                            </el-button> -->
-                            <el-button type="primary" link @click="handleDetai(row)"
-                                >详情</el-button
-                            >
-                            <el-button type="primary" link @click="handleBeforehand(row)"
-                                >转预定单</el-button
-                            >
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleSystemStore(row)"
-                                v-perms="['store_order.store_order/system_store']"
-                                v-if="row.status != 2"
-                                >设置门店</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <details-popup
-            v-if="showDetails"
-            ref="detailsRef"
-            @success="getLists"
-            @close="showDetails = false"
-            :dictData="dictData"
-        />
-        <addBeforehand
-            v-if="showaddBeforehand"
-            ref="addBeforehandRef"
-            @success="getLists"
-            @close="showaddBeforehand = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="storeOrderLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
-import { apiPurchaseOrderTransferAdvanceOrder } from '@/api/beforehand_order'
-import { timeFormat } from '@/utils/util'
-import { apiSystemStoreLists } from '@/api/system_store'
-import feedback from '@/utils/feedback'
-import moment from 'moment'
-import EditPopup from './edit.vue'
-import addBeforehand from './addBeforehand.vue'
-import DetailsPopup from './details.vue'
-import { apiUserLists } from '@/api/user'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-const addBeforehandRef = shallowRef<InstanceType<typeof addBeforehand>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDetails = ref(false)
-const showaddBeforehand = ref(false)
-const shortcuts = [
-    {
-        text: '近一周',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(start.getDate() - 7)
-            return [start, end]
-        }
-    },
-    {
-        text: '近一月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 1)
-            return [start, end]
-        }
-    },
-    {
-        text: '近三月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 3)
-            return [start, end]
-        }
-    }
-]
-
-const startEndTime = ref([])
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    uid: '',
-    pay_type: '',
-    store_id: '',
-    start_time: '',
-    end_time: '',
-    paid: null,
-    status: null,
-    is_writeoff: null,
-    source: '',
-	timeScope: []
-})
-const orderStatus = ref('0')
-const changeOrderStatus = (e: any) => {
-    if (e == 0) {
-        queryParams.paid = null
-        queryParams.status = null
-        queryParams.is_writeoff = null
-    } else if (e == 1) {
-        queryParams.paid = 0
-        queryParams.status = null
-        queryParams.is_writeoff = null
-    } else if (e == 2) {
-        queryParams.paid = 1
-        queryParams.status = 1
-        queryParams.is_writeoff = 0
-    } else if (e == 3) {
-        queryParams.paid = 1
-        queryParams.status = 2
-        queryParams.is_writeoff = null
-    } else if (e == 4) {
-        queryParams.paid = null
-        queryParams.status = 4
-        queryParams.is_writeoff = null
-    } else if (e == 60) {
-        queryParams.is_delivery = 1
-        queryParams.status = null
-        queryParams.paid = null
-        queryParams.is_writeoff = null
-    }
-    getLists()
-}
-
-const changeStartEndTime = () => {
-    if (queryParams.timeScope[0] && queryParams.timeScope[1]) {
-        queryParams.start_time = moment(queryParams.timeScope[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(queryParams.timeScope[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('pay_type')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    // editRef.value?.setFormData(data)
-}
-
-// 详情
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-const handleBeforehand = async (data: any) => {
-    showaddBeforehand.value = true
-    await nextTick()
-    addBeforehandRef.value?.open()
-    addBeforehandRef.value?.getDetail(data)
-}
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreOrderDelete({ id })
-    getLists()
-}
-const handleSystemStore = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiUserLists({
-        nickname: e,
-        page_size: 50
-    })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-/**
- * 订单转预购订单
- */
-const TransferAdvanceOrder = (data: any) => {
-    apiPurchaseOrderTransferAdvanceOrder(data)
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/order/store_order/refund.vue b/src/views/order/store_order/refund.vue
deleted file mode 100644
index 5849a2a30..000000000
--- a/src/views/order/store_order/refund.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="订单状态">
-                            <el-select class="flex-1" v-model="queryParams.refund_type" placeholder="请选择订单状态"
-                                @change="handleResetPage">
-                                <!-- 1仅退款，2退款退货，3拒绝退款，4商品待退货，5退货待收货，6已退款 -->
-                                <el-option label="仅退款" value="1" />
-                                <el-option label="仅退款" value="2" />
-                                <el-option label="拒绝退款" value="3" />
-                                <el-option label="商品待退货" value="4" />
-                                <el-option label="退货待收货" value="5" />
-                                <el-option label="已退款" value="6" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="退款时间">
-                            <el-date-picker v-model="date" type="daterange" range-separator="-" start-placeholder="开始时间"
-                                end-placeholder="结束时间" value-format="YYYY-MM-DD" @change="handleResetPage" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="订单搜索">
-                            <el-input v-model="queryParams.order_id" clearable placeholder="请输入订单编号"
-                                @keydown.enter="handleResetPage" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" @click="handleResetPage">查询</el-button>
-                            <el-button @click="handleResetParams">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists">
-                    <el-table-column label="订单号" prop="order_id" min-width="150" show-overflow-tooltip />
-                    <el-table-column label="用户信息" prop="nickname" min-width="120" show-overflow-tooltip>
-                        <!-- <template #default="{ row }">
-                            <div class="flex items-center">
-                                <el-image style="width: 50px; height: 50px" :src="row.avatar" class="mr-2"  :preview-teleported="true"/>
-                                {{ row.nickname }}
-                            </div>
-                        </template> -->
-                    </el-table-column>
-                    <el-table-column label="商品信息" prop="project_level_text" show-overflow-tooltip min-width="180">
-                        <template #default="{ row }">
-                            <div v-for="(item, index) in row.product" :key="index" class="flex items-center">
-                                <el-image :src="item.cart_info.image" class="mr-2 w-[40px] h-[40px] !flex-shrink-0"  :preview-teleported="true"/>
-                                <div class="text-[12px]">
-                                    <p>{{ item.cart_info.name }}</p>
-                                    <p>￥{{ item.cart_info.price }} x {{ item.cart_info.cart_num }}</p>
-                                </div>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="实际支付" prop="pay_price" min-width="120" show-overflow-tooltip />
-                    <el-table-column label="发起退款时间" prop="refund_reason_time" min-width="150" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span>{{ row.refund_reason_time ?
-                                moment(row.refund_reason_time < 10**10 ? row.refund_reason_time * 1000 : row.refund_reason_time)
-                                .format('YYYY-MM-DD HH:mm:ss') : '-' }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="退款状态" prop="refund_status_name" min-width="100" show-overflow-tooltip >
-                        <template #default="{row}">
-                            <el-tag v-if="row.refund_status_name=='已退款'" type="success">{{ row.refund_status_name }}</el-tag>
-                            <el-tag v-else type="danger">{{ row.refund_status_name }}</el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="退款信息" prop="" show-overflow-tooltip />
-                    <el-table-column label="退货信息" prop="" show-overflow-tooltip />
-                    <el-table-column label="售后备注" prop="" show-overflow-tooltip />
-                    <el-table-column label="操作" width="170" fixed="right" align="center">
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleDetail(row)">
-                                订单详情
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <div v-if="showDetail">
-            <orderDetail ref="detailRef" :detailData="detailData" @close="showDetail = false" :orderType="0">
-            </orderDetail>
-        </div>
-        <details-popup v-if="showDetails" ref="detailsRef" @success="getLists" @close="showDetails = false"
-            :dictData="dictData" />
-
-    </div>
-</template>
-
-<script lang="ts" setup name="manageProjectLists">
-import orderDetail from '@/components/orderDetail/index.vue'
-import { ref, reactive } from 'vue'
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import moment from 'moment'
-import { apiStoreRefundOrderLists, apiStoreRefundOrderDetail } from '@/api/store_order'
-import DetailsPopup from './details.vue'
-
-// 查询条件
-const queryParams = reactive({
-    order_id: "",
-    pay_type: "",
-    start_time: "",
-    end_time: '',
-    refund_type: "",
-})
-
-const date = ref([])
-const showDetail = ref(false)
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-// 获取字典数据
-const { dictData } = useDictData('pay_type')
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreRefundOrderLists,
-    params: queryParams
-})
-
-const handleResetPage = () => {
-    if (date.value.length) {
-        queryParams.start_time = date.value[0]
-        queryParams.end_time = date.value[1]
-    }
-    resetPage()
-}
-
-
-const handleResetParams = () => {
-    date.value = []
-    resetParams()
-}
-
-const detailRef = ref(null)
-const detailData = ref({})
-
-
-const showDetails = ref(false)
-// 详情
-const handleDetail = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-
-getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/order/store_order_cart_info/index.vue b/src/views/order/store_order_cart_info/index.vue
deleted file mode 100644
index e1fc9f2d2..000000000
--- a/src/views/order/store_order_cart_info/index.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_name"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item label="门店" prop="store_id">
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item label="统计" prop="is_group">
-                    <el-select
-                        v-model="queryParams.is_group"
-                        placeholder="请选择是否统计"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option label="统计" value="1" />
-                        <el-option label="不统计" value="0" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="datetimerange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiStoreOrderCartInfoTwo"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                    <el-button @click="xlsxTwo">导出配送表格</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="商品ID" prop="product_id" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="门店"
-                        prop="system_store"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="商品名称"
-                        prop="store_name"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="分类"
-                        prop="cate_name"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="单位"
-                        prop="unit_name"
-                        min-width="80"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="规格"
-                        prop="store_info"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="数量"
-                        prop="cart_num"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="单价"
-                        prop="price"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="总价"
-                        prop="total_price"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderCartInfoTwo, apiStoreOrderInfoExport } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { useRoute } from 'vue-router'
-import { apiSystemStoreLists } from '@/api/system_store'
-import moment from 'moment'
-
-const route = useRoute()
-
-const detailsRef = ref(null)
-const startEndTime = ref([new Date(), new Date()])
-
-// 查询条件
-const queryParams = reactive({
-    start_time: moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00',
-    end_time: moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59',
-    is_group: '',
-    store_id: '',
-    store_name: ''
-})
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD HH:mm:ss')
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD HH:mm:ss')
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-// 获取字典数据
-const { dictData } = useDictData('')
-// 分页相关
-let page_no = 1
-if (route.query.page_no) {
-    page_no = parseInt(route.query.page_no)
-}
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    page: page_no,
-    fetchFun: apiStoreOrderCartInfoTwo,
-    params: queryParams
-})
-const xlsxTwo = () => {
-    apiStoreOrderInfoExport(queryParams).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-// 编辑
-
-let resolves
-let nodes
-const flag = ref(false)
-let name
-const beforeFilter = (value) => {
-    name = value
-    flag.value = true
-    props.lazyLoad(nodes, resolves)
-    return false
-}
-const primary = ref('primary')
-const primary2 = ref('')
-const handleGroup = () => {
-    queryParams.is_all = ''
-    primary.value = 'primary'
-    primary2.value = ''
-    url.value = product_order
-    getLists()
-}
-const handleList = () => {
-    queryParams.is_all = '1'
-    primary.value = ''
-    primary2.value = 'primary'
-    url.value = product_order
-    resetPage()
-    getLists()
-}
-const props = {
-    value: 'id',
-    label: 'name',
-    emitPath: false,
-    lazy: true,
-    lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve
-        if (!nodes) nodes = node
-        const pid = node.value || 0
-        let data = {}
-        if (flag.value) {
-            data = { name: name }
-            if (!name) {
-                data = {
-                    pid: pid,
-                    page_size: 10000
-                }
-            }
-        } else {
-            data = {
-                pid: pid,
-                page_size: 10000
-            }
-        }
-        apiStoreCategoryLists({
-            ...data
-        }).then((res) => {
-            resolve(
-                res.lists.map((item: any) => {
-                    // item.leaf = item.is_children == 0;
-                    item.leaf = true
-                    flag.value = false
-                    return item
-                })
-            )
-        })
-    }
-}
-
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/order/store_order_transshipment/components/deliverTable.vue b/src/views/order/store_order_transshipment/components/deliverTable.vue
deleted file mode 100644
index 42f987a9b..000000000
--- a/src/views/order/store_order_transshipment/components/deliverTable.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                <el-table-column label="订单号" prop="id" show-overflow-tooltip />
-                <el-table-column label="商品信息" prop="status" show-overflow-tooltip width="400">
-                    <template #default="{ row }">
-                        <el-image :src="row.image" class="w-16 h-16" :preview-teleported="true"></el-image>
-                        <div>{{ row.store_name }}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="发货时间" prop="id" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end"  v-if="pager.lists.length<pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="deliverTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderLists,
-    params: queryParams
-})
-
-defineExpose({
-    getLists
-})
-
-
-</script>
diff --git a/src/views/order/store_order_transshipment/components/orderInfo.vue b/src/views/order/store_order_transshipment/components/orderInfo.vue
deleted file mode 100644
index 1bd6827bc..000000000
--- a/src/views/order/store_order_transshipment/components/orderInfo.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-    <div>
-        <div>
-            <div class="font-bold text-lg">用户信息</div>
-            <div class="flex flex-wrap">
-                <div class="mt-4 w-1/3">用户uid：{{ datas.uid }}</div>
-                <div class="mt-4 w-1/3">用户昵称：{{ datas.real_name }}</div>
-                <div class="mt-4 w-1/3">手机号：{{ datas.user_phone }}</div>
-            </div>
-        </div>
-        <div class="mt-6">
-            <div class="font-bold text-lg">收货信息</div>
-            <div class="mt-4">收货人：{{ datas.real_name }}</div>
-            <div class="mt-4">收货电话：{{ datas.user_phone }}</div>
-            <div class="mt-4">收货地址：{{ datas.user_address }}</div>
-        </div>
-        <div class="mt-6">
-            <div class="font-bold text-lg">订单信息</div>
-            <div class="flex flex-wrap">
-                <div class="mt-4 w-1/3">创建时间：{{ datas.create_time }}</div>
-                <div class="mt-4 w-1/3">商品总数：{{ datas.total_num }}</div>
-                <div class="mt-4 w-1/3">商品总价：{{ datas.total_price }}</div>
-                <div class="mt-4 w-1/3">优惠券金额：{{ datas.coupon_price }}</div>
-                <div class="mt-4 w-1/3">积分抵扣：{{ datas.deduction_price }}</div>
-                <div class="mt-4 w-1/3">支付时间：{{ datas.pay_time }}</div>
-                <div class="mt-4 w-1/3 flex">支付方式：<dict-value :options="dictData.pay_type" :value="datas.pay_type"></dict-value></div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="orderInfo">
-
-import type { PropType } from 'vue'
-const props = defineProps({
-    datas: {
-        type: Object,
-        required: true
-    },
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-
-</script>
diff --git a/src/views/order/store_order_transshipment/components/orderTable.vue b/src/views/order/store_order_transshipment/components/orderTable.vue
deleted file mode 100644
index 8e0059935..000000000
--- a/src/views/order/store_order_transshipment/components/orderTable.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                <el-table-column label="订单ID" prop="id" show-overflow-tooltip />
-                <el-table-column label="操作记录" prop="id" show-overflow-tooltip />
-                <el-table-column label="操作时间" prop="id" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length<pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="orderTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderLists,
-    params: queryParams
-})
-
-defineExpose({
-    getLists
-})
-
-
-</script>
diff --git a/src/views/order/store_order_transshipment/components/storeTable.vue b/src/views/order/store_order_transshipment/components/storeTable.vue
deleted file mode 100644
index c20b3e1db..000000000
--- a/src/views/order/store_order_transshipment/components/storeTable.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-    <div>
-        <div>
-            <el-table :data="pager.lists" v-loading="pager.loading" @selection-change="handleSelectionChange">
-                <el-table-column label="商品信息" prop="store_name" show-overflow-tooltip width="400">
-                    <template #default="{ row }">
-                        <div class="flex items-center">
-                            <el-image :src="row.image" class="w-16 h-16 mr-2" :preview-teleported="true"></el-image>
-                            <div>{{ row.store_name }}</div>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="数量" prop="cart_info.cart_num" show-overflow-tooltip />
-                <el-table-column label="合计" prop="cart_info.total" show-overflow-tooltip />
-                <el-table-column label="实付金额" prop="cart_info.price" show-overflow-tooltip />
-            </el-table>
-        </div>
-        <div class="flex mt-4 justify-end" v-if="pager.lists.length<pager.count">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeTable">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderCartInfo } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const props = defineProps({
-    oid: {
-        type: [String,Number],
-        required: true
-    }
-})
-
-
-const emit = defineEmits(['change'])
-
-// 选中的数据
-const selectionList = ref([])
-
-// 选中数据时触发
-const handleSelectionChange = (val: any) => {
-    selectionList.value = val
-    emit('change', selectionList.value)
-}
-
-// 查询条件
-const queryParams = reactive({
-    oid: '',
-    pay_type: ''
-})
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderCartInfo,
-    params: {
-        ...queryParams,
-        oid: props.oid
-    }
-})
-
-defineExpose({
-    getLists
-})
-
-
-</script>
diff --git a/src/views/order/store_order_transshipment/details.vue b/src/views/order/store_order_transshipment/details.vue
deleted file mode 100644
index dd9cbc621..000000000
--- a/src/views/order/store_order_transshipment/details.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="订单详情" :size="1000">
-        <div class="flex items-center justify-between">
-            <div>订单编号：{{formData.order_id}}</div>
-            <!-- <el-button type="primary">发送货</el-button> -->
-        </div>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray;">订单状态</div>
-                <div style="color: black;">{{ formData.status_name }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray;">实际支付</div>
-                <div style="color: black;">￥{{ formData.pay_price }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray;">支付方式</div>
-                <div style="color: black;">
-                    <dict-value :options="dictData.pay_type" :value="formData.pay_type"></dict-value>
-                </div>
-            </div>
-            <div class="flex flex-col flex-2">
-                <div style="color: gray;">支付时间</div>
-                <div style="color: black;">{{ formData.pay_time }}</div>
-            </div>
-            
-        </div>
-        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="border-card">
-            <el-tab-pane label="订单信息" name="first">
-                <orderInfo :datas="formData" :dictData="dictData"></orderInfo>
-            </el-tab-pane>
-            <el-tab-pane label="商品信息" name="second">
-                <storeTable :oid="formData.id" ref="storeRef"></storeTable>
-            </el-tab-pane>
-            <!-- <el-tab-pane label="订单记录" name="third">
-                <orderTable ref="orderRef"></orderTable>
-            </el-tab-pane>
-            <el-tab-pane label="发货记录" name="fourth">
-                <deliverTable ref="deliverRef"></deliverTable>
-            </el-tab-pane> -->
-        </el-tabs>
-    </el-drawer>
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreOrderAdd, apiStoreOrderEdit, apiStoreOrderDetail } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import moment from 'moment'
-import orderInfo from './components/orderInfo.vue'
-import storeTable from './components/storeTable.vue'
-import orderTable from './components/orderTable.vue'
-import deliverTable from './components/deliverTable.vue'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const showDialog = ref(false)
-const mode = ref('add')
-
-const storeRef = ref(null);
-const orderRef = ref(null);
-const deliverRef = ref(null);
-
-// 表单数据
-const formData = ref({
-    id: ''
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = {...data};
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    formData.value.id = row.id;
-    handleClick({
-        paneName:activeName.value
-    });
-    const data = await apiStoreOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    showDialog.value = true;
-}
-
-const activeName = ref('first')
-
-const handleClick = (tab:any) => {
-  if(tab.paneName == 'second') storeRef.value?.getLists();
-  else if(tab.paneName == 'third') orderRef.value?.getLists();
-  else if(tab.paneName == 'fourth') deliverRef.value?.getLists();
-}
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/store_order_transshipment/edit.vue b/src/views/order/store_order_transshipment/edit.vue
deleted file mode 100644
index fa2c862a2..000000000
--- a/src/views/order/store_order_transshipment/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreOrderAdd, apiStoreOrderEdit, apiStoreOrderDetail } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑订单表' : '新增订单表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreOrderEdit(data) 
-        : await apiStoreOrderAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/store_order_transshipment/index.vue b/src/views/order/store_order_transshipment/index.vue
deleted file mode 100644
index 1f23190eb..000000000
--- a/src/views/order/store_order_transshipment/index.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="订单号" prop="order_id">
-                    <el-input class="w-[280px]" v-model="queryParams.order_id" @keydown.enter="resetPage" clearable placeholder="请输入订单号" />
-                </el-form-item>
-                <el-form-item label="支付方式" prop="pay_type">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.pay_type" clearable placeholder="请输入支付方式" /> -->
-                    <el-select class="w-[280px]" v-model="queryParams.pay_type" placeholder="请选择支付方式"  @change="resetPage">
-                        <el-option :label="item.name" :value="item.value" v-for="item in dictData.pay_type"
-                            :key="item.value" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div>
-                
-            </div>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="订单ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="订单号" prop="order_id" show-overflow-tooltip />
-                    <el-table-column label="商品信息" prop="order_id" min-width="150" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <div class="flex items-center mb-2" v-for="(item, index) in row.product?.slice(0,3)" :key="index">
-                                <el-image class="w-[30px] h-[30px] mr-2 flex-shrink-0" :src="item.image" fit="cover"
-                                    :preview-src-list="[item.image]" :preview-teleported="true" />
-                                <p class="truncate text-[12px]">{{ item.store_name }}</p>
-                            </div>
-                            <div v-if="row.product?.length > 3" style="text-align: left">...</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="用户" prop="nickname" show-overflow-tooltip />
-                    <el-table-column label="实际支付金额" prop="pay_price" show-overflow-tooltip />
-                    <el-table-column label="订单状态" prop="status_name">
-                        <template #default="{row}">
-                            <el-tag v-if="row.status_name=='待收货'" type="success">{{ row.status_name }}</el-tag>
-                            <el-tag v-else-if="row.status_name=='已收货' || row.status_name=='已完成'" type="info">{{ row.status_name }}</el-tag>
-                            <el-tag v-else-if="row.status_name=='待发货' || row.status_name=='待核销'" type="warning">{{ row.status_name }}</el-tag>
-                            <el-tag v-else type="danger">{{ row.status_name }}</el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="支付方式" prop="pay_type" show-overflow-tooltip>
-                        <template #default="{row}">
-                            <dict-value :options="dictData.pay_type" :value="row.pay_type"></dict-value>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="支付时间" prop="pay_time" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <!-- <el-button v-perms="['store_order.store_order/edit']" type="primary" link
-                                @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button v-perms="['store_order.store_order/delete']" type="danger" link
-                                @click="handleDelete(row.id)">
-                                删除
-                            </el-button> -->
-                            <el-button type="primary" link @click="handleDetai(row)">详情</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <!-- <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> -->
-        <details-popup v-if="showDetails" ref="detailsRef" @success="getLists" @close="showDetails = false" :dictData="dictData" />
-    </div>
-</template>
-
-<script lang="ts" setup name="store_order_transshipment">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailsPopup from './details.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDetails = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    order_id: '',
-    pay_type: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('pay_type')
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 详情
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreOrderDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/order/user_product_storage/details.vue b/src/views/order/user_product_storage/details.vue
deleted file mode 100644
index 67b4f18d2..000000000
--- a/src/views/order/user_product_storage/details.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userProductStorageDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserProductStorageAdd, apiUserProductStorageEdit, apiUserProductStorageDetail } from '@/api/user_product_storage'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    //@ts-ignore
-    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserProductStorageDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/user_product_storage/edit.vue b/src/views/order/user_product_storage/edit.vue
deleted file mode 100644
index 440cab684..000000000
--- a/src/views/order/user_product_storage/edit.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userProductStorageEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserProductStorageAdd, apiUserProductStorageEdit, apiUserProductStorageDetail } from '@/api/user_product_storage'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑用户商品储存' : '新增用户商品储存'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    //@ts-ignore
-    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserProductStorageDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiUserProductStorageEdit(data) 
-        : await apiUserProductStorageAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/user_product_storage/index.vue b/src/views/order/user_product_storage/index.vue
deleted file mode 100644
index 6053a72aa..000000000
--- a/src/views/order/user_product_storage/index.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="用户" prop="uid">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户" /> -->
-                    <el-select v-model="queryParams.uid" filterable remote reserve-keyword placeholder="输入用户名称搜索"
-                        remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading" style="width: 240px"
-                        @change="resetPage">
-                        <el-option v-for="item in userList" :key="item.id" :label="`${item.real_name || item.nickname}  (ID:${item.id})`" :value="item.id" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="订单id" prop="oid">
-                    <el-input class="w-[280px]" v-model="queryParams.oid" clearable placeholder="请输入订单id" @keydown.enter="resetPage" @clear="resetPage" />
-                </el-form-item>
-                <!-- <el-form-item label="商品" prop="product_id">
-                    <el-input class="w-[280px]" v-model="queryParams.product_id" clearable placeholder="请输入商品" />
-                </el-form-item> -->
-                <el-form-item label="" prop="create_time">
-                    <daterange-picker
-                        v-model:startTime="queryParams.start_time"
-                        v-model:endTime="queryParams.end_time"
-                        type="daterange"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-button v-perms="['user_product_storage.user_product_storage/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['user_product_storage.user_product_storage/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button> -->
-            <div>
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <!-- <el-table-column type="selection" width="55" /> -->
-                    <el-table-column label="用户" prop="nickname" show-overflow-tooltip />
-                    <el-table-column label="订单id" prop="oid" show-overflow-tooltip />
-                    <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status_name" show-overflow-tooltip />
-                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                                <router-link :to="{
-                                    path: 'user_product_storage_log',
-                                    query:{
-                                        oid: row.oid,
-                                        product_id: row.product_id
-                                    }
-                                }" class="ml-4" v-perms="['user_product_storage.user_product_storage/edit']">
-                                    <el-button type="primary" link>
-                                        详情
-                                    </el-button>
-                                </router-link>
-                             <!-- <el-button
-                                v-perms="['user_product_storage.user_product_storage/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['user_product_storage.user_product_storage/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button> -->
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="userProductStorageLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserProductStorageLists, apiUserProductStorageDelete } from '@/api/user_product_storage'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import { apiUserLists } from '@/api/user'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    uid: '',
-    oid: '',
-    product_id: '',
-    create_time: '',
-    start_time: '',
-    end_time: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserProductStorageLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiUserProductStorageDelete({ id })
-    getLists()
-}
-
-getLists()
-
-const userloading = ref(false);
-const userList = ref([]);
-const remoteMethodUser = (e: string = '') => {
-    userloading.value = true;
-    apiUserLists({
-        nickname: e,
-        page_size: 50
-    }).then(res => {
-        userList.value = res.lists;
-        setTimeout(() => {
-            userloading.value = false;
-        }, 300)
-    }).catch(err => {
-        setTimeout(() => {
-            userloading.value = false;
-        }, 300)
-    })
-}
-</script>
-
diff --git a/src/views/order/user_product_storage_log/details.vue b/src/views/order/user_product_storage_log/details.vue
deleted file mode 100644
index 3d0316fc0..000000000
--- a/src/views/order/user_product_storage_log/details.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userProductStorageLogDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserProductStorageLogAdd, apiUserProductStorageLogEdit, apiUserProductStorageLogDetail } from '@/api/user_product_storage_log'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    //@ts-ignore
-    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserProductStorageLogDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/user_product_storage_log/edit.vue b/src/views/order/user_product_storage_log/edit.vue
deleted file mode 100644
index daaf7d879..000000000
--- a/src/views/order/user_product_storage_log/edit.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userProductStorageLogEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserProductStorageLogAdd, apiUserProductStorageLogEdit, apiUserProductStorageLogDetail } from '@/api/user_product_storage_log'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑用户商品储存操作日志' : '新增用户商品储存操作日志'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    //@ts-ignore
-    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserProductStorageLogDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiUserProductStorageLogEdit(data) 
-        : await apiUserProductStorageLogAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/order/user_product_storage_log/index.vue b/src/views/order/user_product_storage_log/index.vue
deleted file mode 100644
index 2408ebd13..000000000
--- a/src/views/order/user_product_storage_log/index.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="" prop="create_time">
-                    <daterange-picker
-                        v-model:startTime="queryParams.start_time"
-                        v-model:endTime="queryParams.end_time"
-                    />
-                </el-form-item>
-                
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div>
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="订单id" prop="oid" show-overflow-tooltip />
-                    <el-table-column label="用户" prop="nickname" show-overflow-tooltip />
-                    <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="门店" prop="system_store_name" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="financial_pm" show-overflow-tooltip />
-                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="userProductStorageLogLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserProductStorageLogLists, apiUserProductStorageLogDelete } from '@/api/user_product_storage_log'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import { useRoute } from "vue-router"
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    create_time: '',
-    start_time: '',
-    end_time: '',
-    oid: '',
-    product_id: '',
-})
-
-const route = useRoute();
-if(route.query?.oid){
-    queryParams.oid = route.query.oid;
-    queryParams.product_id = route.query.product_id;
-}
-
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserProductStorageLogLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiUserProductStorageLogDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
diff --git a/src/views/statistics/negative/index.vue b/src/views/statistics/negative/index.vue
deleted file mode 100644
index 532c08672..000000000
--- a/src/views/statistics/negative/index.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        @keydown.enter="resetPage"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item label="商品分类" prop="store_name">
-                    <el-cascader
-                        class="w-[280px]"
-                        v-model="queryParams.top_cate_id"
-                        filterable
-                        clearable
-                        :before-filter="beforeFilter"
-                        :props="props"
-                        placeholder="请选择商品分类"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item label="类型" prop="type">
-                    <el-select
-                        v-model="queryParams.type"
-                        placeholder="请选择类型"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in [
-                                { id: 1, name: '默认' },
-                                { id: 2, name: '门店' },
-                                { id: 3, name: '仓库' }
-                            ]"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="门店" prop="store_id" v-if="queryParams.type == 2">
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="negative_inventory"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="商品名称"
-                        prop="store_name"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="库存"
-                        prop="stock"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="备注"
-                        prop="remark"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="操作" width="180" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['statistics.negative/update_negative_zero']"
-                                type="primary"
-                                link
-                                @click="handleDetail(row)"
-                            >
-                                归零
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { negative_inventory, update_negative_zero } from '@/api/workbench'
-import { useRoute } from 'vue-router'
-import { apiSystemStoreLists } from '@/api/system_store'
-import { apiStoreCategoryLists } from '@/api/store_category'
-
-// 查询条件
-const queryParams = reactive({
-    store_name: '',
-    type: 1,
-    store_id: '',
-    top_cate_id: ''
-})
-
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-// 详情
-const handleDetail = async (data: any) => {
-    update_negative_zero({ type: queryParams.type, id: data.id })
-        .then((res) => {
-            ElMessage.success('操作成功')
-            getLists()
-        })
-        .catch((err) => {
-            ElMessage.error('操作失败')
-        })
-}
-// 获取字典数据
-const { dictData } = useDictData('')
-// 分页相关
-
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: negative_inventory,
-    params: queryParams
-})
-let resolves
-let nodes
-const flag = ref(false)
-let name
-const beforeFilter = (value) => {
-    name = value
-    flag.value = true
-    props.lazyLoad(nodes, resolves)
-    return false
-}
-const props = {
-    value: 'id',
-    label: 'name',
-    emitPath: false,
-    lazy: true,
-    lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve
-        if (!nodes) nodes = node
-        const pid = node.value || 0
-        let data = {}
-        if (flag.value) {
-            data = { name: name }
-            if (!name) {
-                data = {
-                    pid: pid,
-                    page_size: 10000
-                }
-            }
-        } else {
-            data = {
-                pid: pid,
-                page_size: 10000
-            }
-        }
-        apiStoreCategoryLists({
-            ...data
-        }).then((res) => {
-            resolve(
-                res.lists.map((item: any) => {
-                    // item.leaf = item.is_children == 0;
-                    item.leaf = true
-                    flag.value = false
-                    return item
-                })
-            )
-        })
-    }
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/statistics/order_product/index.vue b/src/views/statistics/order_product/index.vue
deleted file mode 100644
index b02c96bb3..000000000
--- a/src/views/statistics/order_product/index.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="product_order"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="商品ID" prop="product_id" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="商品名称"
-                        prop="store_name"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="分类"
-                        prop="cate_name"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="单位"
-                        prop="unit_name"
-                        min-width="80"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="规格"
-                        prop="store_info"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="数量"
-                        prop="cart_num"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="单价"
-                        prop="price"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="总价"
-                        prop="total_price"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { product_order } from '@/api/workbench'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { useRoute } from 'vue-router'
-import { apiSystemStoreLists } from '@/api/system_store'
-import moment from 'moment'
-
-const route = useRoute()
-
-const detailsRef = ref(null)
-const startEndTime = ref([new Date(), new Date()])
-
-// 查询条件
-const queryParams = reactive({
-    start_time: moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00',
-    end_time: moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59',
-    is_all: '',
-    store_id: ''
-})
-
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-// 获取字典数据
-const { dictData } = useDictData('')
-// 分页相关
-let page_no = 1
-if (route.query.page_no) {
-    page_no = parseInt(route.query.page_no)
-}
-const url = ref(product_order)
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    page: page_no,
-    fetchFun: url.value,
-    params: queryParams
-})
-
-// 编辑
-
-let resolves
-let nodes
-const flag = ref(false)
-let name
-const beforeFilter = (value) => {
-    name = value
-    flag.value = true
-    props.lazyLoad(nodes, resolves)
-    return false
-}
-const primary = ref('primary')
-const primary2 = ref('')
-const handleGroup = () => {
-    queryParams.is_all = ''
-    primary.value = 'primary'
-    primary2.value = ''
-    url.value = product_order
-    getLists()
-}
-const handleList = () => {
-    queryParams.is_all = '1'
-    primary.value = ''
-    primary2.value = 'primary'
-    url.value = product_order
-    resetPage()
-    getLists()
-}
-const props = {
-    value: 'id',
-    label: 'name',
-    emitPath: false,
-    lazy: true,
-    lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve
-        if (!nodes) nodes = node
-        const pid = node.value || 0
-        let data = {}
-        if (flag.value) {
-            data = { name: name }
-            if (!name) {
-                data = {
-                    pid: pid,
-                    page_size: 10000
-                }
-            }
-        } else {
-            data = {
-                pid: pid,
-                page_size: 10000
-            }
-        }
-        apiStoreCategoryLists({
-            ...data
-        }).then((res) => {
-            resolve(
-                res.lists.map((item: any) => {
-                    // item.leaf = item.is_children == 0;
-                    item.leaf = true
-                    flag.value = false
-                    return item
-                })
-            )
-        })
-    }
-}
-
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/statistics/product/index copy.vue b/src/views/statistics/product/index copy.vue
deleted file mode 100644
index 39b1baa58..000000000
--- a/src/views/statistics/product/index copy.vue	
+++ /dev/null
@@ -1,316 +0,0 @@
-<template>
-    <div class="workbench">
-        <el-card shadow="never" class=" !border-none">
-            <div class="mb-6 flex justify-between items-center">
-                <span class="text-2xl">商品概况</span>
-                <div class="flex items-center text-sm">
-                    <span class="mr-4">时间筛选: </span>
-                    <el-date-picker v-model="startEndTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts" @change="getData" />
-                    <el-button type="primary" class="ml-4" @click="getData">查询</el-button>
-                </div>
-            </div>
-            <div class="flex flex-wrap">
-                <div class="w-1/5 flex mb-6" v-for="(item, index) in basicList" :key="index">
-                    <div class="mr-2">
-                        <div class="rounded-full p-2" :style="{ 'background-color': colorList[index % 4] }">
-                            <iconfont :iconName="item.icon" white className="text-6xl" />
-                        </div>
-                    </div>
-                    <div>
-                        <div class="text-info">{{ item.name }}</div>
-                        <div class="text-6xl">{{ item.num }}</div>
-                        <!-- <div class="text-info">环比增长: <span :class="item.percent > 0 ? 'text-success' : 'text-danger'">{{
-                            item.percent }}%</span></div> -->
-                    </div>
-                </div>
-            </div>
-        </el-card>
-        <el-card shadow="never" class="mt-4 !border-none">
-            <div class="mb-6 flex justify-between items-center">
-                <span class="text-2xl">商品趋势</span>
-                <div class="flex items-center text-sm">
-                    <span class="mr-4">时间筛选: </span>
-                    <el-date-picker v-model="startEndTime2" type="daterange" range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts" @change="getData2" />
-                    <el-button type="primary" class="ml-4" @click="getData2">查询</el-button>
-                </div>
-            </div>
-            <div>
-                <v-charts style="height: 400px" :option="visitorOption" :autoresize="true" />
-            </div>
-        </el-card>
-        <el-card shadow="never" class="mt-4 !border-none">
-            <div class="mb-6 flex justify-between items-center">
-                <span class="text-2xl">商品排行</span>
-                <div class="flex items-center text-sm">
-                    <span class="mr-4">时间筛选: </span>
-                    <el-date-picker v-model="startEndTime3" type="daterange" range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts"  @change="getList" />
-                    <el-button type="primary" class="ml-4" @click="getList">查询</el-button>
-                </div>
-            </div>
-            <div>
-                <el-table :data="sotreList">
-                    <el-table-column label="商品图片">
-                        <template #default="{ row }">
-                            <el-image :src="row.image" fit="cover" style="width: 50px; height: 50px"  :preview-teleported="true"/>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品名称" prop="store_name" min-width="250" />
-                    <el-table-column label="游览量" prop="visit" min-width="120" />
-                    <el-table-column label="访客数" prop="user" min-width="120" />
-                    <el-table-column label="加购件数" prop="cart" min-width="120" />
-                    <el-table-column label="下单件数" prop="orders" min-width="120" />
-                    <el-table-column label="支付件数" prop="pay" min-width="120" />
-                    <el-table-column label="支付金额" prop="price" min-width="120" />
-                    <el-table-column label="收藏数" prop="collect" min-width="120" />
-                    <el-table-column label="毛利率(%)" prop="profit" min-width="120">
-                        <template #default="{ row }">
-                            <span>{{ row.profit }}%</span>
-                        </template>
-                    </el-table-column>
-
-                </el-table>
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="product">
-import { apiGetBasic, apiGetTrend, apiGetProductRanking } from '@/api/workbench'
-import moment from 'moment'
-import vCharts from 'vue-echarts'
-
-const shortcuts = [
-    {
-        text: '近一周',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(start.getDate() - 7)
-            return [start, end]
-        },
-    },
-    {
-        text: '本月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(1)
-            end.setMonth(end.getMonth() + 1)
-            end.setDate(0)
-            return [start, end]
-        },
-    },
-    {
-        text: '近一月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 1)
-            return [start, end]
-        },
-    },
-    {
-        text: '近三月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 3)
-            return [start, end]
-        },
-    },
-]
-
-// 表单数据
-const visitorOption: any = reactive({
-    xAxis: {
-        type: 'category',
-        data: [0],
-        axisLabel: {
-            rotate: 45,
-            color: '#333'
-        }
-    },
-    yAxis: [
-        {
-            type: 'value',
-            name: '金额',
-            position: 'right',
-            axisLabel: {
-                formatter: '{value}'
-            }
-        },
-        {
-            type: 'value',
-            name: '数量',
-            position: 'left',
-            axisLabel: {
-                formatter: '{value}'
-            }
-        }
-    ],
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    legend: {
-        data: ['访问量']
-    },
-    itemStyle: {
-        // 点的颜色。
-        color: 'red'
-    },
-    tooltip: {
-        trigger: 'axis'
-    },
-    series: [
-        {
-            name: '访问量',
-            data: [0],
-            type: 'line',
-            smooth: true
-        }
-    ]
-})
-
-// 颜色
-const colorList = ['#5DB1FF', '#4CD384', '#FFC46A', '#CAA5F1']
-// 商品浏览量, 商品访客数, 加购件数, 下单件数, 支付件数, 支付金额, 成本金额, 退款金额, 退款件数, 访客-支付转化率
-const basicList = reactive([
-    {
-        name: '商品浏览量',
-        type: 'browse',
-        icon: 'RectangleCopy21',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '商品访客数',
-        type: 'user',
-        icon: 'RectangleCopy5',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '加购件数',
-        type: 'cart',
-        icon: 'RectangleCopy13',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '下单件数',
-        type: 'order',
-        icon: 'RectangleCopy12',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '支付件数',
-        type: 'pay',
-        icon: 'RectangleCopy15',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '支付金额',
-        type: 'payPrice',
-        icon: 'RectangleCopy14',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '成本金额',
-        type: 'cost',
-        icon: 'RectangleCopy24',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '退款金额',
-        type: 'refundPrice',
-        icon: 'RectangleCopy32',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '退款件数',
-        type: 'refund',
-        icon: 'RectangleCopy19',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '访客-支付转化率',
-        type: 'payPercent',
-        icon: 'RectangleCopy4',
-        num: 0,
-        percent: 0
-    }
-])
-const startEndTime = ref([new Date(), new Date()]);
-const startEndTime2 = ref([]);
-const startEndTime3 = ref([]);
-// 获取数据
-const getData = () => {
-    let date = '';
-    if (startEndTime.value[0] && startEndTime.value[1]) date = moment(startEndTime.value[0]).format('YYYY/MM/DD') + '-' + moment(startEndTime.value[1]).format('YYYY/MM/DD');
-    apiGetBasic({
-        date: date
-    }).then(res => {
-        basicList.forEach((item: any) => {
-            item.num = res[item.type].num;
-            item.percent = res[item.type].percent;
-        })
-    })
-}
-
-const getData2 = () => {
-    let date = '';
-    if (startEndTime2.value[0] && startEndTime2.value[1]) date = moment(startEndTime2.value[0]).format('YYYY/MM/DD') + '-' + moment(startEndTime2.value[1]).format('YYYY/MM/DD');
-    apiGetTrend({
-        date: date
-    }).then(res => {
-        // 清空echarts 数据
-        visitorOption.xAxis.data = []
-        visitorOption.series = []
-
-        visitorOption.legend.data = res.series.map((item: any) => item.name);
-
-        // 写入从后台拿来的数据
-        res.xAxis.forEach((item: any) => {
-            visitorOption.xAxis.data.push(item)
-        })
-        visitorOption.series = res.series.map((item: any) => {
-            return {
-                ...item,
-                yAxis: item.type == 'line' ? 0 : 1
-            }
-        });
-
-    })
-}
-
-const sotreList = ref([]);
-const getList = () => {
-    let date = '';
-    if (startEndTime3.value[0] && startEndTime3.value[1]) date = moment(startEndTime3.value[0]).format('YYYY/MM/DD') + '-' + moment(startEndTime3.value[1]).format('YYYY/MM/DD');
-    apiGetProductRanking({
-        date: date
-    }).then(res => {
-        sotreList.value = res;
-    })
-}
-
-onMounted(() => {
-    getData()
-    getData2()
-    getList()
-})
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/statistics/product/index.vue b/src/views/statistics/product/index.vue
deleted file mode 100644
index 8c0a68a0f..000000000
--- a/src/views/statistics/product/index.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<template>
-    <div class="workbench">
-        <el-card shadow="never" class="!border-none">
-            <div class="mb-6 flex justify-between items-center">
-                <span class="text-2xl">商品概况</span>
-                <div class="flex items-center text-sm">
-                    <span class="mr-4">时间筛选: </span>
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        :shortcuts="shortcuts"
-                        @change="getData"
-                    />
-                    <el-button type="primary" class="ml-4" @click="getData">查询</el-button>
-                </div>
-            </div>
-            <div class="flex flex-wrap">
-                <div
-                    class="w-1/5 flex mb-6"
-                    v-for="(item, index) in basicList"
-                    :key="index"
-                    @click="getData2(item)"
-                >
-                    <div class="mr-2">
-                        <div class="rounded-full p-2">
-                            <el-image style="width: 50px; height: 50px" :src="item.image" />
-
-                            <!-- <iconfont :iconName="item.icon" white className="text-6xl" /> -->
-                        </div>
-                    </div>
-                    <div>
-                        <div class="text-info">{{ item.store_name }}</div>
-                        <div class="">
-                            销量:{{ item.cart_num }}{{ item.unit_name }}|总价:{{ item.total_price }}
-                        </div>
-                        <div class="">规格:{{ item.store_info }}</div>
-                        <!-- <div class="text-info">环比增长: <span :class="item.percent > 0 ? 'text-success' : 'text-danger'">{{
-                            item.percent }}%</span></div> -->
-                    </div>
-                </div>
-            </div>
-            <el-pagination
-                background
-                layout="prev, pager, next"
-                :total="total"
-                @change="changePage"
-                v-if="total > 10"
-                style="margin-right: 56px; margin-bottom: 11px; float: right"
-            />
-        </el-card>
-        <el-card shadow="never" class="mt-4 !border-none">
-            <div class="mb-6 flex justify-between items-center">
-                <span class="text-2xl">商品趋势</span>
-                <span class="text-2xl" style="margin: 0 auto; padding-right: 67px" v-if="title"
-                    >{{ title }} {{ queryParams.start_time }} - {{ queryParams.end_time }}</span
-                >
-                <!-- <div class="flex items-center text-sm">
-                    <span class="mr-4">时间筛选: </span>
-                    <el-date-picker v-model="startEndTime2" type="daterange" range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts" @change="getData2" />
-                    <el-button type="primary" class="ml-4" @click="getData2">查询</el-button>
-                </div> -->
-            </div>
-            <div>
-                <v-charts style="height: 400px" :option="visitorOption" :autoresize="true" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="product">
-import {
-    store_order_cart_info_curve,
-    apiGetProductRanking,
-    product_month_order
-} from '@/api/workbench'
-import moment from 'moment'
-import vCharts from 'vue-echarts'
-
-const shortcuts = [
-    {
-        text: '近一周',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(start.getDate() - 7)
-            return [start, end]
-        }
-    },
-    {
-        text: '本月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(1)
-            end.setMonth(end.getMonth() + 1)
-            end.setDate(0)
-            return [start, end]
-        }
-    },
-    {
-        text: '近一月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 1)
-            return [start, end]
-        }
-    },
-    {
-        text: '近三月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 3)
-            return [start, end]
-        }
-    }
-]
-
-// 表单数据
-const visitorOption: any = reactive({
-    xAxis: {
-        type: 'category',
-        data: [0],
-        axisLabel: {
-            rotate: 45,
-            color: '#333'
-        }
-    },
-    yAxis: [
-        {
-            type: 'value',
-            name: '金额',
-            position: 'right',
-            axisLabel: {
-                formatter: '{value}'
-            }
-        },
-        {
-            type: 'value',
-            name: '数量',
-            position: 'left',
-            axisLabel: {
-                formatter: '{value}'
-            }
-        }
-    ],
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    legend: {
-        data: ['访问量']
-    },
-    itemStyle: {
-        // 点的颜色。
-        color: 'red'
-    },
-    tooltip: {
-        trigger: 'axis'
-    },
-    series: [
-        {
-            name: '访问量',
-            data: [0],
-            type: 'line',
-            smooth: true
-        }
-    ]
-})
-
-// 获取当前日期
-const now = new Date()
-// 获取当前年份
-const year = now.getFullYear()
-// 获取当前月份（注意：月份是从0开始的，所以实际月份需要加1）
-const month = now.getMonth() + 1
-
-// 创建当前月第一天的日期对象
-const firstDay = new Date(year, month - 1, 1)
-// 创建当前月最后一天的日期对象
-const lastDay = new Date(year, month, 0)
-const startEndTime = ref([firstDay, lastDay])
-const basicList = ref([])
-const total = ref(0)
-const title = ref('')
-const queryParams = reactive({
-    product_id: '',
-    start_time: '',
-    end_time: '',
-    page_no: 1,
-    page_size: 10
-})
-
-// 获取数据
-const getData = () => {
-    queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD')
-    queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD')
-    product_month_order(queryParams).then((res) => {
-        basicList.value = res.lists
-        total.value = res.count
-    })
-}
-const changePage = (e) => {
-    queryParams.page_no = e
-    getData()
-}
-
-const getData2 = (item: any) => {
-    queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD')
-    queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD')
-    queryParams.product_id = item.product_id
-    title.value = item.store_name
-
-    store_order_cart_info_curve(queryParams).then((res) => {
-        // 清空echarts 数据
-        visitorOption.xAxis.data = []
-        visitorOption.series = []
-        visitorOption.legend.data = res.series.map((item: any) => item.name)
-        // 写入从后台拿来的数据
-        res.xAxis.forEach((item: any) => {
-            visitorOption.xAxis.data.push(item)
-        })
-        visitorOption.series = res.series.map((item: any) => {
-            return {
-                type: 'line',
-                smooth: true,
-                data: item.value,
-                name: item.name
-            }
-        })
-    })
-}
-
-onMounted(() => {
-    getData()
-})
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/statistics/statistics_user/index.vue b/src/views/statistics/statistics_user/index.vue
deleted file mode 100644
index 6ae49ae15..000000000
--- a/src/views/statistics/statistics_user/index.vue
+++ /dev/null
@@ -1,342 +0,0 @@
-<template>
-    <div class="workbench">
-        <el-card shadow="never" class="!border-none">
-            <div class="mb-6 flex justify-between items-center">
-                <span class="text-2xl">用户概况</span>
-                <div class="flex items-center text-sm">
-                    <div class="flex items-center mr-4">
-                        <!-- <el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入门店id" /> -->
-                        <el-select
-                            v-model="queryParams.store_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="输入门店名称搜索"
-                            remote-show-suffix
-                            :remote-method="remoteMethod"
-                            :loading="storeloading"
-                            style="width: 240px"
-                            @change="getData"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </div>
-                    <span class="mr-4">时间筛选: </span>
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        :shortcuts="shortcuts"
-                        @change="getData"
-                    />
-                    <el-button type="primary" class="ml-4" @click="getData">查询</el-button>
-                </div>
-            </div>
-            <div class="flex flex-wrap">
-                <div class="w-1/5 flex mb-6" v-for="(item, index) in basicList" :key="index">
-                    <div class="mr-2">
-                        <div
-                            class="rounded-full p-2"
-                            :style="{ 'background-color': colorList[index % 8] }"
-                        >
-                            <iconfont :iconName="item.icon" white className="text-6xl" />
-                        </div>
-                    </div>
-                    <div>
-                        <div class="text-info">{{ item.name }}</div>
-                        <div class="text-6xl">{{ item.num }}</div>
-                        <!-- <div class="text-info">环比增长: <span :class="item.percent > 0 ? 'text-success' : 'text-danger'">{{
-                            item.percent }}%</span></div> -->
-                    </div>
-                </div>
-            </div>
-        </el-card>
-        <el-card shadow="never" class="mt-4 !border-none">
-            <div>
-                <div class="mb-6 flex justify-between items-center">
-                    <span class="text-2xl">用户趋势</span>
-                </div>
-                <v-charts style="height: 400px" :option="visitorOption" :autoresize="true" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="statistics_user">
-import { apiGetUserBasic, apiGetUserTrend } from '@/api/workbench'
-import moment from 'moment'
-import vCharts from 'vue-echarts'
-import { apiSystemStoreLists } from '@/api/system_store'
-
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    date: ''
-})
-
-const shortcuts = [
-    {
-        text: '近一周',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(start.getDate() - 7)
-            return [start, end]
-        }
-    },
-    {
-        text: '本月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(1)
-            end.setMonth(end.getMonth() + 1)
-            end.setDate(0)
-            return [start, end]
-        }
-    },
-    {
-        text: '近一月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 1)
-            return [start, end]
-        }
-    },
-    {
-        text: '近三月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 3)
-            return [start, end]
-        }
-    }
-]
-
-// 表单数据
-const visitorOption: any = reactive({
-    xAxis: {
-        type: 'category',
-        data: [0],
-        axisLabel: {
-            rotate: 45,
-            color: '#333'
-        }
-    },
-    yAxis: {
-        type: 'value',
-        name: '数量',
-        position: 'left',
-        axisLabel: {
-            formatter: '{value}'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    legend: {
-        data: ['访问量']
-    },
-    itemStyle: {
-        // 点的颜色。
-        color: 'red'
-    },
-    tooltip: {
-        trigger: 'axis'
-    },
-    series: [
-        {
-            name: '访问量',
-            data: [0],
-            type: 'line',
-            smooth: true
-        }
-    ]
-})
-
-// 颜色
-const colorList = [
-    '#5DB1FF',
-    '#4CD384',
-    '#FFC46A',
-    '#CAA5F1',
-    '#FFC46A',
-    '#4CD384',
-    '#5DB1FF',
-    '#CAA5F1'
-]
-// 商品浏览量, 商品访客数, 加购件数, 下单件数, 支付件数, 支付金额, 成本金额, 退款金额, 退款件数, 访客-支付转化率
-const basicList = reactive([
-    {
-        name: '余额',
-        type: 'now_money',
-        icon: 'RectangleCopy',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '采购款',
-        type: 'purchase_funds',
-        icon: 'RectangleCopy49',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '新增用户数',
-        type: 'newUser',
-        icon: 'RectangleCopy53',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '成交用户数',
-        type: 'payPeople',
-        icon: 'RectangleCopy5',
-        num: 0,
-        percent: 0
-    },
-    // {
-    //     name: '访客-支付转换率',
-    //     type: 'payPercent',
-    //     icon: 'RectangleCopy4',
-    //     num: 0,
-    //     percent: 0
-    // },
-    // {
-    //     name: '激活付费会员数',
-    //     type: 'payUser',
-    //     icon: 'RectangleCopy7',
-    //     num: 0,
-    //     percent: 0
-    // },
-
-    // {
-    //     name: '客单价',
-    //     type: 'payPrice',
-    //     icon: 'RectangleCopy15',
-    //     num: 0,
-    //     percent: 0
-    // },
-
-    // {
-    //     name: '累计付费会员数',
-    //     type: 'cumulativePayUser',
-    //     icon: 'RectangleCopy7',
-    //     num: 0,
-    //     percent: 0
-    // },
-    {
-        name: '会员数',
-        type: 'rechargePeople',
-        icon: 'RectangleCopy59',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '累计会员数',
-        type: 'cumulativeRechargePeople',
-        icon: 'RectangleCopy6',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '累计成交用户数',
-        type: 'cumulativePayPeople',
-        icon: 'RectangleCopy9',
-        num: 0,
-        percent: 0
-    },
-    {
-        name: '累计用户',
-        type: 'cumulativeUser',
-        icon: 'RectangleCopy54',
-        num: 0,
-        percent: 0
-    }
-])
-// 获取当前日期
-const now = new Date()
-// 获取当前年份
-const year = now.getFullYear()
-// 获取当前月份（注意：月份是从0开始的，所以实际月份需要加1）
-const month = now.getMonth() + 1
-
-// 创建当前月第一天的日期对象
-const firstDay = new Date(year, month - 1, 1)
-// 创建当前月最后一天的日期对象
-const lastDay = new Date(year, month, 0)
-const startEndTime = ref([firstDay, lastDay])
-// 获取数据
-const getData = () => {
-    let date = ''
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        date =
-            moment(startEndTime.value[0]).format('YYYY/MM/DD') +
-            '-' +
-            moment(startEndTime.value[1]).format('YYYY/MM/DD')
-    }
-    queryParams.date = date
-    apiGetUserBasic(queryParams).then((res) => {
-        basicList.forEach((item: any) => {
-            item.num = res[item.type].num
-            item.percent = res[item.type].percent
-        })
-    })
-    apiGetUserTrend(queryParams).then((res) => {
-        // 清空echarts 数据
-        visitorOption.xAxis.data = []
-        visitorOption.series = []
-
-        visitorOption.legend.data = res.series.map((item: any) => item.name)
-
-        // 写入从后台拿来的数据
-        visitorOption.xAxis.data = res.xAxis
-        visitorOption.series = res.series.map((item: any) => {
-            return {
-                type: 'line',
-                smooth: true,
-                data: item.value,
-                name: item.name
-            }
-        })
-    })
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-onMounted(() => {
-    getData()
-})
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/statistics/stock/details.vue b/src/views/statistics/stock/details.vue
deleted file mode 100644
index 409b3c725..000000000
--- a/src/views/statistics/stock/details.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="商品详情" :size="1000" v-model="isOpen">
-            <div>
-                <div>
-                    <el-table :data="pager.lists">
-                        <el-table-column label="订单id" prop="oid" show-overflow-tooltip />
-                        <el-table-column label="商品图片" prop="image" min-width="80">
-                            <template #default="{ row }">
-                                <el-image
-                                    style="width: 50px; height: 50px"
-                                    :src="row.image"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-                        <el-table-column label="数量" prop="cart_num" show-overflow-tooltip />
-                        <el-table-column label="单价" prop="price" show-overflow-tooltip />
-                        <el-table-column label="总价" prop="total_price" show-overflow-tooltip />
-                        <el-table-column
-                            label="购买时间"
-                            prop="create_time"
-                            show-overflow-tooltip
-                        />
-                    </el-table>
-                </div>
-                <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                    <pagination v-model="pager" @change="getLists" />
-                </div>
-            </div>
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { apiStoreOrderCartInfo } from '@/api/store_order'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const isOpen = ref(false)
-
-const getDetail = async (row: Record<string, any>) => {
-    queryParams.product_id = row.id
-
-    getLists()
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-}
-
-// 查询条件
-const queryParams = reactive({
-    product_id: '',
-    is_pay: 1
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderCartInfo,
-    params: queryParams
-})
-
-defineExpose({
-    open,
-    getDetail
-})
-</script>
diff --git a/src/views/statistics/stock/index.vue b/src/views/statistics/stock/index.vue
deleted file mode 100644
index e5df07d48..000000000
--- a/src/views/statistics/stock/index.vue
+++ /dev/null
@@ -1,462 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        @keydown.enter="resetPage"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item label="商品条码" prop="bar_code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.bar_code"
-                        clearable
-                        placeholder="请输入商品条码"
-                    />
-                </el-form-item>
-                <el-form-item label="商品分类" prop="store_name">
-                    <el-cascader
-                        class="w-[280px]"
-                        v-model="queryParams.class_all"
-                        filterable
-                        clearable
-                        :before-filter="beforeFilter"
-                        :props="props"
-                        placeholder="请选择商品分类"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item label="排序" prop="order_by">
-                    <el-select
-                        v-model="queryParams.order_by"
-                        placeholder="请选择排序"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in [
-                                { id: 'asc', name: '升序' },
-                                { id: 'desc', name: '降序' }
-                            ]"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <el-button type="primary" @click="stockProductPrice">重新统计数据</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiStoreProductLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none mb-4" shadow="never">
-            <div class="flex flex-wrap">
-                <div
-                    class="w-1/5 flex mb-6"
-                    v-for="(item, index) in visitorOption.series"
-                    :key="index"
-                >
-                    <div class="mr-2">
-                        <div
-                            class="rounded-full p-2"
-                            :style="{ 'background-color': colorList[index % 4] }"
-                        >
-                            <iconfont :iconName="iconList[index]" white className="text-6xl" />
-                        </div>
-                    </div>
-                    <div>
-                        <div class="text-info">
-                            {{ item.name }}
-                            <el-tooltip
-                                class="box-item"
-                                effect="dark"
-                                :content="item.desc"
-                                placement="top-start"
-                            >
-                                <el-icon>
-                                    <Warning />
-                                </el-icon>
-                            </el-tooltip>
-                        </div>
-                        <div v-if="item.total_money != ''">
-                            <span class="text-2xl mr-2">库存:{{ item.total_value }}</span>
-
-                            <span class="text-2xl mr-2">金额:{{ item.total_money }}</span>
-                        </div>
-                        <div v-else>
-                            <span class="text-6xl mr-2">{{ item.total_value }}</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="商品名称"
-                        prop="store_name"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <!-- <el-table-column
-                        label="分类"
-                        prop="cate_name"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="单位"
-                        prop="unit_name"
-                        min-width="80"
-                        show-overflow-tooltip
-                    /> -->
-                    <el-table-column
-                        label="销量"
-                        prop="sales"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleDetai(row)">{{
-                                row.sales || 0
-                            }}</el-button>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="门店库存"
-                        prop="store_stock"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleStockDetai(row, 1)">{{
-                                row.store_stock || 0
-                            }}</el-button>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="仓库库存"
-                        prop="warehouse_stock"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleStockDetai(row, 0)">{{
-                                row.warehouse_stock || 0
-                            }}</el-button>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="库存"
-                        prop="total_stock"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                    </el-table-column>
-                    <el-table-column
-                        label="价值"
-                        prop="total_price"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                    </el-table-column>
-                    <el-table-column
-                        label="采购总价"
-                        prop="total_purchase"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleWarehouseProduct(row, 1)"
-                                >{{ row.total_purchase || 0 }}</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="已结"
-                        prop="total_completed_amount"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleWarehouseProduct(row, 2)"
-                                >{{ row.total_completed_amount || 0 }}</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="未结"
-                        prop="total_outstanding_amount"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleWarehouseProduct(row, 3)"
-                                >{{ row.total_outstanding_amount || 0 }}</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <Details ref="detailsRef"></Details>
-        <stockDetails ref="stockDetailsRef"></stockDetails>
-        <warehouseProduct ref="warehouseProductRef"></warehouseProduct>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreProductLists, apiStoreProductDelete } from '@/api/store_product'
-import { total_warehouse, warehouse_list, stock_product_price } from '@/api/workbench'
-import Details from './details.vue'
-import stockDetails from './stockDetails.vue'
-import warehouseProduct from './warehouseProduct.vue'
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { useRoute } from 'vue-router'
-const showDetails = ref(false)
-const showStockDetails = ref(false)
-const showWarehouseProduct = ref(false)
-const route = useRoute()
-
-const detailsRef = ref(null)
-const stockDetailsRef = ref(null)
-const warehouseProductRef = ref(null)
-// 查询条件
-const queryParams = reactive({
-    store_name: '',
-    class_all: '',
-    bar_code: '',
-    field: 'stock',
-    order_by: ''
-})
-const stockProductPrice = () => {
-    stock_product_price({}).then((res) => {})
-}
-// 销量详情
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-// 库存详情
-const handleStockDetai = async (data: any, type = 1) => {
-    showStockDetails.value = true
-    await nextTick()
-    stockDetailsRef.value?.open()
-    stockDetailsRef.value?.getDetail(data, type)
-}
-// 商品出入库详情
-const handleWarehouseProduct = async (data: any, type = 1) => {
-    showWarehouseProduct.value = true
-    await nextTick()
-    warehouseProductRef.value?.open()
-    warehouseProductRef.value?.getDetail(data, type)
-}
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-// 获取字典数据
-const { dictData } = useDictData('')
-// 分页相关
-let page_no = 1
-if (route.query.page_no) {
-    page_no = parseInt(route.query.page_no)
-}
-
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    page: page_no,
-    fetchFun: warehouse_list,
-    params: queryParams
-})
-let resolves
-let nodes
-const flag = ref(false)
-let name
-const beforeFilter = (value) => {
-    name = value
-    flag.value = true
-    props.lazyLoad(nodes, resolves)
-    return false
-}
-const props = {
-    value: 'id',
-    label: 'name',
-    emitPath: false,
-    lazy: true,
-    lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve
-        if (!nodes) nodes = node
-        const pid = node.value || 0
-        let data = {}
-        if (flag.value) {
-            data = { name: name }
-            if (!name) {
-                data = {
-                    pid: pid,
-                    page_size: 10000
-                }
-            }
-        } else {
-            data = {
-                pid: pid,
-                page_size: 10000
-            }
-        }
-        apiStoreCategoryLists({
-            ...data
-        }).then((res) => {
-            resolve(
-                res.lists.map((item: any) => {
-                    // item.leaf = item.is_children == 0;
-                    item.leaf = true
-                    flag.value = false
-                    return item
-                })
-            )
-        })
-    }
-}
-// 颜色
-const colorList = [
-    '#5DB1FF',
-    '#4CD384',
-    '#FFC46A',
-    '#CAA5F1',
-    '#FFC46A',
-    '#4CD384',
-    '#5DB1FF',
-    '#CAA5F1'
-]
-// 商品浏览量, 商品访客数, 加购件数, 下单件数, 支付件数, 支付金额, 成本金额, 退款金额, 退款件数, 访客-支付转化率
-const iconList = ref([
-    'RectangleCopy58',
-    'RectangleCopy48',
-    'RectangleCopy65',
-    'RectangleCopy62',
-    'RectangleCopy56',
-    'RectangleCopy55',
-    'RectangleCopy57',
-    'RectangleCopy65',
-    'RectangleCopy61',
-    'RectangleCopy52',
-    'RectangleCopy14',
-    'RectangleCopy32'
-])
-// 表单数据
-const visitorOption: any = reactive({
-    xAxis: {
-        type: 'category',
-        data: [0],
-        axisLabel: {
-            rotate: 45,
-            color: '#333'
-        }
-    },
-    yAxis: {
-        type: 'value',
-        name: '金额',
-        position: 'left',
-        axisLabel: {
-            formatter: '{value}'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    legend: {
-        data: ['访问量']
-    },
-    itemStyle: {
-        // 点的颜色。
-        color: 'red'
-    },
-    tooltip: {
-        trigger: 'axis'
-    },
-    series: [
-        {
-            name: '访问量',
-            data: [0],
-            type: 'line',
-            smooth: true
-        }
-    ]
-})
-const totalWarehouse = () => {
-    total_warehouse({}).then((res) => {
-        // 清空echarts 数据
-        visitorOption.xAxis.data = []
-        visitorOption.series = []
-        console.log(res)
-
-        visitorOption.legend.data = Object.values(res.series).map((item: any) => item.name)
-
-        // 写入从后台拿来的数据
-        visitorOption.xAxis.data = res.x
-        visitorOption.series = Object.values(res.series).map((item: any) => {
-            return {
-                type: 'line',
-                smooth: true,
-                data: item.value,
-                name: item.name,
-                total_value: item.total_value,
-                rate: item.rate,
-                desc: item.desc,
-                total_money: item.total_money
-            }
-        })
-    })
-}
-
-onMounted(() => {
-    getLists()
-    totalWarehouse()
-})
-</script>
diff --git a/src/views/statistics/stock/stockDetails.vue b/src/views/statistics/stock/stockDetails.vue
deleted file mode 100644
index 30916d1cd..000000000
--- a/src/views/statistics/stock/stockDetails.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="库存详情" :size="1000" v-model="isOpen">
-            <div>
-                <div>
-                    <el-table :data="pager.lists">
-                        <el-table-column label="id" prop="id" show-overflow-tooltip />
-                        <el-table-column label="商品图片" prop="image" min-width="80">
-                            <template #default="{ row }">
-                                <el-image
-                                    style="width: 50px; height: 50px"
-                                    :src="row.image"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-                        <template v-if="stock_type == 1">
-                            <el-table-column
-                                label="门店"
-                                prop="system_store"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column label="销量" prop="sales" show-overflow-tooltip />
-                            <el-table-column label="库存" prop="stock" show-overflow-tooltip />
-                            <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                            <el-table-column label="商户" prop="cost" show-overflow-tooltip />
-                            <el-table-column label="零售" prop="price" show-overflow-tooltip />
-                        </template>
-                        <template v-if="stock_type == 0">
-                            <el-table-column
-                                label="仓库"
-                                prop="warehouse_name"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column label="库存" prop="nums" show-overflow-tooltip />
-                            <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                        </template>
-                        <el-table-column label="价值" prop="total_price" show-overflow-tooltip />
-                    </el-table>
-                </div>
-                <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                    <pagination v-model="pager" @change="getLists" />
-                </div>
-            </div>
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { total_warehouse_list } from '@/api/workbench'
-import type { PropType } from 'vue'
-
-const emit = defineEmits(['success', 'close'])
-const isOpen = ref(false)
-const stock_type = ref(1)
-// 查询条件
-const queryParams = reactive({
-    product_id: '',
-    type: 1
-})
-const getDetail = async (row: Record<string, any>, type: number) => {
-    queryParams.product_id = row.id
-    queryParams.type = type
-    stock_type.value = type
-
-    getLists()
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-}
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: total_warehouse_list,
-    params: queryParams
-})
-
-defineExpose({
-    open,
-    getDetail
-})
-</script>
diff --git a/src/views/statistics/stock/warehouseProduct.vue b/src/views/statistics/stock/warehouseProduct.vue
deleted file mode 100644
index 295b8b34d..000000000
--- a/src/views/statistics/stock/warehouseProduct.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="结算详情" :size="1000" v-model="isOpen">
-            <div>
-                <div>
-                    <el-table :data="pager.lists">
-                        <el-table-column label="id" prop="id" show-overflow-tooltip />
-                        <el-table-column label="商品图片" prop="image" min-width="80">
-                            <template #default="{ row }">
-                                <el-image
-                                    style="width: 50px; height: 50px"
-                                    :src="row.image"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-                        <el-table-column label="仓库" prop="warehouse_name" show-overflow-tooltip />
-                        <el-table-column
-                            label="供应商"
-                            prop="supplier_name"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                        <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                        <el-table-column label="价值" prop="total_price" show-overflow-tooltip />
-                    </el-table>
-                </div>
-                <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                    <pagination v-model="pager" @change="getLists" />
-                </div>
-            </div>
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { total_warehouse_product_list } from '@/api/workbench'
-import type { PropType } from 'vue'
-
-const emit = defineEmits(['success', 'close'])
-const isOpen = ref(false)
-const stock_type = ref(1)
-// 查询条件
-const queryParams = reactive({
-    product_id: '',
-    type: 1
-})
-const getDetail = async (row: Record<string, any>, type: number) => {
-    queryParams.product_id = row.id
-    queryParams.type = type
-    stock_type.value = type
-
-    getLists()
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-}
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: total_warehouse_product_list,
-    params: queryParams
-})
-
-defineExpose({
-    open,
-    getDetail
-})
-</script>
diff --git a/src/views/statistics/transaction/index.vue b/src/views/statistics/transaction/index.vue
deleted file mode 100644
index b40814fba..000000000
--- a/src/views/statistics/transaction/index.vue
+++ /dev/null
@@ -1,470 +0,0 @@
-<template>
-    <div class="workbench">
-        <el-card shadow="never" class="!border-none">
-            <div class="flex">
-                <div class="flex-1 h-[270px]">
-                    <div class="text-2xl">今日订单金额</div>
-                    <div>
-                        <span class="text-[12px]">¥</span>
-                        <span class="text-2xl">{{ leftInfo.money || '0.00' }}</span>
-                    </div>
-                    <v-charts
-                        style="height: 200px"
-                        :option="leftOption"
-                        :autoresize="true"
-                    ></v-charts>
-                </div>
-                <div class="w-[1px] bg-[#ccc] mr-4"></div>
-                <div class="flex-1 flex">
-                    <div class="flex-1">
-                        <div class="text-1xl">
-                            {{ rightInfo1[0]?.name
-                            }}<span class="ml-2 text-[18px]">{{ rightInfo1[0]?.now_money }}</span>
-                        </div>
-                        <div class="text-[12px]">
-                            <span class="text-info">昨日: {{ rightInfo1[0]?.last_money }}</span>
-                            <span class="text-info ml-2">日环比: </span>
-                            <span class="text-success">{{ rightInfo1[0]?.rate }}%</span>
-                        </div>
-                        <v-charts
-                            style="height: 160px; margin-bottom: 20px"
-                            :option="rightOption1"
-                            :autoresize="true"
-                        ></v-charts>
-                        <div class="text-1xl">
-                            {{ rightInfo2[0]?.name
-                            }}<span class="ml-2 text-[18px]">{{ rightInfo2[0]?.now_money }}</span>
-                        </div>
-                        <div class="text-[12px]">
-                            <span class="text-info">上月: {{ rightInfo2[0]?.last_money }}</span>
-                            <span class="text-info ml-2">月环比: </span>
-                            <span class="text-success">{{ rightInfo2[0]?.rate }}%</span>
-                        </div>
-                    </div>
-                    <div class="flex-1">
-                        <div class="text-1xl">
-                            {{ rightInfo1[1]?.name
-                            }}<span class="ml-2 text-[18px]">{{ rightInfo1[1]?.now_money }}</span>
-                        </div>
-                        <div class="text-[12px]">
-                            <span class="text-info">昨日: {{ rightInfo1[1]?.last_money }}</span>
-                            <span class="text-info ml-2">日环比: </span>
-                            <span class="text-success">{{ rightInfo1[1]?.rate }}%</span>
-                        </div>
-                        <v-charts
-                            style="height: 160px; margin-bottom: 20px"
-                            :option="rightOption2"
-                            :autoresize="true"
-                        ></v-charts>
-                        <div class="text-1xl">
-                            {{ rightInfo2[1]?.name
-                            }}<span class="ml-2 text-[18px]">{{ rightInfo2[1]?.now_money }}</span>
-                        </div>
-                        <div class="text-[12px]">
-                            <span class="text-info">上月: {{ rightInfo2[1]?.last_money }}</span>
-                            <span class="text-info ml-2">月环比: </span>
-                            <span class="text-success">{{ rightInfo2[1]?.rate }}%</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </el-card>
-        <el-card shadow="never" class="mt-4 !border-none">
-            <div class="mb-6 flex justify-between items-center">
-                <span class="text-2xl">交易概况</span>
-                <div class="flex items-center text-sm">
-                    <span class="mr-4">时间筛选: </span>
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        :shortcuts="shortcuts"
-                        @change="getData"
-                    />
-                    <el-button type="primary" class="ml-4" @click="getData">查询</el-button>
-                </div>
-            </div>
-            <div class="flex flex-wrap">
-                <div
-                    class="w-1/5 flex mb-6"
-                    v-for="(item, index) in visitorOption.series"
-                    :key="index"
-                >
-                    <div class="mr-2">
-                        <div
-                            class="rounded-full p-2"
-                            :style="{ 'background-color': colorList[index % 4] }"
-                        >
-                            <iconfont :iconName="iconList[index]" white className="text-6xl" />
-                        </div>
-                    </div>
-                    <div>
-                        <div class="text-info">
-                            {{ item.name }}
-                            <el-tooltip
-                                class="box-item"
-                                effect="dark"
-                                :content="item.desc"
-                                placement="top-start"
-                            >
-                                <el-icon><Warning /></el-icon>
-                            </el-tooltip>
-                        </div>
-                        <div>
-                            <span class="text-6xl mr-2">{{ item.money }}</span
-                            ><span v-if="item.money > 0">{{ item.cash_title }}</span>
-                        </div>
-
-                        <div class="text-info">
-                            环比增长:
-                            <span :class="item.rate > 0 ? 'text-success' : 'text-danger'"
-                                >{{ item.rate }}%</span
-                            >
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div>
-                <v-charts style="height: 400px" :option="visitorOption" :autoresize="true" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="statistics_user">
-import {
-    apiGetUserBasic,
-    apiGetUserTrend,
-    apiGetBottomTrade,
-    apiGetTopTrade
-} from '@/api/workbench'
-import moment from 'moment'
-import vCharts from 'vue-echarts'
-
-const shortcuts = [
-    {
-        text: '近一周',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(start.getDate() - 7)
-            return [start, end]
-        }
-    },
-    {
-        text: '本月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(1)
-            end.setMonth(end.getMonth() + 1)
-            end.setDate(0)
-            return [start, end]
-        }
-    },
-    {
-        text: '近一月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 1)
-            return [start, end]
-        }
-    },
-    {
-        text: '近三月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 3)
-            return [start, end]
-        }
-    }
-]
-
-// 表单数据
-const visitorOption: any = reactive({
-    xAxis: {
-        type: 'category',
-        data: [0],
-        axisLabel: {
-            rotate: 45,
-            color: '#333'
-        }
-    },
-    yAxis: {
-        type: 'value',
-        name: '金额',
-        position: 'left',
-        axisLabel: {
-            formatter: '{value}'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    legend: {
-        data: ['访问量']
-    },
-    itemStyle: {
-        // 点的颜色。
-        color: 'red'
-    },
-    tooltip: {
-        trigger: 'axis'
-    },
-    series: [
-        {
-            name: '访问量',
-            data: [0],
-            type: 'line',
-            smooth: true
-        }
-    ]
-})
-// 左表
-const optionModel = {
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'cross'
-        },
-        formatter: (params) => {
-            let str = `<p><b>${params[0].name}点</b></p>`
-            params.forEach((item) => {
-                str += `<p><span style="display:inline-block;width:8px;height:4px;background-color:${item.color};"></span> ${item.seriesName}: <strong>${item.value}</strong></p>`
-            })
-            return str
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    legend: {
-        data: ['昨天', '今天'],
-        left: '3%',
-        top: '3%'
-    },
-    xAxis: [
-        {
-            type: 'category',
-            boundaryGap: false,
-            // data: ['03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '00', '01', '02'],
-            axisLabel: {
-                show: false // 不显示 x 轴标签
-            },
-            axisTick: {
-                show: false // 不显示 x 轴刻度线
-            },
-            axisLine: {
-                show: false // 不显示 x 轴线
-            },
-            grid: {
-                show: false
-            }
-        }
-    ],
-    yAxis: [
-        {
-            type: 'value',
-            show: false,
-            spliteLine: {
-                show: false
-            },
-            axisLabel: {
-                show: false // 不显示 x 轴标签
-            },
-            axisTick: {
-                show: false // 不显示 x 轴刻度线
-            },
-            axisLine: {
-                show: false // 不显示 x 轴线
-            },
-            grid: {
-                show: false
-            }
-        }
-    ],
-    series: [
-        {
-            name: '昨天',
-            type: 'line',
-            // data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0],
-            smooth: true,
-            symbol: 'none', // 不显示数据点
-            itemStyle: {
-                color: '#ccc'
-            },
-            areaStyle: {
-                color: {
-                    //线性渐变
-                    type: 'linear',
-                    x: 0,
-                    y: 0,
-                    x2: 0,
-                    y2: 1,
-                    colorStops: [
-                        {
-                            offset: 0,
-                            color: '#ccc' // 0% 处的颜色
-                        },
-                        {
-                            offset: 0.6,
-                            color: '#fff' // 100% 处的颜色
-                        }
-                    ],
-                    global: false // 缺省为 false
-                }
-            }
-        },
-        {
-            name: '今天',
-            type: 'line',
-            // data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            smooth: true,
-            symbol: 'none', // 不显示数据点
-            areaStyle: {
-                color: {
-                    //线性渐变
-                    type: 'linear',
-                    x: 0,
-                    y: 0,
-                    x2: 0,
-                    y2: 1,
-                    colorStops: [
-                        {
-                            offset: 0,
-                            color: '#5B8FF9' // 0% 处的颜色
-                        },
-                        {
-                            offset: 0.6,
-                            color: '#fff' // 100% 处的颜色
-                        }
-                    ],
-                    global: false // 缺省为 false
-                }
-            }
-        }
-    ]
-}
-const leftInfo = ref({
-    money: 0,
-    series: []
-})
-const leftOption: any = reactive(JSON.parse(JSON.stringify(optionModel)))
-
-const rightInfo1 = ref([])
-const rightOption1: any = reactive(JSON.parse(JSON.stringify(optionModel)))
-const rightInfo2 = ref([])
-const rightOption2: any = reactive(JSON.parse(JSON.stringify(optionModel)))
-
-// 颜色
-const colorList = [
-    '#5DB1FF',
-    '#4CD384',
-    '#FFC46A',
-    '#CAA5F1',
-    '#FFC46A',
-    '#4CD384',
-    '#5DB1FF',
-    '#CAA5F1'
-]
-// 商品浏览量, 商品访客数, 加购件数, 下单件数, 支付件数, 支付金额, 成本金额, 退款金额, 退款件数, 访客-支付转化率
-const iconList = ref([
-    'RectangleCopy58',
-    'RectangleCopy48',
-    'RectangleCopy65',
-    'RectangleCopy62',
-    'RectangleCopy56',
-    'RectangleCopy55',
-    'RectangleCopy57',
-    'RectangleCopy65',
-    'RectangleCopy61',
-    'RectangleCopy52',
-    'RectangleCopy14',
-    'RectangleCopy32'
-])
-
-const startEndTime = ref([new Date(), new Date()])
-// 获取数据
-const getData = () => {
-    let date = ''
-    if (startEndTime.value[0] && startEndTime.value[1])
-        date =
-            moment(startEndTime.value[0]).format('YYYY/MM/DD') +
-            '-' +
-            moment(startEndTime.value[1]).format('YYYY/MM/DD')
-
-    apiGetTopTrade({}).then((res) => {
-        leftInfo.value = {
-            money: res.left.series[0].money,
-            name: res.left.name
-        }
-        leftOption.series[0].data = res.left.series[1].value
-        leftOption.series[1].data = res.left.series[0].value
-
-        rightInfo1.value = res.right.today.series
-        rightInfo2.value = res.right.month
-
-        rightOption1.xAxis.data = res.right.today.x.map((item: any) => item)
-        rightOption1.series[0].name = res.right.today.series[0].name
-        rightOption1.series[0].data = res.right.today.series[0].value
-        rightOption1.series[1].name = res.right.today.series[1].name
-        rightOption1.series[1].data = res.right.today.series[1].value
-
-        rightOption2.xAxis.data = Object.keys(res.right.month[0].value).map((item: any) => item)
-        rightOption2.series[0].name = res.right.month[0].name
-        rightOption2.series[0].data = Object.values(res.right.month[0].value).map(
-            (item: any) => item
-        )
-        rightOption2.series[1].name = res.right.month[1].name
-        rightOption2.series[1].data = Object.values(res.right.month[1].value).map(
-            (item: any) => item
-        )
-    })
-    apiGetBottomTrade({
-        date: date
-    }).then((res) => {
-        // 清空echarts 数据
-        visitorOption.xAxis.data = []
-        visitorOption.series = []
-        console.log(res)
-
-        visitorOption.legend.data = Object.values(res.series).map((item: any) => item.name)
-
-        // 写入从后台拿来的数据
-        visitorOption.xAxis.data = res.x
-        visitorOption.series = Object.values(res.series).map((item: any) => {
-            return {
-                type: 'line',
-                smooth: true,
-                data: item.value,
-                name: item.name,
-                money: item.money,
-                rate: item.rate,
-                desc: item.desc,
-                cash_title: item.cash_title
-            }
-        })
-    })
-}
-
-onMounted(() => {
-    getData()
-})
-</script>
-
-<style lang="scss" scoped>
-.workbench {
-    color: #444;
-}
-</style>
diff --git a/src/views/store/statistics/index.vue b/src/views/store/statistics/index.vue
deleted file mode 100644
index 05df97d1b..000000000
--- a/src/views/store/statistics/index.vue
+++ /dev/null
@@ -1,381 +0,0 @@
-<template>
-    <div class="workbench">
-        <el-card shadow="never" class=" !border-none">
-            <div class="flex justify-between items-center">
-                <div class="flex items-center">
-                    <span class="text-2xl mr-4">运营概况</span>
-                    <el-select v-model="store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
-                        remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px"
-                        @change="getData">
-                        <el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                    <span class="ml-4 text-info text-[12px]">点击左侧切换门店</span>
-                </div>
-                <div class="flex items-center text-sm">
-                    <span class="mr-4">时间筛选: </span>
-                    <el-date-picker v-model="startEndTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts" @change="getData" />
-                    <el-button type="primary" class="ml-4" @click="getData">查询</el-button>
-                    <el-button type="primary" class="ml-4" @click="clearData">重置</el-button>
-                </div>
-            </div>
-        </el-card>
-        <div class="flex flex-wrap box-border mt-4">
-            <div class="box-border w-1/5" v-for="(item, index) in basicList" :key="index">
-                <el-card class="!border-none ml-4 mb-4 flex" :class="{ '!ml-0': index % 5 === 0 }" shadow="never">
-                    <div class="flex">
-                        <div class="mr-2">
-                            <div class="rounded-full p-2" :style="{ 'background-color': colorList[index % 8] }">
-                                <iconfont :iconName="item.icon" white className="text-6xl" />
-                            </div>
-                        </div>
-                        <div>
-                            <div class="text-info">{{ item.name }}</div>
-                            <div class="text-6xl">{{ item.num }}</div>
-                        </div>
-                    </div>
-
-                </el-card>
-            </div>
-
-        </div>
-        <el-card shadow="never" class=" !border-none">
-            <span class="text-2xl">营业趋势</span>
-            <v-charts style="height: 400px" :option="visitorOption" :autoresize="true" />
-        </el-card>
-        <div class="mt-4 flex justify-center">
-            <el-card shadow="never" class="flex-1 !border-none">
-                <span class="text-2xl">交易数据</span>
-                <el-table :data="formData.order_list" height="500px">
-                    <el-table-column label="头像" prop="build_area_text" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-avatar style="width: 50px; height: 50px" :src="row.avatar" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="用户名称" prop="nickname" show-overflow-tooltip />
-                    <el-table-column label="订单号" prop="order_id" show-overflow-tooltip />
-                    <el-table-column label="交易金额" prop="pay_price" show-overflow-tooltip />
-                    <el-table-column label="成交时间" prop="pay_time" show-overflow-tooltip />
-                </el-table>
-            </el-card>
-            <el-card shadow="never" class="w-[500px] !border-none ml-4">
-                <span class="text-2xl">交易类型</span>
-                <v-charts style="height:500px" :option="tradTypeOption" :autoresize="true" />
-            </el-card>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="statistics_store">
-import { apiGetUserBasic, apiGetUserTrend } from '@/api/workbench'
-import { apiSystemStoreStatisticsHeader, apiSystemStoreStatisticsOperate, apiSystemStoreStatisticsOrderChart, apiSystemStoreStatisticsStore, apiWorkbenchStoreIndex } from '@/api/system_store'
-import moment from 'moment'
-import vCharts from 'vue-echarts'
-import { apiSystemStoreLists } from '@/api/system_store'
-
-const shortcuts = [
-    {
-        text: '近一周',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(start.getDate() - 7)
-            return [start, end]
-        },
-    },
-    {
-        text: '本月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setDate(1)
-            end.setMonth(end.getMonth() + 1)
-            end.setDate(0)
-            return [start, end]
-        },
-    },
-    {
-        text: '近一月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 1)
-            return [start, end]
-        },
-    },
-    {
-        text: '近三月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setMonth(start.getMonth() - 3)
-            return [start, end]
-        },
-    },
-]
-
-// 表单数据
-const visitorOption: any = reactive({
-    xAxis: {
-        type: 'category',
-        data: [0],
-        axisLabel: {
-            rotate: 45,
-            color: '#333'
-        }
-    },
-    yAxis: [
-        {
-            type: 'value',
-            name: '用户数量',
-            position: 'left',
-            axisLabel: {
-                formatter: '{value}'
-            }
-        },
-        {
-            type: 'value',
-            name: '金额',
-            position: 'right',
-            axisLabel: {
-                formatter: '{value}'
-            }
-        },
-    ],
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    legend: {
-        data: ['访问量']
-    },
-    itemStyle: {
-        // 点的颜色。
-        color: 'red'
-    },
-    tooltip: {
-        trigger: 'axis'
-    },
-    series: [
-        {
-            data: [],
-            type: 'line',
-            smooth: true,
-            name: "门店收款"
-        },
-        {
-            data: [],
-            type: 'line',
-            smooth: true,
-            name: '新增用户'
-        }
-    ]
-})
-const circleOption: any = reactive({
-    tooltip: {
-        formatter: "{a} <br/>{b}: {c} ({d}%)"
-    },
-    legend: {
-        data: []
-    },
-    series: [
-        {
-            name: "交易类型",
-            type: "pie",
-            radius: ["35%", "65%"],
-            center: ["50%", "60%"],
-            data: [],
-            emphasis: {
-                itemStyle: {
-                    shadowBlur: 10,
-                    shadowOffsetX: 0,
-                    shadowColor: "rgba(0, 0, 0, 0.5)"
-                }
-            }
-        }
-    ],
-
-})
-
-// 颜色
-const colorList = ['#5DB1FF', '#4CD384', '#FFC46A', '#CAA5F1', '#FFC46A', '#4CD384', '#5DB1FF', '#CAA5F1']
-const basicList = reactive([
-    {
-        name: '门店营业额',
-        type: 'order_amount',
-        icon: 'RectangleCopy49',
-        num: 0,
-
-    }, 
-    
-    {
-        name: '微信条码收款金额',
-        type: 'wechat_code_amount',
-        icon: 'RectangleCopy55',
-        num: 0,
-    },
-    {
-        name: '支付宝条码收款金额',
-        type: 'alipay_code_amount',
-        icon: 'RectangleCopy52',
-        num: 0,
-    },
-    {
-        name: '线下收银订单金额',
-        type: 'cashier_amount',
-        icon: 'RectangleCopy4',
-        num: 0,
-
-    },
-    {
-        name: '现金收银订单金额',
-        type: 'cash_amount',
-        icon: 'RectangleCopy7',
-        num: 0,
-
-    },
-    {
-        name: '余额消费金额',
-        type: 'balance_amount',
-        icon: 'RectangleCopy59',
-        num: 0,
-
-    },
-    {
-        name: '门店收款金额',
-        type: 'receipt_amount',
-        icon: 'RectangleCopy',
-        num: 0,
-
-    },
-    {
-        name: '门店收益金额',
-        type: 'income_amount',
-        icon: 'RectangleCopy53',
-        num: 0,
-
-    },
-    {
-        name: '核销订单金额',
-        type: 'verify_amount',
-        icon: 'RectangleCopy5',
-        num: 0,
-
-    },
-    {
-        name: '门店成交用户数',
-        type: 'user_number',
-        icon: 'RectangleCopy54',
-        num: 0,
-
-    },
-    {
-        name: '保证金',
-        type: 'deposit_amount',
-        icon: 'RectangleCopy32',
-        num: 0,
-    },
-    {
-        name: '可用消耗资金',
-        type: 'attrition_amount',
-        icon: 'RectangleCopy61',
-        num: 0,
-    },
-])
-const startEndTime = ref([new Date(), new Date()]);
-const store_id = ref('');
-const formData = ref({});
-const tradTypeOption = reactive(
-    {
-        tooltip: {
-            trigger: 'item'
-        },
-        legend: {
-            orient: 'vertical',
-            left: 'left'
-        },
-        series: [
-            {
-                type: 'pie',
-                radius: '50%',
-                data: [
-                    { value: 1048, name: '线上收银订单' },
-                    { value: 735, name: '现金收银订单' },
-                    { value: 580, name: '核销订单' },
-                    { value: 484, name: '充值订单' },
-                ],
-                emphasis: {
-                    itemStyle: {
-                        shadowBlur: 10,
-                        shadowOffsetX: 0,
-                        shadowColor: 'rgba(0, 0, 0, 0.5)'
-                    }
-                }
-            }
-        ]
-    }
-)
-
-// 获取数据
-const getData = () => {
-    let date = '';
-    let start_time, end_time;
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        date = moment(startEndTime.value[0]).format('YYYY/MM/DD') + '-' + moment(startEndTime.value[1]).format('YYYY/MM/DD');
-        start_time = moment(startEndTime.value[0]).format('YYYY/MM/DD') + ' 00:00:00';
-        end_time = moment(startEndTime.value[1]).format('YYYY/MM/DD') + ' 23:59:59'
-    }
-    apiWorkbenchStoreIndex({
-        start_time: start_time,
-        end_time: end_time,
-        store_id: store_id.value
-    }).then(res => {
-        basicList.forEach((item: any) => {
-            item.num = res[item.type];
-        })
-
-        // 写入从后台拿来的数据
-        visitorOption.xAxis.data = res.statistics.range
-        visitorOption.series[0].data = res.statistics.data.order_amount
-        visitorOption.series[1].data = res.statistics.data.user_number
-
-        formData.value = res;
-        tradTypeOption.series[0].data = res.pay_type;
-    })
-
-}
-
-const clearData = () => {
-    startEndTime.value = [new Date(), new Date()];
-    store_id.value = '';
-    getData();
-}
-
-const storeloading = ref(false);
-const storeList = ref([]);
-const remoteMethod = (e: string = '') => {
-    storeloading.value = true;
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    }).then(res => {
-        storeList.value = res.lists;
-        setTimeout(() => {
-            storeloading.value = false;
-        }, 300)
-    }).catch(err => {
-        setTimeout(() => {
-            storeloading.value = false;
-        }, 300)
-    })
-}
-
-onMounted(() => {
-    remoteMethod();
-    getData();
-})
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/store/store_branch_product/details.vue b/src/views/store/store_branch_product/details.vue
deleted file mode 100644
index d49b3912a..000000000
--- a/src/views/store/store_branch_product/details.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="商品详情" :size="1200" v-model="isOpen">
-            <div>
-                <div>
-                    <el-table :data="pager.lists">
-                        <el-table-column label="订单编号" prop="oid" show-overflow-tooltip>
-                            <template #default="{ row }">
-                                {{ row.oid }}|{{ row.order_id }}
-                            </template>
-                        </el-table-column>
-
-                        <el-table-column
-                            label="用户"
-                            prop="nickname"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-                        <el-table-column
-                            label="门店"
-                            prop="system_store"
-                            show-overflow-tooltip
-                            width="100"
-                        />
-                        <el-table-column
-                            label="数量"
-                            prop="cart_num"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-                        <el-table-column
-                            label="单价"
-                            prop="price"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-                        <el-table-column
-                            label="总价"
-                            prop="total_price"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-                        <el-table-column
-                            label="退款数量"
-                            prop="refund_num"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-                        <el-table-column
-                            label="退款金额"
-                            prop="refund_amount"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-                        <el-table-column
-                            label="创建时间"
-                            prop="create_time"
-                            show-overflow-tooltip
-                        />
-                    </el-table>
-                </div>
-                <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                    <pagination v-model="pager" @change="getLists" />
-                </div>
-            </div>
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { apiStoreOrderCartInfo } from '@/api/store_order'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const isOpen = ref(false)
-
-const getDetail = async (row: Record<string, any>) => {
-    queryParams.product_id = row.product_id
-    queryParams.store_id = row.store_id
-
-    getLists()
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-}
-
-// 查询条件
-const queryParams = reactive({
-    product_id: '',
-    store_id: '',
-    is_pay: 1
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreOrderCartInfo,
-    params: queryParams
-})
-
-defineExpose({
-    open,
-    getDetail
-})
-</script>
diff --git a/src/views/store/store_branch_product/details_aaaaa.vue b/src/views/store/store_branch_product/details_aaaaa.vue
deleted file mode 100644
index fe7390c4d..000000000
--- a/src/views/store/store_branch_product/details_aaaaa.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="商品详情" :size="1200" v-model="isOpen">
-            <el-tabs v-model="activeName" class="demo-tabs">
-                <el-tab-pane label="基础信息" name="first">
-                    <el-descriptions class="margin-top" :column="2" border>
-                        <el-descriptions-item label="商品名称">
-                            {{ formData.store_name }}
-                        </el-descriptions-item>
-                        <el-descriptions-item label="商品分类">{{
-                            formData.cate_name
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="商品图片" :span="2">
-                            <el-image
-                                :src="formData.image"
-                                class="w-20 h-20"
-                                :preview-teleported="true"
-                            />
-                        </el-descriptions-item>
-                        <el-descriptions-item label="厂家备注" :span="2">
-                            <div style="white-space: pre">
-                                {{ formData.manufacturer_information }}
-                            </div>
-                        </el-descriptions-item>
-                    </el-descriptions>
-                    <el-table :data="sku_lists" border class="mt-4">
-                        <el-table-column label="规格名称" prop="sku_name" min-width="150" />
-                        <el-table-column label="单位" prop="unit_name" />
-                        <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                        <el-table-column label="商户价" prop="cost" show-overflow-tooltip />
-                        <el-table-column label="零售价" prop="price" show-overflow-tooltip />
-                        <el-table-column label="商品销量" prop="sales" show-overflow-tooltip />
-                        <el-table-column label="商品库存" prop="stock" show-overflow-tooltip />
-                        <el-table-column label="条码" prop="bar_code" show-overflow-tooltip />
-                        <el-table-column label="状态" show-overflow-tooltip>
-                            <template #default="{ row }">
-                                <el-switch
-                                    size="large"
-                                    @change="statusChange(row)"
-                                    v-model="row.status"
-                                    :active-value="1"
-                                    :inactive-value="0"
-                                    active-text="上架"
-                                    inactive-text="下架"
-                                    inline-prompt
-                                />
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-tab-pane>
-            </el-tabs>
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import {
-    apiStoreBranchProductAttrValueLists,
-    apiStoreBranchProductAttrValueStatus
-} from '@/api/store_branch_product_attr_value'
-import type { PropType } from 'vue'
-import feedback from '@/utils/feedback'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-
-const sku_lists = ref([])
-const isOpen = ref(false)
-const activeName = ref('first')
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    image: '',
-    store_name: '',
-    bar_code: '',
-    cate_id: '',
-    cate_name: '',
-    price: '',
-    unit: '',
-    unit_name: '',
-    stock: '',
-    cost: '',
-    purchase: '',
-    rose: '0',
-    manufacturer_information: ''
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    apiStoreBranchProductAttrValueLists({
-        product_id: data.product_id,
-        store_id: data.store_id
-    }).then((res) => {
-        sku_lists.value = res.lists
-    })
-}
-
-const statusChange = (row: any) => {
-    apiStoreBranchProductAttrValueStatus({
-        id: row.id,
-        status: row.status
-    })
-}
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-// 查询条件
-const queryParams = reactive({
-    product_id: ''
-})
-
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/store/store_branch_product/details_stock.vue b/src/views/store/store_branch_product/details_stock.vue
deleted file mode 100644
index 5a3f8c145..000000000
--- a/src/views/store/store_branch_product/details_stock.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="商品详情" :size="1200" v-model="isOpen">
-            <div>
-                <div>
-                    <el-table :data="pager.lists">
-                        <el-table-column label="订单编号" prop="oid" show-overflow-tooltip>
-                            <template #default="{ row }"> {{ row.oid }}|{{ row.code }} </template>
-                        </el-table-column>
-                        <el-table-column
-                            label="门店"
-                            prop="system_store_name"
-                            show-overflow-tooltip
-                            width="100"
-                        />
-                        <el-table-column
-                            label="订单类型"
-                            prop="order_type_name"
-                            show-overflow-tooltip
-                        />
-
-                        <el-table-column
-                            label="数量"
-                            prop="nums"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-                        <el-table-column
-                            label="单价"
-                            prop="price"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-                        <el-table-column
-                            label="总价"
-                            prop="total_price"
-                            show-overflow-tooltip
-                            width="80"
-                        />
-
-                        <el-table-column
-                            label="创建时间"
-                            prop="create_time"
-                            show-overflow-tooltip
-                        />
-                    </el-table>
-                </div>
-                <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                    <pagination v-model="pager" @change="getLists" />
-                </div>
-            </div>
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { apiWarehouseProductLists } from '@/api/warehouse_product'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const isOpen = ref(false)
-
-const getDetail = async (row: Record<string, any>) => {
-    queryParams.product_id = row.product_id
-    queryParams.store_id = row.store_id
-
-    getLists()
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-}
-
-// 查询条件
-const queryParams = reactive({
-    product_id: '',
-    store_id: '',
-    financial_pm: 0
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseProductLists,
-    params: queryParams
-})
-
-defineExpose({
-    open,
-    getDetail
-})
-</script>
diff --git a/src/views/store/store_branch_product/edit.vue b/src/views/store/store_branch_product/edit.vue
deleted file mode 100644
index d81bc6676..000000000
--- a/src/views/store/store_branch_product/edit.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input v-model="formData.store_name" placeholder="请输入商品名称" />
-                </el-form-item>
-                <el-form-item label="商品图片" prop="image">
-                    <material-picker v-model="formData.image" :limit="1" />
-                </el-form-item>
-                <el-form-item label="商品价格" prop="price">
-                    <el-input v-model="formData.price" placeholder="请输入商品价格" />
-                </el-form-item>
-                <!-- <el-form-item label="商品条码" prop="bar_code">
-                    <el-input v-model="formData.bar_code" placeholder="请输入商品条码" />
-                </el-form-item> -->
-                <el-form-item label="商品单位" prop="unit">
-                    <el-cascader class="w-[500px]" v-model="formData.unit" :options="unitList" :props="{
-                    value: 'id',
-                    label: 'name',
-                    emitPath: false,
-                }" placeholder="请选择商品单位" />
-                </el-form-item>
-                <el-form-item label="商品状态">
-                    <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" active-text="上架" inactive-text="下架" inline-prompt />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeBranchProductEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreBranchProductAdd, apiStoreBranchProductUpdate, apiStoreBranchProductDetail } from '@/api/store_branch_product'
-import { apiStoreProductUnitLists } from "@/api/store_product_unit";
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店商品' : '新增门店商品'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    // cate_id: '',
-    store_name: '',
-    image: '',
-    price: '',
-    // cost: '',
-    // bar_code: '',
-    unit: '',
-    status: ''
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    cate_id: [{ required: true, message: '请输入商品分类', trigger: 'blur' }],
-    store_name: [{ required: true, message: '请输入门店名称', trigger: 'blur' }],
-    image: [{ required: true, message: '请输入商品图片', trigger: 'blur' }],
-    price: [{ required: true, message: '请输入商品价格', trigger: 'blur' }],
-    cost: [{ required: true, message: '请输入商品成本', trigger: 'blur' }],
-    bar_code: [{ required: true, message: '请输入商品条码', trigger: 'blur' }],
-    unit: [{ required: true, message: '请输入商品单位', trigger: 'blur' }],
-    status: [{ required: true, message: '请输入商品状态', trigger: 'blur' }]
-})
-
-const unitList = ref([]);
-const getUnitList = () => {
-    apiStoreProductUnitLists({}).then((res) => {
-        unitList.value = res.lists;
-    });
-};
-getUnitList();
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreBranchProductDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreBranchProductUpdate(data) 
-        : await apiStoreBranchProductAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store/store_branch_product/editStock.vue b/src/views/store/store_branch_product/editStock.vue
deleted file mode 100644
index 3dd4707c9..000000000
--- a/src/views/store/store_branch_product/editStock.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input v-model="formData.store_name" placeholder="请输入商品名称" />
-                </el-form-item>
-                <el-form-item label="商品图片" prop="image">
-                    <material-picker v-model="formData.image" :limit="1" />
-                </el-form-item>
-                <el-form-item label="商品库存" prop="stock">
-                    <el-input v-model="formData.stock" placeholder="请输入商品库存" />
-                </el-form-item>
-                <el-form-item label="商品销量" prop="sales">
-                    <el-input v-model="formData.sales" placeholder="请输入商品销量" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeBranchProductEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiStoreBranchProductEditStock,
-    apiStoreBranchProductDetail
-} from '@/api/store_branch_product'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '重置门店库存' : '新增门店商品'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    store_name: '',
-    image: '',
-    stock: '',
-	sales: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    cate_id: [{ required: true, message: '请输入商品分类', trigger: 'blur' }],
-    store_name: [{ required: true, message: '请输入门店名称', trigger: 'blur' }],
-    image: [{ required: true, message: '请输入商品图片', trigger: 'blur' }],
-    price: [{ required: true, message: '请输入商品价格', trigger: 'blur' }],
-    cost: [{ required: true, message: '请输入商品成本', trigger: 'blur' }],
-    bar_code: [{ required: true, message: '请输入商品条码', trigger: 'blur' }],
-    unit: [{ required: true, message: '请输入商品单位', trigger: 'blur' }],
-    status: [{ required: true, message: '请输入商品状态', trigger: 'blur' }]
-})
-
-const unitList = ref([])
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreBranchProductDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    await apiStoreBranchProductEditStock(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store/store_branch_product/index.vue b/src/views/store/store_branch_product/index.vue
deleted file mode 100644
index 1ef91b44f..000000000
--- a/src/views/store/store_branch_product/index.vue
+++ /dev/null
@@ -1,375 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店" prop="store_id">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.store_id" clearable placeholder="请输入门店" /> -->
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_name"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item label="商品条码" prop="bar_code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.bar_code"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入商品条码"
-                    />
-                </el-form-item>
-                <el-form-item label="排序" prop="order_by">
-                    <el-select
-                        v-model="queryParams.order_by"
-                        placeholder="请选择排序"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in [
-                                { id: 'asc', name: '升序' },
-                                { id: 'desc', name: '降序' }
-                            ]"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="状态" prop="bar_code">
-                    <el-select
-                        v-model="queryParams.status"
-                        placeholder="请选择状态"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in [
-                                { id: 1, name: '上架' },
-                                { id: 0, name: '下架' }
-                            ]"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiStoreBranchProductLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-radio-group v-model="producStatus" @change="changeProducStatus">
-                <el-radio-button label="0">全部</el-radio-button>
-                <el-radio-button label="1">上架</el-radio-button>
-                <el-radio-button label="2">下架</el-radio-button>
-                <el-radio-button label="3">库存警告</el-radio-button>
-                <el-radio-button label="4">已售罄</el-radio-button>
-            </el-radio-group>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="门店" prop="system_store_name" show-overflow-tooltip />
-                    <el-table-column label="分类" prop="cate_name" show-overflow-tooltip />
-                    <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-image
-                                class="w-[40px] h-[40px]"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="价格" prop="price" min-width="80" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <p :style="row.purchase == 0 ? 'color:red' : ''">
-                                供货价: {{ row.purchase }}
-                            </p>
-                            <p :style="row.cost == 0 ? 'color:red' : ''">商户价: {{ row.cost }}</p>
-                            <p :style="row.vip_price == 0 ? 'color:red' : ''">
-                                会员价:{{ row.vip_price }}
-                            </p>
-                            <p :style="row.price == 0 ? 'color:red' : ''">零售价:{{ row.price }}</p>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品条码" prop="bar_code" show-overflow-tooltip />
-                    <el-table-column label="销量" prop="sales" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleDetai(row)">{{
-                                row.sales || 0
-                            }}</el-button>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="库存" prop="stock" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleStockDetai(row)">{{
-                                row.stock || 0
-                            }}</el-button>
-                        </template>
-                    </el-table-column>
-                    <!-- <el-table-column label="兑换库存" prop="swap" show-overflow-tooltip /> -->
-                    <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-                    <!-- <el-table-column label="价值" prop="total_price" show-overflow-tooltip /> -->
-
-                    <el-table-column label="状态" prop="status">
-                        <template #default="{ row }">
-                            <el-switch
-                                size="large"
-                                @change="statusChange(row)"
-                                v-model="row.status"
-                                :active-value="1"
-                                :inactive-value="0"
-                                active-text="上架"
-                                inactive-text="下架"
-                                inline-prompt
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="操作"
-                        min-width="140"
-                        fixed="right"
-                        align="center"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <!-- <el-button
-                                v-perms="['store_branch_product.store_branch_product/details']"
-                                type="primary"
-                                link
-                                @click="handleDetail(row)"
-                            >
-                                详情
-                            </el-button> -->
-                            <el-button
-                                type="primary"
-                                v-prems="['store_branch_product.store_branch_product/deit']"
-                                link
-                                @click="handleEdit(row)"
-                                >编辑</el-button
-                            >
-                            <el-button
-                                type="primary"
-                                v-prems="['store_branch_product.store_branch_product/deitStock']"
-                                link
-                                @click="handleStockEdit(row)"
-                                >重置库存</el-button
-                            >
-                            <el-button
-                                type="danger"
-                                v-perms="['store_branch_product.store_branch_product/delete']"
-                                link
-                                @click="handleDelete(row.id)"
-                                >删除</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <edit-stock-popup
-            v-if="showStockEdit"
-            ref="editStockRef"
-            @success="getLists"
-            @close="showStockEdit = false"
-        />
-        <Details ref="detailsRef"></Details>
-        <DetailsStock ref="StockDetailsRef"></DetailsStock>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeBranchProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreBranchProductLists, apiStoreBranchProductDelete } from '@/api/store_branch_product'
-import { apiStoreBranchProductUpdate } from '@/api/store_branch_product'
-import { timeFormat } from '@/utils/util'
-import { apiSystemStoreLists } from '@/api/system_store'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import EditStockPopup from './editStock.vue'
-import { ElMessage } from 'element-plus'
-import Details from './details.vue'
-import DetailsStock from './details_stock.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const editStockRef = shallowRef<InstanceType<typeof EditStockPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const showStockEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    store_name: '',
-    bar_code: '',
-    exchange: 0,
-    status: null,
-    order_by: '',
-    field: 'stock'
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-const showDetails = ref(false)
-const detailsRef = ref(null)
-// 销量详情
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-
-const showStockDetails = ref(false)
-const StockDetailsRef = ref(null)
-// 库存详情
-const handleStockDetai = async (data: any) => {
-    showStockDetails.value = true
-    await nextTick()
-    StockDetailsRef.value?.open()
-    StockDetailsRef.value?.getDetail(data)
-}
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreBranchProductLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-const handleStockEdit = async (data: any) => {
-    showStockEdit.value = true
-    await nextTick()
-    editStockRef.value?.open('edit')
-    editStockRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreBranchProductDelete({ id })
-    getLists()
-}
-onMounted(() => {
-    getLists()
-})
-
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-const statusChange = (row: any) => {
-    apiStoreBranchProductUpdate({
-        id: row.id,
-        store_name: row.store_name,
-        image: row.image,
-        price: row.price,
-        unit: row.unit,
-        status: row.status
-    })
-}
-
-const producStatus = ref('0')
-const changeProducStatus = (e: any) => {
-    if (e == 0) {
-        queryParams.status = null
-        queryParams.stock = null
-    } else if (e == 1) {
-        queryParams.status = 1
-        queryParams.stock = null
-    } else if (e == 2) {
-        queryParams.status = 0
-        queryParams.stock = null
-    } else if (e == 3) {
-        queryParams.status = null
-        queryParams.stock = 10
-    } else if (e == 4) {
-        queryParams.status = null
-        queryParams.stock = 0
-    }
-    getLists()
-}
-</script>
diff --git a/src/views/store/store_branch_product/index2.vue b/src/views/store/store_branch_product/index2.vue
deleted file mode 100644
index 10754164d..000000000
--- a/src/views/store/store_branch_product/index2.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="门店" prop="store_id">
-					<el-select v-model="queryParams.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
-						remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="商品名称" prop="store_name">
-					<el-input class="w-[280px]" v-model="queryParams.store_name" @keydown.enter="resetPage" clearable
-						placeholder="请输入商品名称" />
-				</el-form-item>
-				<el-form-item label="商品条码" prop="bar_code">
-					<el-input class="w-[280px]" v-model="queryParams.bar_code" @keydown.enter="resetPage" clearable
-						placeholder="请输入商品条码" />
-				</el-form-item>
-				<el-form-item label="排序" prop="order_by">
-					<el-select v-model="queryParams.order_by" placeholder="请选择排序" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in [
-                                { id: 'asc', name: '升序' },
-                                { id: 'desc', name: '降序' }
-                            ]" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="状态" prop="bar_code">
-					<el-select v-model="queryParams.status" placeholder="请选择状态" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in [
-                                { id: 1, name: '上架' },
-                                { id: 0, name: '下架' }
-                            ]" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-					<export-data class="ml-2.5" :fetch-fun="apiStoreBranchProductLists" :params="queryParams"
-						:page-size="pager.size" />
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<el-radio-group v-model="producStatus" @change="changeProducStatus">
-				<el-radio-button label="0">全部</el-radio-button>
-				<el-radio-button label="1">上架</el-radio-button>
-				<el-radio-button label="2">下架</el-radio-button>
-				<el-radio-button label="3">库存警告</el-radio-button>
-				<el-radio-button label="4">已售罄</el-radio-button>
-			</el-radio-group>
-			<div class="mt-4">
-				<el-table :data="pager.lists" @selection-change="handleSelectionChange">
-					<el-table-column label="ID" prop="id" show-overflow-tooltip />
-					<el-table-column label="门店" prop="system_store_name" show-overflow-tooltip />
-					<el-table-column label="分类" prop="cate_name" show-overflow-tooltip />
-					<el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-					<el-table-column label="商品图片" prop="image" show-overflow-tooltip>
-						<template #default="{ row }">
-							<el-image class="w-[40px] h-[40px]" :src="row.image" :preview-teleported="true" />
-						</template>
-					</el-table-column>
-					<el-table-column label="供货价" prop="purchase" min-width="100" show-overflow-tooltip>
-						<template #default="{ row }">
-							<span class="w-[40px] h-[40px]"
-								:style="row.purchase == 0 ? 'color:red' : ''">{{ row.purchase }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="商户价" prop="cost" min-width="120" show-overflow-tooltip>
-						<template #default="{ row }">
-							<span class="w-[40px] h-[40px]"
-								:style="row.cost == 0 ? 'color:red' : ''">{{ row.cost }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="终端零售价" prop="price" min-width="120" show-overflow-tooltip>
-						<template #default="{ row }">
-							<span class="w-[40px] h-[40px]"
-								:style="row.price == 0 ? 'color:red' : ''">{{ row.price }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="商品条码" prop="bar_code" show-overflow-tooltip />
-					<el-table-column label="销量" prop="sales" show-overflow-tooltip />
-					<el-table-column label="售卖库存" prop="stock" show-overflow-tooltip />
-					<el-table-column label="告警库存" prop="low_stock" show-overflow-tooltip />
-					<el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-					<el-table-column label="价值" prop="total_price" show-overflow-tooltip />
-
-					<el-table-column label="状态" prop="status">
-						<template #default="{ row }">
-							<el-switch size="large" @change="statusChange(row)" v-model="row.status" :active-value="1"
-								:inactive-value="0" active-text="上架" inactive-text="下架" inline-prompt />
-						</template>
-					</el-table-column>
-					<el-table-column label="操作" min-width="140" fixed="right" align="center" show-overflow-tooltip>
-						<template #default="{ row }">
-							<el-button type="primary" v-prems="['store_branch_product.store_branch_product/deit']" link
-								@click="handleEdit(row)">编辑</el-button>
-							<el-button type="danger" v-perms="['store_branch_product.store_branch_product/delete']" link
-								@click="handleDelete(row.id)">删除</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-		<Details ref="detailsRef"></Details>
-	</div>
-</template>
-
-<script lang="ts" setup name="storeBranchProductLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import { apiStoreBranchProductLists, apiStoreBranchProductDelete } from '@/api/store_branch_product'
-	import { apiStoreBranchProductUpdate } from '@/api/store_branch_product'
-	import { timeFormat } from '@/utils/util'
-	import { apiSystemStoreLists } from '@/api/system_store'
-	import feedback from '@/utils/feedback'
-	import EditPopup from './edit.vue'
-	import { ElMessage } from 'element-plus'
-	import Details from './details.vue'
-
-	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-	// 是否显示编辑框
-	const showEdit = ref(false)
-	const detailsRef = ref(null)
-
-	// 查询条件
-	const queryParams = reactive({
-		store_id: '',
-		store_name: '',
-		bar_code: '',
-		exchange: 0,
-		status: null,
-		order_by: '',
-		field: 'stock',
-		low_stock: 1
-	})
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiStoreBranchProductLists,
-		params: queryParams
-	})
-
-	// 添加
-	const handleAdd = async () => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('add')
-	}
-
-	// 详情
-	const handleDetail = async (data : any) => {
-		detailsRef.value?.open()
-		detailsRef.value?.setFormData(data)
-	}
-	// 编辑
-	const handleEdit = async (data : any) => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('edit')
-		editRef.value?.setFormData(data)
-	}
-
-	// 删除
-	const handleDelete = async (id : number | any[]) => {
-		await feedback.confirm('确定要删除？')
-		await apiStoreBranchProductDelete({ id })
-		getLists()
-	}
-	onMounted(() => {
-		getLists()
-	})
-
-	const storeloading = ref(false)
-	const storeList = ref([])
-	const remoteMethod = (e = '') => {
-		storeloading.value = true
-		apiSystemStoreLists({
-			name: e,
-			page_size: 50
-		})
-			.then((res) => {
-				storeList.value = res.lists
-				setTimeout(() => {
-					storeloading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					storeloading.value = false
-				}, 300)
-			})
-	}
-
-	const statusChange = (row : any) => {
-		apiStoreBranchProductUpdate({
-			id: row.id,
-			store_name: row.store_name,
-			image: row.image,
-			price: row.price,
-			unit: row.unit,
-			status: row.status
-		})
-	}
-
-	const producStatus = ref('0')
-	const changeProducStatus = (e : any) => {
-		if (e == 0) {
-			queryParams.status = null
-			queryParams.stock = null
-		} else if (e == 1) {
-			queryParams.status = 1
-			queryParams.stock = null
-		} else if (e == 2) {
-			queryParams.status = 0
-			queryParams.stock = null
-		} else if (e == 3) {
-			queryParams.status = null
-			queryParams.stock = 10
-		} else if (e == 4) {
-			queryParams.status = null
-			queryParams.stock = 0
-		}
-		getLists()
-	}
-</script>
\ No newline at end of file
diff --git a/src/views/store/store_category/edit.vue b/src/views/store/store_category/edit.vue
deleted file mode 100644
index 641c925f0..000000000
--- a/src/views/store/store_category/edit.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-	<div class="edit-popup">
-		<popup ref="popupRef" :title="popupTitle" :async="true" width="800px" @confirm="handleSubmit"
-			@close="handleClose">
-			<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-				<el-form-item label="所属ID" prop="pid">
-					<!-- <el-input v-model="formData.pid" clearable placeholder="请输入所属ID" /> -->
-					<el-cascader v-model="formData.pid" :props="props" :show-all-levels="false" style="width: 100%" />
-				</el-form-item>
-				<el-form-item label="分类名称" prop="name">
-					<el-input v-model="formData.name" clearable placeholder="请输入分类名称" />
-				</el-form-item>
-				<el-form-item label="备注信息" prop="data">
-					<el-input v-model="formData.data" clearable placeholder="请输入备注信息" />
-				</el-form-item>
-
-				<el-form-item label="图片" prop="pic">
-					<material-picker v-model="formData.pic" />
-				</el-form-item>
-				<el-form-item label="加价比例" prop="price_rate">
-					<el-button @click="addRow" class="mb-2">添加选项</el-button>
-					<el-table :data="formData.price_rate" style="width: 100%">
-						<el-table-column label="用户角色" width="180">
-							<template v-slot="scope">
-								<el-select v-model="scope.row.id" placeholder="请选择用户角色">
-									<el-option v-for="item in userShipList" :key="item.id" :label="item.title"
-										:value="item.id" />
-								</el-select>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" width="180">
-							<template v-slot="scope">
-								<el-input v-model="scope.row.rate" style="width: 80px">
-									<template #suffix>%</template>
-								</el-input>
-							</template>
-						</el-table-column>
-						<el-table-column label="操作" width="100">
-							<template v-slot="scope">
-								<el-button type="text" @click="deleteRow(scope.$index)">删除</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
-				</el-form-item>
-
-				<el-form-item label="排序" prop="sort">
-					<el-input v-model="formData.sort" clearable placeholder="请输入排序" />
-				</el-form-item>
-			</el-form>
-		</popup>
-	</div>
-</template>
-
-<script lang="ts" setup name="storeCategoryEdit">
-	import type { FormInstance } from "element-plus";
-	import Popup from "@/components/popup/index.vue";
-	import {
-		apiStoreCategoryAdd,
-		apiStoreCategoryEdit,
-		apiStoreCategoryDetail, apiStoreCategoryLists,
-	} from "@/api/store_category";
-	import { apiUserShipLists } from "@/api/user_ship"
-	import { timeFormat } from "@/utils/util";
-	import type { PropType } from "vue";
-	defineProps({
-		dictData: {
-			type: Object as PropType<Record<string, any[]>>,
-			default: () => ({}),
-		},
-	});
-	const emit = defineEmits(["success", "close"]);
-	const formRef = shallowRef<FormInstance>();
-	const popupRef = shallowRef<InstanceType<typeof Popup>>();
-	const mode = ref("add");
-	const tableData = ref([])
-	const userShipList = ref([])
-
-
-	const props = {
-		value: "id",
-		label: "name",
-		checkStrictly: true,
-		emitPath: false,
-		lazy: true,
-		lazyLoad(node, resolve) {
-			let pid = node.value || 0;
-			apiStoreCategoryLists({
-				pid: pid,
-				page_size: 10000,
-			}).then((res) => {
-				resolve(
-					res.lists.map((item : any) => {
-						item.leaf = item.pid > 0;
-						return item;
-					})
-				);
-			});
-		},
-	};
-
-	// 弹窗标题
-	const popupTitle = computed(() => {
-		return mode.value == "edit" ? "编辑商品分类表" : "新增商品分类表";
-	});
-
-	// 表单数据
-	const formData = reactive({
-		id: "",
-		pid: 0,
-		name: "",
-		data: "",
-		pic: "",
-		sort: "",
-		price_rate: []
-	});
-
-	// 表单验证
-	const formRules = reactive<any>({
-		name: [
-			{
-				required: true,
-				message: "请输入分类名称",
-				trigger: ["blur"],
-			},
-		],
-	});
-
-
-	// 获取详情
-	const setFormData = async (data : Record<any, any>) => {
-		for (const key in formData) {
-			if (data[key] != null && data[key] != undefined) {
-				//@ts-ignore
-				formData[key] = data[key];
-			}
-		}
-	};
-
-	const getDetail = async (row : Record<string, any>) => {
-		const data = await apiStoreCategoryDetail({
-			id: row.id,
-		});
-		setFormData(data);
-	};
-
-	// 提交按钮
-	const handleSubmit = async () => {
-		await formRef.value?.validate();
-		let data = { ...formData };
-
-		mode.value == "edit"
-			? await apiStoreCategoryEdit(data)
-			: await apiStoreCategoryAdd(data);
-		popupRef.value?.close();
-		emit("success");
-	};
-
-	//打开弹窗
-	const open = (type = "add") => {
-		mode.value = type;
-		popupRef.value?.open();
-	};
-
-	// 关闭回调
-	const handleClose = () => {
-		emit("close");
-	};
-	
-	const getUserShip = () => {
-		apiUserShipLists({page_size: 999}).then(res => {
-			userShipList.value = res.lists
-		})
-	}
-	
-	const addRow = () => {
-	    formData.price_rate.push({
-	        id: '',
-	        title: '',
-	        rate: ''
-	    })
-	}
-	
-	const deleteRow = (index) => {
-	    formData.price_rate.splice(index, 1)
-	}
-	
-	getUserShip()
-
-	defineExpose({
-		open,
-		setFormData,
-		getDetail,
-	});
-</script>
\ No newline at end of file
diff --git a/src/views/store/store_category/index.vue b/src/views/store/store_category/index.vue
deleted file mode 100644
index ae4a5468e..000000000
--- a/src/views/store/store_category/index.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px] disabledEdit" :model="queryParams" inline>
-                <!-- <el-form-item label="所属ID" prop="pid">
-          <el-input class="w-[280px]" v-model="queryParams.pid" clearable placeholder="请输入所属ID" />
-        </el-form-item> -->
-                <el-form-item label="分类名称" prop="name">
-                    <el-input class="w-[280px]" v-model="queryParams.name" @keydown.enter="resetPage" clearable placeholder="请输入分类名称" />
-                </el-form-item>
-                <el-form-item label="备注信息" prop="data">
-                    <el-input class="w-[280px]" v-model="queryParams.data" @keydown.enter="resetPage" clearable placeholder="请输入备注信息" />
-                </el-form-item>
-                <el-form-item label="排序" prop="sort">
-                    <el-input class="w-[280px]" v-model="queryParams.sort" @keydown.enter="resetPage" clearable placeholder="请输入排序" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['store_category.store_category/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button v-perms="['store_category.store_category/delete']" :disabled="!selectData.length"
-                @click="handleDelete(selectData)">
-                删除
-            </el-button>
-            <div class="mt-4" style="cursor: pointer">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange" @cell-click="cellClick">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="ID" prop="id" width="120" />
-                    <el-table-column label="所属ID" prop="pid" show-overflow-tooltip />
-                    <el-table-column label="分类名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="图片" prop="pic">
-                        <template #default="{ row }">
-                            <el-image style="width: 50px; height: 50px" :src="row.pic"  :preview-teleported="true"/>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="备注信息" prop="data" show-overflow-tooltip />
-                    <el-table-column label="排序" prop="sort" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button v-perms="['store_category.store_category/edit']" type="primary" link
-                                @click.stop="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button v-perms="['store_category.store_category/delete']" type="danger" link
-                                @click.stop="handleDelete(row.id)">
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="storeCategoryLists">
-import { usePaging } from "@/hooks/usePaging";
-import { useDictData } from "@/hooks/useDictOptions";
-import {
-    apiStoreCategoryLists,
-    apiStoreCategoryDelete,
-} from "@/api/store_category";
-import { timeFormat } from "@/utils/util";
-import { useRoute, useRouter } from "vue-router";
-import feedback from "@/utils/feedback";
-import EditPopup from "./edit.vue";
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>();
-// 是否显示编辑框
-const showEdit = ref(false);
-
-const route = useRoute();
-const router = useRouter();
-
-// 查询条件
-const queryParams = reactive({
-    pid: route.query?.pid || 0,
-    name: "",
-    data: "",
-    pic: "",
-    sort: "",
-});
-
-// 选中数据
-const selectData = ref<any[]>([]);
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id);
-};
-
-// 获取字典数据
-const { dictData } = useDictData("");
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreCategoryLists,
-    params: queryParams,
-});
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true;
-    await nextTick();
-    editRef.value?.open("add");
-};
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true;
-    await nextTick();
-    editRef.value?.open("edit");
-    editRef.value?.setFormData(data);
-};
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm("确定要删除？");
-    await apiStoreCategoryDelete({ id });
-    getLists();
-};
-
-getLists();
-
-// 跳转子级分类
-const cellClick = (row: any, column: any) => {
-    if (column.no == 7) return console.log("无效点击");
-
-    router.push({
-        path: "/store/store_category",
-        query: {
-            pid: row.id,
-        },
-    });
-};
-</script>
diff --git a/src/views/store/store_product/copy.vue b/src/views/store/store_product/copy.vue
deleted file mode 100644
index 795d4b2da..000000000
--- a/src/views/store/store_product/copy.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="复制商品到门店"
-            :async="true"
-            width="1200px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <div>
-                <el-form ref="formRef" :model="formData" label-width="90px">
-                    <el-form-item label="商品名称">
-                        <el-input v-model="formData.store_name" type="input" rows="4" disabled />
-                    </el-form-item>
-                    <el-form-item label="门店" prop="store_id">
-                        <div class="flex-1 w-full">
-                            <div class="mb-2">
-                                <el-button type="primary" @click="showStore = true"
-                                    >添加门店</el-button
-                                >
-                            </div>
-                            <el-table :data="storeList">
-                                <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                                <el-table-column
-                                    label="门店名称"
-                                    prop="name"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column
-                                    label="手机号码"
-                                    prop="phone"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column
-                                    label="详细地址"
-                                    prop="detailed_address"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column
-                                    label="门店logo"
-                                    prop="image"
-                                    show-overflow-tooltip
-                                >
-                                    <template #default="{ row }">
-                                        <el-image
-                                            :src="row.image"
-                                            class="w-[40px] h-[40px]"
-                                            :preview-teleported="true"
-                                        />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                    label="营业状态"
-                                    prop="is_show"
-                                    show-overflow-tooltip
-                                >
-                                    <template #default="{ row }">
-                                        {{ row.is_show ? '营业' : '打烊' }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" width="120" fixed="right">
-                                    <template #default="{ row }">
-                                        <el-button
-                                            v-perms="['system_store.system_store/delete']"
-                                            type="danger"
-                                            link
-                                            @click="handleDelete(row.id)"
-                                        >
-                                            删除
-                                        </el-button>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <el-dialog v-model="showStore" title="选择门店" width="70%">
-                <store-pop @onBindStore="onBindStore"></store-pop>
-            </el-dialog>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from 'element-plus'
-import { apiStoreProductCopy } from '@/api/store_product'
-import type { PropType } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import Popup from '@/components/popup/index.vue'
-
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    store_name: ''
-})
-
-const showStore = ref(false) // 选择门店列表是否显示
-// 门店列表
-const storeList = ref([])
-// 删除已有门店
-const handleDelete = (id: number) => {
-    storeList.value = storeList.value.filter((item: any) => item.id !== id)
-}
-// 选择门店
-const onBindStore = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!storeList.value.find((t: any) => t.id == item.id)) {
-            storeList.value.push(item)
-        }
-    })
-    showStore.value = false
-}
-//打开弹窗
-const open = (type = 'add') => {
-    popupRef.value?.open()
-}
-
-const router = useRouter()
-// 提交按钮
-const handleSubmit = async () => {
-    const store_arr = storeList.value.map((item: any) => item.id)
-    apiStoreProductCopy({
-        store_arr,
-        product_id: formData.id
-    }).then((res) => {
-        // removeTab()
-        // if (res.code == 1) {
-        // ElMessage.success(res.msg)
-        setTimeout(() => {
-            router.push({
-                path: '/store/store_branch_product'
-            })
-        }, 2000)
-        // } else {
-        //     ElMessage.error(res.msg)
-        // }
-    })
-}
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.id = data.id
-    formData.store_name = data.store_name
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/store/store_product/details.vue b/src/views/store/store_product/details.vue
deleted file mode 100644
index e7b931857..000000000
--- a/src/views/store/store_product/details.vue
+++ /dev/null
@@ -1,383 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="商品详情" :size="1200" v-model="isOpen">
-            <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                <el-tab-pane label="基础信息" name="first">
-                    <el-descriptions class="margin-top" :column="2" border>
-                        <el-descriptions-item label="商品名称">
-                            {{ formData.store_name }}
-                        </el-descriptions-item>
-                        <el-descriptions-item label="商品分类">{{
-                            formData.cate_name
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="商品图片" :span="2">
-                            <el-image
-                                :src="formData.image"
-                                class="w-20 h-20"
-                                :preview-teleported="true"
-                            />
-                        </el-descriptions-item>
-                        <el-descriptions-item label="商品条码">
-                            {{ formData.bar_code }}
-                        </el-descriptions-item>
-                        <el-descriptions-item label="商品售价">{{
-                            formData.price
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="商品单位">{{
-                            formData.unit_name
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="库存">{{
-                            formData.stock
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="成本">{{
-                            formData.cost
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="供货价">{{
-                            formData.purchase
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="上浮比例" :span="2">{{
-                            formData.rose
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="厂家备注" :span="2">
-                            <div style="white-space: pre">
-                                {{ formData.manufacturer_information }}
-                            </div>
-                            <!-- <div style="white-space: pre;">{{ cMark(formData.manufacturer_information) }}</div> -->
-                        </el-descriptions-item>
-                    </el-descriptions>
-                    <!-- <el-button type="primary" @click="dialogShop = true" class="mt-2">
-                        添加会员价格
-                    </el-button> -->
-
-                    <!-- <div>
-                        <div>
-                            <el-table :data="vipPriceList" v-loading="pager.loading">
-                                <el-table-column label="类型" show-overflow-tooltip />
-                                <el-table-column
-                                    label="供货价"
-                                    prop="purchase"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column label="商户价" prop="cost" show-overflow-tooltip />
-                                <el-table-column
-                                    label="零售价"
-                                    prop="price"
-                                    show-overflow-tooltip
-                                />
-
-                                <el-table-column label="操作" width="120" fixed="right">
-                                    <template #default="{ row }">
-                                        <el-button
-                                            v-perms="['store_product.store_product/vip_price_edit']"
-                                            type="primary"
-                                            link
-                                            @click="handleEdit(row)"
-                                        >
-                                            编辑
-                                        </el-button>
-                                        <el-button
-                                            v-perms="[
-                                                'warehouse_product.warehouse_product/vip_price_delete'
-                                            ]"
-                                            type="danger"
-                                            link
-                                            @click="handleDeletes(row.id)"
-                                        >
-                                            删除
-                                        </el-button>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                        <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                            <pagination v-model="pager" @change="getLists" />
-                        </div>
-                    </div> -->
-                </el-tab-pane>
-                <el-tab-pane label="适用门店" name="second">
-                    <el-table :data="pager.lists" border>
-                        <el-table-column
-                            label="门店名称"
-                            prop="system_store_name"
-                            min-width="200"
-                        />
-                        <el-table-column
-                            label="商品图"
-                            prop="image"
-                            width="80"
-                            show-overflow-tooltip
-                        >
-                            <template #default="{ row }">
-                                <el-image
-                                    :src="row.image"
-                                    class="w-[50px] h-[50px]"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" min-width="150" />
-                        <el-table-column label="商品库存" prop="stock" show-overflow-tooltip />
-                        <el-table-column label="商品价格" prop="price" show-overflow-tooltip />
-                        <el-table-column label="商品销量" prop="sales" show-overflow-tooltip />
-                        <el-table-column label="操作" fixed="right" v-if="isEidt">
-                            <template #default="{ row }">
-                                <el-button
-                                    v-perms="['store_product.store_product/delete']"
-                                    type="danger"
-                                    link
-                                    @click="handleDelete(row.store_id)"
-                                >
-                                    删除
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                        <el-table-column
-                            label="分配库存"
-                            fixed="right"
-                            v-if="isEidtStock"
-                            min-width="150"
-                        >
-                            <template #default="{ row }">
-                                <el-input-number
-                                    v-model="row.new_stock"
-                                    :min="1"
-                                    @change="handleChange(row)"
-                                />
-                            </template>
-                        </el-table-column>
-                        <!-- <el-table-column label="操作" fixed="right" v-if="!isEidt && !isEidtStock">
-                            <template #default="{ row }">
-                                <el-button v-perms="['store_product.store_product/update']" type="primary" link
-                                    @click="updatePrice(row)">
-                                    修改价格
-                                </el-button>
-                            </template>
-                        </el-table-column> -->
-                    </el-table>
-                    <div class="flex mt-4 justify-end" v-if="pager.count > pager.lists.length">
-                        <pagination v-model="pager" @change="getLists" />
-                    </div>
-                </el-tab-pane>
-                <el-tab-pane label="仓库" name="warehouse">
-                    <el-table :data="warehouseProductList">
-                        <el-table-column label="仓库" prop="warehouse_name" min-width="150" />
-                        <el-table-column
-                            label="商品图"
-                            prop="image"
-                            width="80"
-                            show-overflow-tooltip
-                        >
-                            <template #default="{ row }">
-                                <el-image
-                                    :src="row.image"
-                                    class="w-[50px] h-[50px]"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" min-width="150" />
-                        <el-table-column label="商品库存" prop="nums" show-overflow-tooltip />
-                    </el-table>
-                </el-tab-pane>
-            </el-tabs>
-        </el-drawer>
-        <el-dialog v-model="dialogShop" title="设置会员价格" width="500">
-            <el-form :model="formPrice">
-                <el-form-item label="类型">
-                    <el-input
-                        v-model="formPrice.vip_type"
-                        placeholder="请输入会员类型"
-                        autocomplete="off"
-                    />
-                </el-form-item>
-                <el-form-item label="供货价">
-                    <el-input
-                        v-model="formPrice.purchase"
-                        type="number"
-                        placeholder="请输入供货价"
-                        autocomplete="off"
-                    />
-                </el-form-item>
-                <el-form-item label="商户价">
-                    <el-input
-                        v-model="formPrice.cost"
-                        type="number"
-                        placeholder="请输入商户价"
-                        autocomplete="off"
-                    />
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input
-                        v-model="formPrice.price"
-                        type="number"
-                        placeholder="请输入价"
-                        autocomplete="off"
-                    />
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="dialogShop = false">取消</el-button>
-                    <el-button type="primary" @click="onUpdatePrice"> 确认 </el-button>
-                </div>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { ElMessage, type FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreProductAdd, apiStoreProductEdit, apiStoreProductDetail } from '@/api/store_product'
-import { timeFormat } from '@/utils/util'
-import {
-    apiSourceProductStoreLists,
-    apiStoreBranchProductEdit,
-    apiStoreBranchProductEditPrice
-} from '@/api/system_store'
-import { apiWarehouseProductStoregeLists } from '@/api/warehouse_product_storege'
-import type { PropType } from 'vue'
-import feedback from '@/utils/feedback'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const dialogShop = ref(false)
-const vipPriceList = ref([])
-
-const isOpen = ref(false)
-const activeName = ref('first')
-const handleClick = (tab: any) => {
-    if (tab.paneName == 'second') getLists()
-    if (tab.paneName == 'warehouse') getWarehouseProductList()
-}
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    image: '',
-    store_name: '',
-    bar_code: '',
-    cate_id: '',
-    cate_name: '',
-    price: '',
-    unit: '',
-    unit_name: '',
-    stock: '',
-    cost: '',
-    purchase: '',
-    rose: '0',
-    manufacturer_information: ''
-})
-const handleEdit = () => {
-    console.log(12)
-}
-const handleDeletes = () => {
-    console.log(12)
-}
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    queryParams.product_id = data.id
-    if (activeName.value == 'second') getLists()
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    queryParams.product_id = row.id
-    const data = await apiStoreProductDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-    addList.clear()
-    removeList.clear()
-}
-
-// 查询条件
-const queryParams = reactive({
-    product_id: ''
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiSourceProductStoreLists,
-    params: queryParams
-})
-
-const addList = new Map() // 添加列表
-const removeList = new Map() // 删除列表
-const isEidt = ref(false) //正在编辑
-const showStore = ref(false)
-const onBindStore = (e: any) => {
-    e.filter((item: any) => {
-        return !pager.lists.find((t) => t.store_id == item.id)
-    }).map((item: any) => {
-        pager.lists.unshift({
-            store_id: item.id,
-            system_store_name: item.name,
-            stock: 0,
-            cost: 0,
-            price: 0,
-            sales: 0
-        })
-        addList.set(item.id, (addList.get(item.id) || 0) + 1)
-        removeList.set(item.id, (removeList.get(item.id) || 0) - 1)
-    })
-    showStore.value = false
-}
-
-const handleDelete = (store_id: number) => {
-    pager.lists = pager.lists.filter((item) => item.store_id != store_id)
-    addList.set(store_id, (addList.get(store_id) || 0) - 1)
-    removeList.set(store_id, (removeList.get(store_id) || 0) + 1)
-}
-// 库存相关
-const isEidtStock = ref(false)
-const stockList = ref(new Map())
-const handleChange = (row: any) => {
-    stockList.value.set(row.id, row.new_stock)
-}
-
-// 编辑门店价格
-const dialogFormVisible = ref(false)
-const formPrice = ref({
-    id: '',
-    price: ''
-})
-const updatePrice = (row: any) => {
-    formPrice.value.id = row.id
-    formPrice.value.price = row.price
-    dialogFormVisible.value = true
-}
-const onUpdatePrice = () => {
-    if (!formPrice.value.price) return ElMessage.warning('请输入价格')
-    apiStoreBranchProductEditPrice(formPrice.value).then(() => {
-        dialogFormVisible.value = false
-        getLists()
-    })
-}
-const warehouseProductList = ref([])
-const getWarehouseProductList = () => {
-    apiWarehouseProductStoregeLists(queryParams).then((res) => {
-        warehouseProductList.value = res.lists
-    })
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store/store_product/details11.vue b/src/views/store/store_product/details11.vue
deleted file mode 100644
index 8d74c2e9e..000000000
--- a/src/views/store/store_product/details11.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="商品详情" :size="1200" v-model="isOpen">
-            <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                <el-tab-pane label="基础信息" name="first">
-                    <el-descriptions class="margin-top" :column="2" border>
-                        <el-descriptions-item label="商品名称">
-                            {{ formData.store_name }}
-                        </el-descriptions-item>
-                        <el-descriptions-item label="商品分类">{{
-                            formData.cate_name
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="商品图片" :span="2">
-                            <el-image
-                                :src="formData.image"
-                                class="w-20 h-20"
-                                :preview-teleported="true"
-                            />
-                        </el-descriptions-item>
-                        <el-descriptions-item label="厂家备注" :span="2">
-                            <div style="white-space: pre">
-                                {{ formData.manufacturer_information }}
-                            </div>
-                        </el-descriptions-item>
-                    </el-descriptions>
-                    <el-table :data="sku_lists" border class="mt-4">
-                        <el-table-column label="规格名称" prop="sku_name" min-width="150" />
-                        <el-table-column label="单位" prop="unit_name" />
-                        <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                        <el-table-column label="商户价" prop="cost" show-overflow-tooltip />
-                        <el-table-column label="零售价" prop="price" show-overflow-tooltip />
-                        <el-table-column label="商品销量" prop="sales" show-overflow-tooltip />
-                        <el-table-column label="商品库存" prop="stock" show-overflow-tooltip />
-                        <el-table-column label="条码" prop="bar_code" show-overflow-tooltip />
-                    </el-table>
-                </el-tab-pane>
-                <el-tab-pane label="适用门店" name="second">
-                    <el-table :data="pager.lists" border>
-                        <el-table-column
-                            label="门店名称"
-                            prop="system_store_name"
-                            min-width="200"
-                        />
-                        <el-table-column
-                            label="商品图"
-                            prop="image"
-                            width="80"
-                            show-overflow-tooltip
-                        >
-                            <template #default="{ row }">
-                                <el-image
-                                    :src="row.image"
-                                    class="w-[50px] h-[50px]"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" min-width="150" />
-                        <el-table-column label="商品库存" prop="stock" show-overflow-tooltip />
-                        <el-table-column label="商品价格" prop="price" show-overflow-tooltip />
-                        <el-table-column label="商品销量" prop="sales" show-overflow-tooltip />
-                    </el-table>
-                    <div class="flex mt-4 justify-end" v-if="pager.count > pager.lists.length">
-                        <pagination v-model="pager" @change="getLists" />
-                    </div>
-                </el-tab-pane>
-                <el-tab-pane label="仓库" name="warehouse">
-                    <el-table :data="warehouseProductList">
-                        <el-table-column label="仓库" prop="warehouse_name" min-width="150" />
-                        <el-table-column
-                            label="商品图"
-                            prop="image"
-                            width="80"
-                            show-overflow-tooltip
-                        >
-                            <template #default="{ row }">
-                                <el-image
-                                    :src="row.image"
-                                    class="w-[50px] h-[50px]"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" min-width="150" />
-                        <el-table-column label="商品库存" prop="nums" show-overflow-tooltip />
-                    </el-table>
-                </el-tab-pane>
-            </el-tabs>
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { ElMessage, type FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreProductAttrValueLists } from '@/api/store_product_attr_value'
-import { timeFormat } from '@/utils/util'
-import { apiSourceProductStoreLists } from '@/api/system_store'
-import { apiWarehouseProductStoregeLists } from '@/api/warehouse_product_storege'
-import type { PropType } from 'vue'
-import feedback from '@/utils/feedback'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-const sku_lists = ref([])
-const isOpen = ref(false)
-const activeName = ref('first')
-const handleClick = (tab: any) => {
-    if (tab.paneName == 'second') getLists()
-    if (tab.paneName == 'warehouse') getWarehouseProductList()
-}
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    image: '',
-    store_name: '',
-    bar_code: '',
-    cate_id: '',
-    cate_name: '',
-    price: '',
-    unit: '',
-    unit_name: '',
-    stock: '',
-    cost: '',
-    purchase: '',
-    rose: '0',
-    manufacturer_information: ''
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    queryParams.product_id = data.id
-    if (activeName.value == 'second') getLists()
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    apiStoreProductAttrValueLists({ product_id: data.id }).then((res) => {
-        sku_lists.value = res.lists
-    })
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-// 查询条件
-const queryParams = reactive({
-    product_id: ''
-})
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiSourceProductStoreLists,
-    params: queryParams
-})
-
-const warehouseProductList = ref([])
-const getWarehouseProductList = () => {
-    apiWarehouseProductStoregeLists(queryParams).then((res) => {
-        warehouseProductList.value = res.lists
-    })
-}
-
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/store/store_product/edit.vue b/src/views/store/store_product/edit.vue
deleted file mode 100644
index 98d6aa0f1..000000000
--- a/src/views/store/store_product/edit.vue
+++ /dev/null
@@ -1,527 +0,0 @@
-<template>
-    <el-card>
-        <div class="mb-4 text-lg font-bold">
-            {{ mode == 'add' ? '添加商品' : '编辑商品' }}
-        </div>
-        <div>
-            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <el-form-item label="商品图片" prop="image">
-                    <material-picker v-model="formData.image" :limit="1" />
-                </el-form-item>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        v-model="formData.store_name"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入商品名称"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="商品条码" prop="bar_code">
-                    <el-input
-                        v-model="formData.bar_code"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入商品条码"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="商品规格" prop="store_info">
-                    <el-input
-                        v-model="formData.store_info"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入商品规格"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="商品类型" prop="product_type">
-                    <el-radio-group v-model="formData.product_type" :disabled="mode != 'add'">
-                        <el-radio :label="0">普通产品</el-radio>
-                        <el-radio :label="4">活动产品</el-radio>
-                        <el-radio :label="5">批发产品</el-radio>
-                        <el-radio :label="2">兑换产品</el-radio>
-                        <el-radio :label="3">赠品</el-radio>
-                        <el-radio :label="6">临采商品</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="商品分类" prop="cate_arr">
-                    <el-cascader
-                        class="w-[500px]"
-                        v-model="formData.cate_arr"
-                        filterable
-                        clearable
-                        :before-filter="beforeFilter"
-                        :props="props"
-                        placeholder="请选择商品分类"
-                    />
-                </el-form-item>
-                <el-form-item label="商品单位" prop="unit">
-                    <el-cascader
-                        class="w-[500px]"
-                        v-model="formData.unit"
-                        :options="unitList"
-                        :props="{
-                            value: 'id',
-                            label: 'name',
-                            emitPath: false
-                        }"
-                        placeholder="请选择商品单位"
-                    />
-                </el-form-item>
-                <!-- <el-form-item :label="filterStockName(formData.product_type)" prop="stock">
-                    <el-input
-                        v-model="formData.stock"
-                        type="number"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入库存"
-                        :readonly="false"
-                    />
-                </el-form-item> -->
-                <!-- <el-form-item label="兑换库存" prop="swap">
-                <el-input v-model="formData.swap" type="number" class="w-[500px]" clearable placeholder="请输入库存" :readonly="false" />
-            </el-form-item> -->
-                <el-form-item label="供货价" prop="purchase">
-                    <el-input
-                        v-model="formData.purchase"
-                        type="number"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入供货价"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="商户价" prop="cost">
-                    <el-input
-                        v-model="formData.cost"
-                        type="number"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入商户价"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="会员价" prop="vip_price">
-                    <el-input
-                        v-model="formData.vip_price"
-                        type="number"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入会员价"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="终端零售价" prop="price">
-                    <el-input
-                        v-model="formData.price"
-                        type="number"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入终端零售价"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="起批量" prop="batch">
-                    <el-input
-                        v-model="formData.batch"
-                        type="number"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入零售起批量"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="产地" prop="made_place">
-                    <el-input
-                        v-model="formData.made_place"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入产地"
-                    />
-                </el-form-item>
-                <el-form-item label="毛利率" prop="rose">
-                    <el-input-number
-                        v-model="formData.rose"
-                        type="number"
-                        class="w-[500px]"
-                        clearable
-                        placeholder="请输入毛利率"
-                        :readonly="false"
-                    >
-                        <template #suffix>%</template>
-                    </el-input-number>
-                </el-form-item>
-                <el-form-item label="退货" prop="is_return">
-                    <el-radio-group v-model="formData.is_return">
-                        <el-radio :label="1">支持</el-radio>
-                        <el-radio :label="0">不支持</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="状态" prop="is_show">
-                    <el-radio-group v-model="formData.is_show">
-                        <el-radio :label="1">上架</el-radio>
-                        <el-radio :label="0">下架</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="所属门店" prop="store_id" v-if="mode == 'add'">
-                    <el-radio-group v-model="formData.is_store_all">
-                        <el-radio :label="1">全部门店</el-radio>
-                        <el-radio :label="0">部分门店</el-radio>
-                    </el-radio-group>
-                    <div class="w-full" style="color: #64748b">可选择将商品同步到哪些门店使用</div>
-                    <div class="mb-2">
-                        <el-button
-                            type="primary"
-                            v-if="formData.is_store_all == 0"
-                            @click="showStore = true"
-                            >添加门店</el-button
-                        >
-                    </div>
-                    <el-table :data="storeList" v-if="formData.is_store_all == 0">
-                        <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                        <el-table-column label="门店名称" prop="name" show-overflow-tooltip />
-                        <el-table-column label="手机号码" prop="phone" show-overflow-tooltip />
-                        <el-table-column
-                            label="详细地址"
-                            prop="detailed_address"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column label="门店logo" prop="image" show-overflow-tooltip>
-                            <template #default="{ row }">
-                                <el-image
-                                    :src="row.image"
-                                    class="w-[50px] h-[50px]"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="营业状态" prop="is_show" show-overflow-tooltip>
-                            <template #default="{ row }">
-                                {{ row.is_show ? '营业' : '打烊' }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="操作" width="120" fixed="right">
-                            <template #default="{ row }">
-                                <el-button
-                                    v-perms="['system_store.system_store/delete']"
-                                    type="danger"
-                                    link
-                                    @click="handleDelete(row.id)"
-                                >
-                                    删除
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-form-item>
-                <el-form-item label="">
-                    <el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <el-dialog v-model="showStore" title="选择门店" width="70%">
-            <store-pop @onBindStore="onBindStore"></store-pop>
-        </el-dialog>
-    </el-card>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from 'element-plus'
-import useMultipleTabs from '@/hooks/useMultipleTabs'
-import { apiStoreProductAdd, apiStoreProductEdit, apiStoreProductDetail } from '@/api/store_product'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { onMounted } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { apiStoreProductUnitLists } from '@/api/store_product_unit'
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const { removeTab } = useMultipleTabs()
-const mode = ref('add')
-
-const filterStockName = (e: any) => {
-    let str = '库存'
-    if (e == 1) str = '供销库存'
-    if (e == 2) str = '兑换库存'
-    if (e == 3) str = '赠品库存'
-    return str
-}
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    image: '',
-    store_name: '',
-    bar_code: '',
-    store_info: '',
-    product_type: 0,
-    cate_arr: [],
-    cate_id: '',
-    price: '',
-    vip_price: '',
-    unit: '',
-    stock: '',
-    swap: '',
-    cost: '',
-    purchase: '',
-    batch: 1,
-    store_batch: 1,
-    manufacturer_information: '',
-    rose: '0',
-    is_return: 1, // 1支持退货,2不支持退货
-    is_store_all: 1, //门店类型 1 全部门店 2 部分门店
-    is_show: 1,
-	made_place: ''
-})
-
-// 定义验证输入的函数
-// const validateInput = () => {
-//     // 获取输入框的当前值
-//     const inputValue = formData.bar_code
-
-//     // 使用正则表达式仅保留英文和数字
-//     const filteredValue = inputValue.replace(/[^a-zA-Z0-9]/g, '')
-
-//     // 更新输入框的值
-//     formData.bar_code = filteredValue
-// }
-
-const showStore = ref(false) // 选择门店列表是否显示
-// 门店列表
-const storeList = ref([])
-// 删除已有门店
-const handleDelete = (id: number) => {
-    storeList.value = storeList.value.filter((item: any) => item.id !== id)
-}
-// 选择门店
-const onBindStore = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!storeList.value.find((t: any) => t.id == item.id)) {
-            storeList.value.push(item)
-        }
-    })
-    showStore.value = false
-}
-
-let resolves
-let nodes
-const flag = ref(false)
-let name
-onMounted(() => {
-    // setTimeout(() => {
-    //     let dom = document.getElementsByClassName('caser')[0]
-    //     let ipt = dom.getElementsByClassName('el-input__inner')[0]
-    //     ipt.addEventListener('input', (e) => {
-    //         beforeFilter(e.target.value)
-    //     })
-    // })
-})
-
-const beforeFilter = (value) => {
-    name = value
-    flag.value = true
-    props.lazyLoad(nodes, resolves)
-    return false
-}
-const props = {
-    value: 'id',
-    label: 'name',
-    lazy: true,
-    lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve
-        if (!nodes) nodes = node
-        const pid = node.value || 0
-        let data = {}
-        if (flag.value) {
-            data = { name: name }
-            if (!name) {
-                data = {
-                    pid: pid,
-                    page_size: 10000
-                }
-            }
-        } else {
-            data = {
-                pid: pid,
-                page_size: 10000
-            }
-        }
-        apiStoreCategoryLists({
-            ...data
-        }).then((res) => {
-            resolve(
-                res.lists.map((item: any) => {
-                    item.leaf = item.is_children == 0
-                    flag.value = false
-                    return item
-                })
-            )
-        })
-    }
-}
-
-const unitList = ref([])
-const getUnitList = () => {
-    apiStoreProductUnitLists({}).then((res) => {
-        unitList.value = res.lists
-    })
-}
-getUnitList()
-
-// 表单验证
-const formRules = reactive<any>({
-    store_name: [
-        {
-            required: true,
-            message: '请输入商品名称',
-            trigger: ['blur']
-        }
-    ],
-    cate_id: [
-        {
-            required: true,
-            message: '请输入商品分类',
-            trigger: ['blur', 'change']
-        }
-    ],
-    cate_arr: [
-        {
-            required: true,
-            message: '请选择商品分类',
-            trigger: ['blur', 'change']
-        }
-    ],
-    price: [
-        {
-            required: true,
-            message: '请输入终端零售价',
-            trigger: ['blur']
-        }
-    ],
-    vip_price: [
-        {
-            required: true,
-            message: '请输入会员价',
-            trigger: ['blur']
-        }
-    ],
-    unit: [
-        {
-            required: true,
-            message: '请输入商品单位',
-            trigger: ['blur', 'change']
-        }
-    ],
-    stock: [
-        {
-            required: true,
-            message: '请输入售卖库存',
-            trigger: ['blur']
-        }
-    ],
-    swap: [
-        {
-            required: true,
-            message: '请输入兑换库存',
-            trigger: ['blur']
-        }
-    ],
-    cost: [
-        {
-            required: true,
-            message: '请输入门店零售',
-            trigger: ['blur']
-        }
-    ],
-    purchase: [
-        {
-            required: true,
-            message: '请输入供货价',
-            trigger: ['blur']
-        }
-    ],
-    batch: [
-        {
-            required: true,
-            message: '请输入起批量',
-            trigger: ['blur']
-        }
-    ],
-    image: [
-        {
-            required: true,
-            message: '请输入商品图片',
-            trigger: ['blur', 'change']
-        }
-    ]
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    if (formData.cate_arr[0]) {
-        formData.cate_arr = formData.cate_arr.map((item: any) => Number(item))
-    }
-    console.log(formData.cate_arr)
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-const router = useRouter()
-const route = useRoute()
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data: any = { ...formData }
-    if (formData.is_store_all == 0 && mode.value == 'add') {
-        data.store_arr = storeList.value.map((item: any) => item.id)
-    } else if (mode.value == 'edit') data.is_store_all = 0
-    if (!data.cate_arr.length) return ElMessage.error('请选择商品分类')
-    data.cate_id = data.cate_arr[data.cate_arr.length - 1]
-    mode.value == 'edit' ? await apiStoreProductEdit(data) : await apiStoreProductAdd(data)
-    // tabsStore.removeTab('/store/store_product?page_no' + route.query.page, router)
-
-    // removeTab()
-    router.push({
-        path: '/store/store_product?=',
-        query: {
-            page_no: route.query.page
-        }
-    })
-}
-
-if (route.query.id && route.query.mode == 'edit') {
-    mode.value = 'edit'
-    getDetail({
-        id: route.query.id
-    })
-}
-</script>
-
-<style>
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-}
-</style>
diff --git a/src/views/store/store_product/edit11.vue b/src/views/store/store_product/edit11.vue
deleted file mode 100644
index e63fc1ac8..000000000
--- a/src/views/store/store_product/edit11.vue
+++ /dev/null
@@ -1,558 +0,0 @@
-<template>
-    <el-card>
-        <div class="mb-4 text-lg font-bold">
-            {{ mode == 'add' ? '添加商品' : '编辑商品' }}
-        </div>
-        <div>
-            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                    <el-tab-pane label="基础信息" name="info">
-                        <el-form-item label="商品图片" prop="image">
-                            <material-picker v-model="formData.image" :limit="1" />
-                        </el-form-item>
-                        <el-form-item label="商品名称" prop="store_name">
-                            <el-input
-                                v-model="formData.store_name"
-                                class="w-[500px]"
-                                clearable
-                                placeholder="请输入商品名称"
-                                :readonly="false"
-                            />
-                        </el-form-item>
-                        <el-form-item label="商品类型" prop="product_type">
-                            <el-radio-group
-                                v-model="formData.product_type"
-                                :disabled="mode != 'add'"
-                            >
-                                <el-radio :label="0">普通产品</el-radio>
-                                <el-radio :label="1">供销系列产品</el-radio>
-                                <el-radio :label="2">兑换产品</el-radio>
-                                <el-radio :label="3">赠品</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="商品分类" prop="cate_arr">
-                            <el-cascader
-                                class="w-[500px]"
-                                v-model="formData.cate_arr"
-                                filterable
-                                clearable
-                                :before-filter="beforeFilter"
-                                :props="props"
-                                placeholder="请选择商品分类"
-                            />
-                        </el-form-item>
-                        <el-form-item label="厂家备注" prop="manufacturer_information">
-                            <el-input
-                                v-model="formData.manufacturer_information"
-                                type="textarea"
-                                autosize
-                                class="w-[500px]"
-                                clearable
-                                :placeholder="`厂家名称\n联系人姓名\n联系电话`"
-                                :readonly="false"
-                            />
-                        </el-form-item>
-                        <el-form-item label="退货" prop="is_return">
-                            <el-radio-group v-model="formData.is_return">
-                                <el-radio :label="1">支持</el-radio>
-                                <el-radio :label="0">不支持</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-tab-pane>
-                    <el-tab-pane label="商品规格" name="spec">
-                        <el-form-item label="规格类型">
-                            <el-radio-group v-model="formData.spec_type">
-                                <el-radio :label="0">单规格</el-radio>
-                                <el-radio :label="1">多规格</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <template v-if="formData.spec_type == 0">
-                            <el-form-item label="规格名称" prop="sku_name">
-                                <el-input
-                                    v-model="productData.sku_name"
-                                    class="w-[500px]"
-                                    clearable
-                                    placeholder="请输入规格名称"
-                                    :readonly="false"
-                                />
-                            </el-form-item>
-                            <el-form-item label="商品单位" prop="unit">
-                                <el-cascader
-                                    class="w-[500px]"
-                                    v-model="productData.unit"
-                                    :options="unitList"
-                                    :props="{
-                                        value: 'id',
-                                        label: 'name',
-                                        emitPath: false
-                                    }"
-                                    placeholder="请选择商品单位"
-                                />
-                            </el-form-item>
-                            <el-form-item label="供货价" prop="purchase">
-                                <el-input
-                                    v-model="productData.purchase"
-                                    type="number"
-                                    class="w-[500px]"
-                                    clearable
-                                    placeholder="请输入供货价"
-                                    :readonly="false"
-                                />
-                            </el-form-item>
-                            <el-form-item label="商户价" prop="cost">
-                                <el-input
-                                    v-model="productData.cost"
-                                    type="number"
-                                    class="w-[500px]"
-                                    clearable
-                                    placeholder="请输入商户价"
-                                    :readonly="false"
-                                />
-                            </el-form-item>
-                            <el-form-item label="会员价" prop="vip_price">
-                                <el-input
-                                    v-model="productData.vip_price"
-                                    type="number"
-                                    class="w-[500px]"
-                                    clearable
-                                    placeholder="请输入会员价"
-                                    :readonly="false"
-                                />
-                            </el-form-item>
-                            <el-form-item label="终端零售价" prop="price">
-                                <el-input
-                                    v-model="productData.price"
-                                    type="number"
-                                    class="w-[500px]"
-                                    clearable
-                                    placeholder="请输入终端零售价"
-                                    :readonly="false"
-                                />
-                            </el-form-item>
-                            <el-form-item label="零售起批量" prop="batch">
-                                <el-input
-                                    v-model="productData.batch"
-                                    type="number"
-                                    class="w-[500px]"
-                                    clearable
-                                    placeholder="请输入零售起批量"
-                                    :readonly="false"
-                                />
-                            </el-form-item>
-                            <el-form-item label="门店起批量" prop="store_batch">
-                                <el-input
-                                    v-model="productData.store_batch"
-                                    type="number"
-                                    class="w-[500px]"
-                                    clearable
-                                    placeholder="请输入门店起批量"
-                                    :readonly="false"
-                                />
-                            </el-form-item>
-                        </template>
-                        <template v-if="formData.spec_type == 1">
-                            <el-form-item>
-                                <el-button @click="addRow" class="mb-2">添加规格</el-button>
-                                <el-table :data="tableData" style="width: 100%">
-                                    <!-- 下拉选择列 -->
-                                    <el-table-column label="单位" width="180">
-                                        <template v-slot="scope">
-                                            <el-select
-                                                v-model="scope.row.unit"
-                                                placeholder="请选择单位"
-                                                v-if="scope.row.editable"
-                                            >
-                                                <el-option
-                                                    v-for="item in unitList"
-                                                    :key="item.id"
-                                                    :label="item.name"
-                                                    :value="item.id"
-                                                />
-                                            </el-select>
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column
-                                        v-for="(column, index) in columns"
-                                        :key="index"
-                                        :prop="column.prop"
-                                        :label="column.label"
-                                        :width="column.width"
-                                    >
-                                        <template v-slot="scope">
-                                            <el-input
-                                                v-model="scope.row[column.prop]"
-                                                v-if="scope.row.editable"
-                                            />
-                                            <span v-else>{{ scope.row[column.prop] }}</span>
-                                        </template>
-                                    </el-table-column>
-
-                                    <el-table-column label="操作" width="100">
-                                        <template v-slot="scope">
-                                            <el-button type="text" @click="deleteRow(scope.$index)"
-                                                >删除</el-button
-                                            >
-                                        </template>
-                                    </el-table-column>
-                                </el-table>
-                            </el-form-item>
-                        </template>
-                    </el-tab-pane>
-                    <el-tab-pane label="适用门店" name="store">
-                        <el-form-item label="所属门店" prop="store_id" v-if="mode == 'add'">
-                            <el-radio-group v-model="formData.is_store_all">
-                                <el-radio :label="1">全部门店</el-radio>
-                                <el-radio :label="0">部分门店</el-radio>
-                            </el-radio-group>
-                            <div class="w-full" style="color: #64748b">
-                                可选择将商品同步到哪些门店使用
-                            </div>
-                            <div class="mb-2">
-                                <el-button
-                                    type="primary"
-                                    v-if="formData.is_store_all == 0"
-                                    @click="showStore = true"
-                                    >添加门店</el-button
-                                >
-                            </div>
-                            <el-table :data="storeList" v-if="formData.is_store_all == 0">
-                                <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                                <el-table-column
-                                    label="门店名称"
-                                    prop="name"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column
-                                    label="手机号码"
-                                    prop="phone"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column
-                                    label="详细地址"
-                                    prop="detailed_address"
-                                    show-overflow-tooltip
-                                />
-                                <el-table-column
-                                    label="门店logo"
-                                    prop="image"
-                                    show-overflow-tooltip
-                                >
-                                    <template #default="{ row }">
-                                        <el-image
-                                            :src="row.image"
-                                            class="w-[50px] h-[50px]"
-                                            :preview-teleported="true"
-                                        />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                    label="营业状态"
-                                    prop="is_show"
-                                    show-overflow-tooltip
-                                >
-                                    <template #default="{ row }">
-                                        {{ row.is_show ? '营业' : '打烊' }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" width="120" fixed="right">
-                                    <template #default="{ row }">
-                                        <el-button
-                                            v-perms="['system_store.system_store/delete']"
-                                            type="danger"
-                                            link
-                                            @click="handleDelete(row.id)"
-                                        >
-                                            删除
-                                        </el-button>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </el-form-item>
-                    </el-tab-pane>
-                </el-tabs>
-                <el-form-item label="">
-                    <el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <el-dialog v-model="showStore" title="选择门店" width="70%">
-            <store-pop @onBindStore="onBindStore"></store-pop>
-        </el-dialog>
-    </el-card>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from 'element-plus'
-import useMultipleTabs from '@/hooks/useMultipleTabs'
-import { apiStoreProductAdd, apiStoreProductEdit, apiStoreProductDetail } from '@/api/store_product'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { onMounted } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { apiStoreProductUnitLists } from '@/api/store_product_unit'
-import type { TabsPaneContext } from 'element-plus'
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const activeName = ref('info')
-
-const { removeTab } = useMultipleTabs()
-const mode = ref('add')
-const handleClick = (tab: TabsPaneContext, event: Event) => {
-    console.log(tab, event)
-}
-const filterStockName = (e: any) => {
-    let str = '库存'
-    if (e == 1) str = '供销库存'
-    if (e == 2) str = '兑换库存'
-    if (e == 3) str = '赠品库存'
-    return str
-}
-
-const tableData = ref([])
-const productData = ref([])
-const columns = ref([
-    { label: '规格名称', prop: 'sku_name', width: '180' },
-    { label: '供货价', prop: 'purchase', width: '180' },
-    { label: '商户价', prop: 'cost', width: '180' },
-    { label: '零售价', prop: 'price', width: '180' },
-    { label: '条码', prop: 'bar_code', width: '180' }
-])
-
-const addRow = () => {
-    tableData.value.push({
-        sku_name: '',
-        purchase: 0,
-        cost: 0,
-        price: 0,
-        bar_code: '',
-        editable: true
-    })
-}
-
-const deleteRow = (index) => {
-    tableData.value.splice(index, 1)
-}
-// 表单数据
-const formData = reactive({
-    id: '',
-    image: '',
-    store_name: '',
-    store_info: '',
-    product_type: 0,
-    cate_arr: [],
-    cate_id: '',
-    swap: '',
-    batch: 1,
-    store_batch: 1,
-    manufacturer_information: '',
-    rose: '0',
-    is_return: 1, // 1支持退货,2不支持退货
-    is_store_all: 1, //门店类型 1 全部门店 2 部分门店,
-    spec_type: 0
-})
-
-const showStore = ref(false) // 选择门店列表是否显示
-// 门店列表
-const storeList = ref([])
-// 删除已有门店
-const handleDelete = (id: number) => {
-    storeList.value = storeList.value.filter((item: any) => item.id !== id)
-}
-// 选择门店
-const onBindStore = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!storeList.value.find((t: any) => t.id == item.id)) {
-            storeList.value.push(item)
-        }
-    })
-    showStore.value = false
-}
-
-let resolves
-let nodes
-const flag = ref(false)
-let name
-onMounted(() => {
-    // setTimeout(() => {
-    //     let dom = document.getElementsByClassName('caser')[0]
-    //     let ipt = dom.getElementsByClassName('el-input__inner')[0]
-    //     ipt.addEventListener('input', (e) => {
-    //         beforeFilter(e.target.value)
-    //     })
-    // })
-})
-
-const beforeFilter = (value) => {
-    name = value
-    flag.value = true
-    props.lazyLoad(nodes, resolves)
-    return false
-}
-const props = {
-    value: 'id',
-    label: 'name',
-    lazy: true,
-    lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve
-        if (!nodes) nodes = node
-        const pid = node.value || 0
-        let data = {}
-        if (flag.value) {
-            data = { name: name }
-            if (!name) {
-                data = {
-                    pid: pid,
-                    page_size: 10000
-                }
-            }
-        } else {
-            data = {
-                pid: pid,
-                page_size: 10000
-            }
-        }
-        apiStoreCategoryLists({
-            ...data
-        }).then((res) => {
-            resolve(
-                res.lists.map((item: any) => {
-                    item.leaf = item.is_children == 0
-                    flag.value = false
-                    return item
-                })
-            )
-        })
-    }
-}
-
-const unitList = ref([])
-const getUnitList = () => {
-    apiStoreProductUnitLists({}).then((res) => {
-        unitList.value = res.lists
-    })
-}
-getUnitList()
-
-// 表单验证
-const formRules = reactive<any>({
-    store_name: [
-        {
-            required: true,
-            message: '请输入商品名称',
-            trigger: ['blur']
-        }
-    ],
-    store_info: [
-        {
-            required: true,
-            message: '请输入商品规格',
-            trigger: ['blur']
-        }
-    ],
-    cate_id: [
-        {
-            required: true,
-            message: '请输入商品分类',
-            trigger: ['blur', 'change']
-        }
-    ],
-    cate_arr: [
-        {
-            required: true,
-            message: '请选择商品分类',
-            trigger: ['blur', 'change']
-        }
-    ],
-    image: [
-        {
-            required: true,
-            message: '请输入商品图片',
-            trigger: ['blur', 'change']
-        }
-    ]
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    if (formData.cate_arr[0]) {
-        formData.cate_arr = formData.cate_arr.map((item: any) => Number(item))
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-const router = useRouter()
-const route = useRoute()
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data: any = { ...formData }
-    if (formData.is_store_all == 0 && mode.value == 'add') {
-        data.store_arr = storeList.value.map((item: any) => item.id)
-    } else if (mode.value == 'edit') data.is_store_all = 0
-    if (!data.cate_arr.length) return ElMessage.error('请选择商品分类')
-    data.cate_id = data.cate_arr[data.cate_arr.length - 1]
-    delete data.cate_arr
-    const product_arr = ref([])
-    if (formData.spec_type == 0) {
-        product_arr.value = productData.value
-    } else {
-        product_arr.value = tableData.value.map((item: any) => {
-            return {
-                sku_name: item.sku_name,
-                unit: item.unit,
-                purchase: item.purchase,
-                cost: item.cost,
-                price: item.price,
-                bar_code: item.bar_code
-            }
-        })
-    }
-    data.product_arr = product_arr.value
-    mode.value == 'edit' ? await apiStoreProductEdit(data) : await apiStoreProductAdd(data)
-    // tabsStore.removeTab('/store/store_product?page_no' + route.query.page, router)
-
-    // removeTab()
-    router.push({
-        path: '/store/store_product?=',
-        query: {
-            page_no: route.query.page
-        }
-    })
-}
-
-if (route.query.id && route.query.mode == 'edit') {
-    mode.value = 'edit'
-    getDetail({
-        id: route.query.id
-    })
-}
-</script>
-
-<style>
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-}
-</style>
diff --git a/src/views/store/store_product/import.vue b/src/views/store/store_product/import.vue
deleted file mode 100644
index 13375495a..000000000
--- a/src/views/store/store_product/import.vue
+++ /dev/null
@@ -1,226 +0,0 @@
-<template>
-    <el-card>
-        <div class="mb-4 text-lg font-bold">导入商品到门店</div>
-        <div>
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="门店" prop="store_id">
-                    <div class="flex-1 w-full">
-                        <div class="mb-2">
-                            <el-button type="primary" @click="showStore = true">添加门店</el-button>
-                        </div>
-                        <el-table :data="storeList">
-                            <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                            <el-table-column label="门店名称" prop="name" show-overflow-tooltip />
-                            <el-table-column label="手机号码" prop="phone" show-overflow-tooltip />
-                            <el-table-column
-                                label="详细地址"
-                                prop="detailed_address"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column label="门店logo" prop="image" show-overflow-tooltip>
-                                <template #default="{ row }">
-                                    <el-image
-                                        :src="row.image"
-                                        class="w-[40px] h-[40px]"
-                                        :preview-teleported="true"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="营业状态" prop="is_show" show-overflow-tooltip>
-                                <template #default="{ row }">
-                                    {{ row.is_show ? '营业' : '打烊' }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" width="120" fixed="right">
-                                <template #default="{ row }">
-                                    <el-button
-                                        v-perms="['system_store.system_store/delete']"
-                                        type="danger"
-                                        link
-                                        @click="handleDelete(row.id)"
-                                    >
-                                        删除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-form-item>
-                <el-form-item label="商品" prop="store_id">
-                    <div class="flex-1 w-full">
-                        <div class="mb-2">
-                            <el-button type="primary" @click="showProduct = true"
-                                >添加商品</el-button
-                            >
-                        </div>
-                        <el-table :data="productList">
-                            <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-                            <el-table-column label="商品图片" prop="image" min-width="80">
-                                <template #default="{ row }">
-                                    <el-image
-                                        style="width: 50px; height: 50px"
-                                        :src="row.image"
-                                        :preview-teleported="true"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="商品名称"
-                                prop="store_name"
-                                min-width="200"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="分类"
-                                prop="cate_name"
-                                min-width="120"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="单位"
-                                prop="unit_name"
-                                min-width="80"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="商品价格"
-                                prop="price"
-                                min-width="100"
-                                show-overflow-tooltip
-                            />
-                            <!-- <el-table-column label="分配库存" min-width="150">
-                                <template #default="{ row }">
-                                    <el-input-number v-model="row.new_stock" :min="1" />
-                                </template>
-                            </el-table-column> -->
-                            <el-table-column label="操作" width="120" fixed="right">
-                                <template #default="{ row }">
-                                    <el-button
-                                        v-perms="['system_store.system_store/delete']"
-                                        type="danger"
-                                        link
-                                        @click="handleDeleteProdut(row.id)"
-                                    >
-                                        删除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-form-item>
-                <el-form-item label="库存类型" prop="stock_type">
-                    <el-radio-group v-model="stock_type" class="ml-6">
-                        <el-radio :value="1" :label="1">分配售卖库存</el-radio>
-                        <el-radio :value="2" :label="2">分配兑换库存</el-radio>
-                    </el-radio-group>
-                    <span class="text-info text-xs ml-6"
-                        >默认为分配售卖库存, 如需分配兑换库存请选择分配兑换库存</span
-                    >
-                </el-form-item>
-                <el-form-item label="">
-                    <el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <el-dialog v-model="showStore" title="选择门店" width="70%">
-            <store-pop @onBindStore="onBindStore"></store-pop>
-        </el-dialog>
-        <el-dialog v-model="showProduct" title="选择商品" width="70%">
-            <product-pop @onBindStore="onBindProduct"></product-pop>
-        </el-dialog>
-    </el-card>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from 'element-plus'
-import useMultipleTabs from '@/hooks/useMultipleTabs'
-import { apiStoreProductImport } from '@/api/store_product'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { onMounted } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { apiStoreProductUnitLists } from '@/api/store_product_unit'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const { removeTab } = useMultipleTabs()
-const mode = ref('add')
-
-// 表单数据
-const formData = reactive({
-    store_id: ''
-})
-
-const showStore = ref(false) // 选择门店列表是否显示
-// 门店列表
-const storeList = ref([])
-// 删除已有门店
-const handleDelete = (id: number) => {
-    storeList.value = storeList.value.filter((item: any) => item.id !== id)
-}
-// 选择门店
-const onBindStore = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!storeList.value.find((t: any) => t.id == item.id)) {
-            storeList.value.push(item)
-        }
-    })
-    showStore.value = false
-}
-
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-
-const unitList = ref([])
-const getUnitList = () => {
-    apiStoreProductUnitLists({}).then((res) => {
-        unitList.value = res.lists
-    })
-}
-getUnitList()
-
-const stock_type = ref(1)
-
-const router = useRouter()
-// 提交按钮
-const handleSubmit = async () => {
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            id: item.id,
-            stock: item.new_stock || 0
-        }
-    })
-    const store_arr = storeList.value.map((item: any) => item.id)
-    console.log(product_arr, store_arr)
-    apiStoreProductImport({
-        product_arr,
-        store_arr,
-        stock_type: stock_type.value
-    }).then((res) => {
-        removeTab()
-        router.push({
-            path: '/store/store_product'
-        })
-    })
-}
-</script>
diff --git a/src/views/store/store_product/index.vue b/src/views/store/store_product/index.vue
deleted file mode 100644
index 7b293171e..000000000
--- a/src/views/store/store_product/index.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        @keydown.enter="resetPage"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item label="商品条码" prop="bar_code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.bar_code"
-                        clearable
-                        placeholder="请输入商品条码"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item label="商品ID" prop="id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.id"
-                        clearable
-                        placeholder="请输入商品ID"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item label="商品分类" prop="store_name">
-                    <el-cascader
-                        class="w-[280px]"
-                        v-model="queryParams.class_all"
-                        filterable
-                        clearable
-                        :before-filter="beforeFilter"
-                        :props="props"
-                        placeholder="请选择商品分类"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item label="商品类型" prop="product_type">
-                    <el-select
-                        v-model="queryParams.product_type"
-                        placeholder="请选择商品类型"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option label="普通商品" value="0" />
-                        <el-option label="兑换产品" value="2" />
-                        <el-option label="活动商品" value="4" />
-                        <el-option label="批发产品" value="5" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="显示" prop="is_show">
-                    <el-select
-                        v-model="queryParams.is_show"
-                        placeholder="请选择是否显示"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option label="显示" value="1" />
-                        <el-option label="不显示" value="0" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiStoreProductLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <router-link
-                :to="{
-                    path: 'store_product_edit',
-                    query: { id: 0, mode: 'add' }
-                }"
-                class="mr-4"
-                v-perms="['store_product.store_product/add']"
-            >
-                <el-button type="primary" icon="Plus"> 新增 </el-button>
-            </router-link>
-            <el-button
-                v-perms="['store_product.store_product/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <!-- <router-link
-                :to="{
-                    path: 'product_import'
-                }"
-                class="ml-4"
-                v-perms="['store_product.store_product/add']"
-            >
-                <el-button type="primary"> 导入商品到门店 </el-button>
-            </router-link> -->
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <div>{{ row.store_name }}</div>
-                            <div>
-                                供货价:<span style="color: red">{{ row.purchase }}</span>
-                            </div>
-                            <div>
-                                商户价: <span style="color: red">{{ row.cost }}</span>
-                            </div>
-                            <div>
-                                会员价: <span style="color: red">{{ row.vip_price }}</span>
-                            </div>
-                            <div>
-                                零售价:<span style="color: red">{{ row.price }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="分类" prop="cate_name" show-overflow-tooltip />
-                    <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-                    <el-table-column
-                        label="商品类型"
-                        prop="product_type_name"
-                        show-overflow-tooltip
-                    />
-                    <!-- <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                    <el-table-column label="商户价" prop="cost" show-overflow-tooltip /> -->
-                    <!-- <el-table-column
-                        label="会员价"
-                        prop="vip_price"
-                        min-width="120"
-                        show-overflow-tooltip
-                    /> -->
-                    <!-- <el-table-column label="零售价" prop="price" show-overflow-tooltip /> -->
-                    <el-table-column label="起批量/毛利率" prop="batch" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <div>
-                                起批量:<span style="color: red">{{ row.batch }}</span>
-                            </div>
-                            <div>
-                                毛利率: <span style="color: red">{{ row.rose }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="规格" prop="store_info" show-overflow-tooltip />
-                    <el-table-column label="库存/销量" prop="stock" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span class="mr-1">{{ row.stock }}</span
-                            >/<span class="ml-1">{{ row.sales }}</span>
-                        </template>
-                    </el-table-column>
-                    <!-- <el-table-column label="商品来源" prop="system_store_name" min-width="200" show-overflow-tooltip /> -->
-                    <el-table-column label="状态" prop="is_show">
-                        <template #default="{ row }">
-                            <el-switch
-                                size="large"
-                                @change="statusChange(row)"
-                                v-model="row.is_show"
-                                :active-value="1"
-                                :inactive-value="0"
-                                active-text="上架"
-                                inactive-text="下架"
-                                inline-prompt
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="条码" prop="bar_code" show-overflow-tooltip />
-                    <el-table-column label="操作" width="180" fixed="right">
-                        <template #default="{ row }">
-                            <router-link
-                                :to="{
-                                    path: 'store_product_edit',
-                                    query: { id: row.id, mode: 'edit', page: pager.page }
-                                }"
-                                class="mr-4"
-                                v-perms="['store_product.store_product/edit']"
-                            >
-                                <el-button type="primary" link> 编辑 </el-button>
-                            </router-link>
-                            <el-button
-                                v-perms="['store_product.store_product/edit']"
-                                type="primary"
-                                link
-                                @click="handleDetail(row)"
-                            >
-                                详情
-                            </el-button>
-                            <el-button type="primary" link @click="handleCopy(row)">
-                                复制
-                            </el-button>
-                            <el-button
-                                v-perms="['store_product.store_product/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <Details ref="detailsRef"></Details>
-        <copy-popup v-if="showCopy" ref="copyRef" @success="getLists" @close="showCopy = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiStoreProductLists,
-    apiStoreProductDelete,
-    apiStoreProductStatus
-} from '@/api/store_product'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import Details from './details.vue'
-import CopyPopup from './copy.vue'
-
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { useRoute } from 'vue-router'
-
-const route = useRoute()
-const copyRef = shallowRef<InstanceType<typeof CopyPopup>>()
-
-const detailsRef = ref(null)
-const showCopy = ref(false)
-// 查询条件
-const queryParams = reactive({
-    store_name: '',
-    class_all: '',
-    is_show: '',
-    id: '',
-    bar_code: '',
-    product_type: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-// 获取字典数据
-const { dictData } = useDictData('')
-// 分页相关
-let page_no = 1
-if (route.query.page_no) {
-    page_no = parseInt(route.query.page_no)
-}
-
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    page: page_no,
-    fetchFun: apiStoreProductLists,
-    params: queryParams
-})
-// 添加
-const handleAdd = async (data: any) => {}
-
-// 详情
-const handleDetail = async (data: any) => {
-    detailsRef.value?.open()
-    detailsRef.value?.setFormData(data)
-}
-
-// 编辑
-const handleCopy = async (data: any) => {
-    showCopy.value = true
-    await nextTick()
-    copyRef.value?.open('edit')
-    copyRef.value?.setFormData(data)
-}
-
-let resolves
-let nodes
-const flag = ref(false)
-let name
-const beforeFilter = (value) => {
-    name = value
-    flag.value = true
-    props.lazyLoad(nodes, resolves)
-    return false
-}
-const props = {
-    value: 'id',
-    label: 'name',
-    emitPath: false,
-    lazy: true,
-    lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve
-        if (!nodes) nodes = node
-        const pid = node.value || 0
-        let data = {}
-        if (flag.value) {
-            data = { name: name }
-            if (!name) {
-                data = {
-                    pid: pid,
-                    page_size: 10000
-                }
-            }
-        } else {
-            data = {
-                pid: pid,
-                page_size: 10000
-            }
-        }
-        apiStoreCategoryLists({
-            ...data
-        }).then((res) => {
-            resolve(
-                res.lists.map((item: any) => {
-                    // item.leaf = item.is_children == 0;
-                    item.leaf = true
-                    flag.value = false
-                    return item
-                })
-            )
-        })
-    }
-}
-const statusChange = (row: any) => {
-    apiStoreProductStatus({
-        id: row.id,
-        is_show: row.is_show
-    })
-}
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreProductDelete({ id })
-    getLists()
-}
-
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/store/store_product_unit/detail.vue b/src/views/store/store_product_unit/detail.vue
deleted file mode 100644
index 0e9cba1b3..000000000
--- a/src/views/store/store_product_unit/detail.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup ref="popupRef" :async="true" width="550px" @close="handleClose" :bottom-btn="false">
-            <el-descriptions class="margin-top" :title="popupTitle" :column="1" border>
-                <el-descriptions-item label="单位名称">
-                    {{ formData.name }}
-                </el-descriptions-item>
-                <el-descriptions-item label="单位编号">
-                    {{ formData.number }}
-                </el-descriptions-item>
-                <el-descriptions-item label="是否散装">
-                    {{ formData.is_bulk ? '是' : '否' }}
-                </el-descriptions-item>
-                <el-descriptions-item label="备注信息">
-                    {{ formData.data }}
-                </el-descriptions-item>
-            </el-descriptions>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="brandEdit">
-import Popup from '@/components/popup/index.vue'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return '单位详情'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    name: '',
-    py: '',
-    number: '',
-    data: '',
-    is_bulk: '',
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    name: [{
-        required: true,
-        message: '请输入品牌名称',
-        trigger: ['blur']
-    }]
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-
-
-}
-
-
-
-// 提交按钮
-// const handleSubmit = async () => {
-//     await formRef.value?.validate()
-//     const data = { ...formData, }
-//     mode.value == 'edit'
-//         ? await apiBrandEdit(data)
-//         : await apiBrandAdd(data)
-//     popupRef.value?.close()
-//     emit('success')
-// }
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-})
-</script>
diff --git a/src/views/store/store_product_unit/edit.vue b/src/views/store/store_product_unit/edit.vue
deleted file mode 100644
index d09694aac..000000000
--- a/src/views/store/store_product_unit/edit.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="单位名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入单位名称" />
-                </el-form-item>
-                <!-- <el-form-item label="拼音信息" prop="py">
-                    <el-input v-model="formData.py" clearable placeholder="请输入拼音信息" />
-                </el-form-item> -->
-                <el-form-item label="单位编号" prop="number">
-                    <el-input v-model="formData.number" clearable placeholder="请输入单位编号" />
-                </el-form-item>
-                <el-form-item label="是否散装" prop="is_bulk">
-                    <el-radio-group v-model="formData.is_bulk">
-                        <el-radio :label="1">是</el-radio>
-                        <el-radio :label="0">否</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="备注信息" prop="data">
-                    <el-input v-model="formData.data" type="textarea" clearable placeholder="请输入备注信息" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="unitEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreProductUnitAdd, apiStoreProductUnitEdit, apiStoreProductUnitDetail } from '@/api/store_product_unit'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑计量单位' : '新增计量单位'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    name: '',
-    py: '',
-    number: '',
-    data: '',
-    is_bulk: 0,
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    name: [{
-        required: true,
-        message: '请输入单位名称',
-        trigger: ['blur']
-    }]
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductUnitDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData, }
-    mode.value == 'edit'
-        ? await apiStoreProductUnitEdit(data)
-        : await apiStoreProductUnitAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store/store_product_unit/index.vue b/src/views/store/store_product_unit/index.vue
deleted file mode 100644
index c46b46bff..000000000
--- a/src/views/store/store_product_unit/index.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="单位名称" prop="name">
-                    <el-input class="w-[280px]" v-model="queryParams.name" @keydown.enter="resetPage" clearable placeholder="请输入单位名称" />
-                </el-form-item>
-                <!-- <el-form-item label="拼音信息" prop="py">
-                    <el-input class="w-[280px]" v-model="queryParams.py" clearable placeholder="请输入拼音信息" />
-                </el-form-item> -->
-                <!-- <el-form-item label="单位编号" prop="number">
-                    <el-input class="w-[280px]" v-model="queryParams.number" clearable placeholder="请输入单位编号" />
-                </el-form-item> -->
-                <!-- <el-form-item label="备注信息" prop="data">
-                    <el-input class="w-[280px]" v-model="queryParams.data" clearable placeholder="请输入备注信息" />
-                </el-form-item>
-                <el-form-item label="扩展信息" prop="more">
-                    <el-input class="w-[280px]" v-model="queryParams.more" clearable placeholder="请输入扩展信息" />
-                </el-form-item> -->
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['store_product_unit.store_product_unit/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button v-perms="['store_product_unit.store_product_unit/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="ID" prop="id" width="55" />
-                    <el-table-column label="单位名称" prop="name" show-overflow-tooltip />
-                    <!-- <el-table-column label="拼音信息" prop="py" show-overflow-tooltip /> -->
-                    <el-table-column label="单位编号" prop="number" show-overflow-tooltip />
-                    <el-table-column label="是否散装" prop="is_bulk" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.is_bulk ? '是' : '否' }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="备注信息" prop="data" show-overflow-tooltip />
-                    <el-table-column label="操作" width="170" fixed="right">
-                        <template #default="{ row }">
-                            <el-button v-perms="['store_product_unit.store_product_unit/edit']" type="primary" link @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button v-perms="['store_product_unit.store_product_unit/delete']" type="danger" link @click="handleDelete(row.id)">
-                                删除
-                            </el-button>
-                            <el-button v-perms="['store_product_unit.store_product_unit/edit']" link @click="handleDetail(row.id)">
-                                详情
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-        <DetailPopup v-if="showDetail" ref="detailRef" :dict-data="dictData" @success="getLists"
-            @close="showDetail = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="unitLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreProductUnitLists, apiStoreProductUnitDelete, apiStoreProductUnitDetail } from '@/api/store_product_unit'
-import feedback from '@/utils/feedback'
-import DetailPopup from './detail.vue'
-import EditPopup from "./edit.vue";
-
-const editRef = ref(null)
-const detailRef = ref(null)
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDetail = ref(false)
-
-
-
-// 查询条件
-const queryParams = reactive({
-    name: '',
-    py: '',
-    number: '',
-    data: '',
-    more: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreProductUnitLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-
-
-    console.log(editRef.value)
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 详情
-const handleDetail = async (id: any) => {
-    let res = await apiStoreProductUnitDetail({ id })
-    showDetail.value = true
-    await nextTick()
-    detailRef.value?.open('edit')
-    detailRef.value?.setFormData(res)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreProductUnitDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
diff --git a/src/views/store/system_store_storage/details.vue b/src/views/store/system_store_storage/details.vue
deleted file mode 100644
index ecab2d519..000000000
--- a/src/views/store/system_store_storage/details.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="门店" prop="store_id">
-                    <el-input v-model="formData.store_id" clearable placeholder="请输入门店" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="导入人员" prop="admin_id">
-                    <el-input v-model="formData.admin_id" clearable placeholder="请输入导入人员" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="门店确认人员" prop="operating_id">
-                    <el-input v-model="formData.operating_id" clearable placeholder="请输入门店确认人员" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="商品" prop="product_id">
-                    <el-input v-model="formData.product_id" clearable placeholder="请输入商品" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-input v-model="formData.status" clearable placeholder="请输入状态" :readonly="true"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="systemStoreStorageDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiSystemStoreStorageAdd, apiSystemStoreStorageEdit, apiSystemStoreStorageDetail } from '@/api/system_store_storage'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    store_id: '',
-    admin_id: '',
-    operating_id: '',
-    product_id: '',
-    nums: '',
-    status: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiSystemStoreStorageDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store/system_store_storage/edit.vue b/src/views/store/system_store_storage/edit.vue
deleted file mode 100644
index 80644ca9e..000000000
--- a/src/views/store/system_store_storage/edit.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="门店" prop="system_store_name">
-                    <el-input v-model="formData.system_store_name" clearable placeholder="请输入门店" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="false"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="systemStoreStorageEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiSystemStoreStorageAdd, apiSystemStoreStorageEdit, apiSystemStoreStorageDetail } from '@/api/system_store_storage'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店入库操作' : '新增门店入库操作'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    system_store_name: '',
-    product_id: '',
-    nums: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    nums: [
-        { required: true, message: '请输入数量', trigger: 'blur' },
-    ],
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiSystemStoreStorageDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiSystemStoreStorageEdit(data) 
-        : await apiSystemStoreStorageAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store/system_store_storage/index.vue b/src/views/store/system_store_storage/index.vue
deleted file mode 100644
index 6c17c0d0d..000000000
--- a/src/views/store/system_store_storage/index.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="门店" prop="store_id">
-					<el-select v-model="queryParams.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
-						remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="商品名称" prop="product_name">
-					<el-input class="w-[280px]" v-model="queryParams.product_name" @keydown.enter="resetPage" clearable
-						placeholder="请输入商品名称" />
-				</el-form-item>
-				<!-- <el-form-item label="门店确认人员" prop="staff_name">
-                    <el-input class="w-[280px]" v-model="queryParams.staff_name" @keydown.enter="resetPage" clearable placeholder="请输入门店确认人员" />
-                </el-form-item> -->
-				<el-form-item label="状态" prop="status">
-					<el-select v-model="queryParams.status" placeholder="输入门店名称搜索" style="width: 240px"
-						@change="resetPage">
-						<el-option v-for="item in [
-                                { id: 1, name: '已入库' },
-                                { id: 0, name: '待确认' },
-                                { id: -1, name: '库存不足' }
-                            ]" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<el-radio-group v-model="queryParams.type" @change="resetPage">
-				<el-radio-button :label="1" :value="1">售卖库存</el-radio-button>
-				<el-radio-button :label="2" :value="2">兑换库存</el-radio-button>
-			</el-radio-group>
-			<el-button class="mt-[6px]" @click="batchConfirm">一键入库</el-button>
-			<div class="mt-4">
-				<el-table :data="pager.lists" @selection-change="handleSelectionChange">
-					<el-table-column label="门店" prop="system_store_name" />
-					<el-table-column label="导入人员" prop="admin_name" show-overflow-tooltip />
-					<el-table-column label="门店确认人员" prop="staff_name" show-overflow-tooltip />
-					<el-table-column label="商品图" prop="image" show-overflow-tooltip>
-						<template #default="{ row }">
-							<el-image class="w-[40px] h-[40px]" :src="row.image" />
-						</template>
-					</el-table-column>
-					<el-table-column label="商品" prop="store_name">
-						<template #default="{ row }">
-							<div>{{ row.store_name }}|{{ row.product_id }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="数量" prop="nums" show-overflow-tooltip />
-					<el-table-column label="退库数量" prop="refund_nums" show-overflow-tooltip />
-					<el-table-column label="订单类型" prop="order_type_name" show-overflow-tooltip />
-					<el-table-column label="状态" prop="status">
-						<template #default="{ row }">
-							<el-tag type="success" v-if="row.status === 1">已入库</el-tag>
-							<el-tag type="warning" v-else-if="row.status === 0">待确认</el-tag>
-							<el-tag type="danger" v-else-if="row.status === -1">库存不足</el-tag>
-						</template>
-					</el-table-column>
-					<el-table-column label="备注" prop="mark" />
-					<el-table-column label="创建时间" prop="create_time" />
-					<el-table-column label="操作" width="120" fixed="right">
-						<template #default="{ row }">
-							<el-button v-if="row.status == 0"
-								v-perms="['system_store_storage.system_store_storage/edit']" type="success" link
-								@click="handleEdit(row)">
-								确认入库
-							</el-button>
-							<el-button v-if="row.status == 1 && row.refund_nums < row.nums" type="danger" link @click="showRollback(row)">
-								退库
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-	</div>
-</template>
-
-<script lang="ts" setup name="systemStoreStorageLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import {
-		apiSystemStoreStorageLists,
-		apiSystemStoreStorageDelete,
-		apiSystemStoreStorageEdit,
-		apiSystemStoreStorageRollback,
-		apiSystemStoreStorageBatchConfirm
-	} from '@/api/system_store_storage'
-	import { apiSystemStoreLists } from '@/api/system_store'
-	import { timeFormat } from '@/utils/util'
-	import feedback from '@/utils/feedback'
-	import EditPopup from './edit.vue'
-	import { size } from 'lodash-es'
-	import { ElMessageBox } from 'element-plus'
-	const showRollback = async (row: any) => {
-		await ElMessageBox.prompt('请输入退库数量', '退库', {
-			confirmButtonText: '确认',
-			cancelButtonText: '取消'
-		}).then(({ value }) => {
-			handleRollback(row.id, value)
-		})
-	}
-
-	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-	// 是否显示编辑框
-	const showEdit = ref(false)
-
-	// 查询条件
-	const queryParams = reactive({
-		store_id: '',
-		admin_name: '',
-		staff_name: '',
-		status: '',
-		product_name: '',
-		type: 1
-	})
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiSystemStoreStorageLists,
-		params: queryParams
-	})
-
-	// 添加
-	const handleAdd = async () => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('add')
-	}
-
-	// 编辑
-	const handleEdit = async (data : any) => {
-		await feedback.confirm('确定要入库吗？')
-		apiSystemStoreStorageEdit({
-			id: data.id
-		}).then((res) => {
-			getLists()
-		})
-	}
-
-	const handleRollback = async (id, number) => {
-		await apiSystemStoreStorageRollback({
-			id: id,
-			num: number
-		}).then((res) => {
-			getLists()
-		})
-	}
-
-	// 删除
-	const handleDelete = async (id : number | any[]) => {
-		await feedback.confirm('确定要删除？')
-		await apiSystemStoreStorageDelete({ id })
-		getLists()
-	}
-
-	const batchConfirm = async () => {
-		await apiSystemStoreStorageBatchConfirm(queryParams)
-		getLists()
-	}
-
-	getLists()
-
-	const storeloading = ref(false)
-	const storeList = ref([])
-	const remoteMethod = (e = '') => {
-		storeloading.value = true
-		apiSystemStoreLists({
-			name: e,
-			page_size: 50
-		})
-			.then((res) => {
-				storeList.value = res.lists
-				setTimeout(() => {
-					storeloading.value = false
-				}, 300)
-			})
-			.catch((err) => {
-				setTimeout(() => {
-					storeloading.value = false
-				}, 300)
-			})
-	}
-</script>
\ No newline at end of file
diff --git a/src/views/store_product_group_price/details.vue b/src/views/store_product_group_price/details.vue
deleted file mode 100644
index 35c579317..000000000
--- a/src/views/store_product_group_price/details.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="订单详情" :size="700">
-        <el-card class="mb-3" v-for="item in formData" :key="item.id">
-            <div style="display: inline-block; margin-right: 20px">{{ item.title }}:</div>
-            <div style="display: inline-block; margin-right: 20px">供货价:{{ item.purchase }}</div>
-            <div style="display: inline-block; margin-right: 20px">
-                计算方式:
-                <el-select
-                    v-model="item.price_type"
-                    placeholder="请选择计算方式"
-                    style="width: 80px"
-                    @change="handleChange(item)"
-                >
-                    <el-option :value="1" label="加"></el-option>
-                    <el-option :value="2" label="减"></el-option>
-                    <el-option :value="3" label="乘"></el-option>
-                </el-select>
-            </div>
-            <div style="display: inline-block; margin-right: 20px">
-                加价值:<el-input
-                    v-model="item.base_rate"
-                    style="width: 80px"
-                    @change="handleChange(item)"
-                />
-            </div>
-            <div style="display: inline-block; margin-right: 20px">
-                售价:<el-input v-model="item.price" style="width: 80px" />
-            </div>
-        </el-card>
-        <el-button type="primary" @click="handleSubmit">确定</el-button>
-    </el-drawer>
-</template>
-
-<script lang="ts" setup name="storeProductGroupPriceDETAILS">
-import type { FormInstance } from 'element-plus'
-import {
-    apiStoreProductGroupPriceDetail,
-    apiStoreProductGroupPriceEdit
-} from '@/api/store_product_group_price'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const showDialog = ref(false)
-function handleChange(row) {
-    if (row.base_rate > 0 && row.purchase > 0) {
-        if (row.price_type == 1) {
-            row.price = (parseFloat(row.purchase) + parseFloat(row.base_rate)).toFixed(2)
-        } else if (row.price_type == 2) {
-            row.price = (parseFloat(row.purchase) - parseFloat(row.base_rate)).toFixed(2)
-        } else if (row.price_type == 3) {
-            row.price = (parseFloat(row.purchase) * parseFloat(row.base_rate) / 100).toFixed(2)
-        }
-    }
-}
-
-// 表单数据
-const formData = ref([])
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = data
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductGroupPriceDetail({
-        product_id: row.id
-    })
-    setFormData(data)
-}
-const handleSubmit = () => {
-    apiStoreProductGroupPriceEdit(formData.value).then(() => {
-        emit('close')
-    })
-}
-//打开弹窗
-const open = () => {
-    showDialog.value = true
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store_product_group_price/edit.vue b/src/views/store_product_group_price/edit.vue
deleted file mode 100644
index a8e4b6e5d..000000000
--- a/src/views/store_product_group_price/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductGroupPriceEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreProductGroupPriceAdd, apiStoreProductGroupPriceEdit, apiStoreProductGroupPriceDetail } from '@/api/store_product_group_price'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑分组报价' : '新增分组报价'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductGroupPriceDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreProductGroupPriceEdit(data) 
-        : await apiStoreProductGroupPriceAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store_product_group_price/index.vue b/src/views/store_product_group_price/index.vue
deleted file mode 100644
index d5c241af3..000000000
--- a/src/views/store_product_group_price/index.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-button v-perms="['store_product_group_price.store_product_group_price/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['store_product_group_price.store_product_group_price/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button> -->
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                    <el-table-column label="商户价" prop="cost" show-overflow-tooltip />
-                    <el-table-column label="用户vip价" prop="vip_price" show-overflow-tooltip />
-                    <el-table-column label="零售价" prop="price" show-overflow-tooltip />
-                    <el-table-column label="分组价格">
-                        <template #default="{ row }">
-                            <div v-for="(item, index) in row.lists" :key="index">
-                                {{ item.group_name }}:{{ item.price }}
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleDetai(row)"
-                                v-perms="[
-                                    'store_product_group_price.store_product_group_price/edit'
-                                ]"
-                                >详情</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <details-popup
-            v-if="showDetails"
-            ref="detailsRef"
-            @success="getLists"
-            @close="showDetails = false"
-            :dictData="dictData"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductGroupPriceLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiStoreProductGroupPriceLists,
-    apiStoreProductGroupPriceDelete
-} from '@/api/store_product_group_price'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailsPopup from './details.vue'
-
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDetails = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    store_name: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreProductGroupPriceLists,
-    params: queryParams
-})
-
-// 详情
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-getLists()
-</script>
diff --git a/src/views/store_product_low_stock/details.vue b/src/views/store_product_low_stock/details.vue
deleted file mode 100644
index d3169c8ba..000000000
--- a/src/views/store_product_low_stock/details.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="商品id" prop="product_id">
-                    <el-input v-model="formData.product_id" clearable placeholder="请输入商品id" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="门店id" prop="store_id">
-                    <el-input v-model="formData.store_id" clearable placeholder="请输入门店id" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-input v-model="formData.status" clearable placeholder="请输入状态" :readonly="true"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductLowStockDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreProductLowStockAdd, apiStoreProductLowStockEdit, apiStoreProductLowStockDetail } from '@/api/store_product_low_stock'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    product_id: '',
-    store_id: '',
-    status: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductLowStockDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store_product_low_stock/edit.vue b/src/views/store_product_low_stock/edit.vue
deleted file mode 100644
index 606a7e836..000000000
--- a/src/views/store_product_low_stock/edit.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="商品id" prop="product_id">
-                    <el-input v-model="formData.product_id" clearable placeholder="请输入商品id" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="门店id" prop="store_id">
-                    <el-input v-model="formData.store_id" clearable placeholder="请输入门店id" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-input v-model="formData.status" clearable placeholder="请输入状态" :readonly="false"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductLowStockEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreProductLowStockAdd, apiStoreProductLowStockEdit, apiStoreProductLowStockDetail } from '@/api/store_product_low_stock'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品缺库存表' : '新增商品缺库存表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    product_id: '',
-    store_id: '',
-    status: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductLowStockDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreProductLowStockEdit(data) 
-        : await apiStoreProductLowStockAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store_product_low_stock/index.vue b/src/views/store_product_low_stock/index.vue
deleted file mode 100644
index 50dd7fdf4..000000000
--- a/src/views/store_product_low_stock/index.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品id" prop="product_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.product_id"
-                        clearable
-                        placeholder="请输入商品id"
-                    />
-                </el-form-item>
-                <el-form-item label="门店id" prop="store_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_id"
-                        clearable
-                        placeholder="请输入门店id"
-                    />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.status"
-                        clearable
-                        placeholder="请输入状态"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="图片" prop="image" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品" prop="product_name" show-overflow-tooltip />
-                    <el-table-column label="门店" prop="system_store_name" show-overflow-tooltip />
-                    <el-table-column label="库存" prop="stock" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['store_product_low_stock.store_product_low_stock/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductLowStockLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiStoreProductLowStockLists,
-    apiStoreProductLowStockDelete
-} from '@/api/store_product_low_stock'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    product_id: '',
-    store_id: '',
-    status: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreProductLowStockLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreProductLowStockDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/store_product_price/details.vue b/src/views/store_product_price/details.vue
deleted file mode 100644
index c3456fc33..000000000
--- a/src/views/store_product_price/details.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductPriceDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreProductPriceAdd, apiStoreProductPriceEdit, apiStoreProductPriceDetail } from '@/api/store_product_price'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductPriceDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store_product_price/edit.vue b/src/views/store_product_price/edit.vue
deleted file mode 100644
index b20ac83e1..000000000
--- a/src/views/store_product_price/edit.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-	<div class="edit-popup">
-		<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-			@close="handleClose">
-			<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-				<el-form-item label="商品名称" prop="store_name">
-					<el-input v-model="formData.store_name" clearable disabled />
-				</el-form-item>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="供货价比例" prop="purchase_lv">
-							<el-input v-model="formData.purchase_lv" clearable />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="供货价" prop="purchase">
-							<el-input v-model="formData.purchase" clearable />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="商户价比例" prop="cost_lv">
-							<el-input v-model="formData.cost_lv" clearable />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="商户价" prop="cost">
-							<el-input v-model="formData.cost" clearable />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="会员价比例" prop="vip_lv">
-							<el-input v-model="formData.vip_lv" clearable />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="会员价" prop="vip_price">
-							<el-input v-model="formData.vip_price" clearable />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="零售价比例" prop="price_lv">
-							<el-input v-model="formData.price_lv" clearable />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="零售价" prop="price">
-							<el-input v-model="formData.price" clearable />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-		</popup>
-	</div>
-</template>
-
-<script lang="ts" setup name="storeProductPriceEdit">
-	import type { FormInstance } from 'element-plus'
-	import Popup from '@/components/popup/index.vue'
-	import {
-		apiStoreProductPriceAdd,
-		apiStoreProductPriceEdit,
-		apiStoreProductPriceDetail
-	} from '@/api/store_product_price'
-	import { timeFormat } from '@/utils/util'
-	import type { PropType } from 'vue'
-	defineProps({
-		dictData: {
-			type: Object as PropType<Record<string, any[]>>,
-			default: () => ({})
-		}
-	})
-	const emit = defineEmits(['success', 'close'])
-	const formRef = shallowRef<FormInstance>()
-	const popupRef = shallowRef<InstanceType<typeof Popup>>()
-	const mode = ref('add')
-
-	// 弹窗标题
-	const popupTitle = computed(() => {
-		return mode.value == 'edit' ? '编辑商品价格更改' : '新增商品价格更改'
-	})
-
-	// 表单数据
-	const formData = reactive({
-		id: '',
-		purchase_price: '',
-		store_name: '',
-		purchase: '',
-		purchase_lv: '',
-		cost: '',
-		cost_lv: '',
-		price: '',
-		price_lv: '',
-		vip_price: '',
-		vip_lv: '',
-		price_config: []
-	})
-	
-	// 表单验证
-	const formRules = reactive<any>({})
-
-	// 获取详情
-	const setFormData = async (data : Record<any, any>) => {
-		for (const key in formData) {
-			if (data[key] != null && data[key] != undefined) {
-				//@ts-ignore
-				formData[key] = data[key]
-			}
-		}
-	}
-
-	const getDetail = async (row : Record<string, any>) => {
-		const data = await apiStoreProductPriceDetail({
-			id: row.id
-		})
-		setFormData(data)
-	}
-
-	// 提交按钮
-	const handleSubmit = async () => {
-		await formRef.value?.validate()
-		const data = { ...formData }
-		mode.value == 'edit'
-			? await apiStoreProductPriceEdit(data)
-			: await apiStoreProductPriceAdd(data)
-		popupRef.value?.close()
-		emit('success')
-	}
-
-	//打开弹窗
-	const open = (type = 'add') => {
-		mode.value = type
-		popupRef.value?.open()
-	}
-
-	// 关闭回调
-	const handleClose = () => {
-		emit('close')
-	}
-
-	defineExpose({
-		open,
-		setFormData,
-		getDetail
-	})
-</script>
\ No newline at end of file
diff --git a/src/views/store_product_price/index.vue b/src/views/store_product_price/index.vue
deleted file mode 100644
index 1e1769a32..000000000
--- a/src/views/store_product_price/index.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="商品" prop="store_name">
-					<el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入商品" />
-				</el-form-item>
-				<el-form-item label="状态" prop="status">
-					<el-select v-model="queryParams.status" placeholder="请选择状态" style="width: 240px">
-						<el-option :value="0" label="未设置"></el-option>
-						<el-option :value="1" label="已设置"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="日期" prop="timeScope">
-					<el-date-picker v-model="queryParams.timeScope" type="daterange" range-separator="至"
-						start-placeholder="开始日期" end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts"
-						@change="changeStartEndTime" />
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-					<el-button @click="xlsx()">导出</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<div class="mt-4">
-				<el-table :data="pager.lists">
-					<el-table-column label="溯源" width="150">
-						<template #default="{ row }">
-							<div>id: {{ row.id }}</div>
-							<div>预订单id: {{ row.bhoid }}</div>
-							<div>采购源id: {{ row.offer_id }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="仓库" prop="warehouse" show-overflow-tooltip />
-					<el-table-column label="商品信息" width="150" show-overflow-tooltip>
-						<template #default="{ row }">
-							<div>商品名称: {{ row.store_name }}</div>
-							<div>单位: {{ row.unit_name }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="规格" prop="store_info" show-overflow-tooltip />
-					<el-table-column label="商品图片" prop="image" width="120">
-						<template #default="{ row }">
-							<el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
-						</template>
-					</el-table-column>
-					<el-table-column label="采购价" prop="purchase_price" show-overflow-tooltip />
-					<el-table-column label="供货价" prop="purchase" show-overflow-tooltip>
-						<template #default="{ row }">
-							<div>设置价:{{ row.purchase }}|{{ row.purchase_lv }}%</div>
-							<div>当前价:{{ row.current_purchase }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="商户价" prop="cost" show-overflow-tooltip>
-						<template #default="{ row }">
-							<div>设置价:{{ row.cost }}|{{ row.cost_lv }}%</div>
-							<div>当前价:{{ row.current_cost }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="零售价" prop="price" show-overflow-tooltip>
-						<template #default="{ row }">
-							<div>设置价:{{ row.price }}|{{ row.price_lv }}%</div>
-							<div>当前价:{{ row.current_price }}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="状态" prop="status_name" show-overflow-tooltip />
-					<el-table-column label="时间" prop="create_time" show-overflow-tooltip width="180" />
-					<el-table-column label="备注" prop="mark" show-overflow-tooltip />
-					<el-table-column label="操作" width="120" fixed="right">
-						<template #default="{ row }">
-							<el-button v-perms="['store_product_price.store_product_price/edit']" type="primary" link
-								@click="handleEdit(row)" v-if="row.status == 0">
-								编辑
-							</el-button>
-							<el-button v-perms="['store_product_price.store_product_price/delete']" type="danger" link
-								@click="handleEnter(row)" v-if="row.status == 0">
-								确认
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-	</div>
-</template>
-
-<script lang="ts" setup name="storeProductPriceLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import {
-		apiStoreProductPriceLists,
-		apiStoreProductPriceDelete,
-		apiStoreProductPriceExport,
-		apiStoreProductPriceEnterPrice
-	} from '@/api/store_product_price'
-	import { timeFormat } from '@/utils/util'
-	import feedback from '@/utils/feedback'
-	import EditPopup from './edit.vue'
-	import moment from 'moment'
-
-	const shortcuts = [
-		{
-			text: '近一周',
-			value: () => {
-				const end = new Date()
-				const start = new Date()
-				start.setDate(start.getDate() - 7)
-				return [start, end]
-			}
-		},
-		{
-			text: '近一月',
-			value: () => {
-				const end = new Date()
-				const start = new Date()
-				start.setMonth(start.getMonth() - 1)
-				return [start, end]
-			}
-		},
-		{
-			text: '近三月',
-			value: () => {
-				const end = new Date()
-				const start = new Date()
-				start.setMonth(start.getMonth() - 3)
-				return [start, end]
-			}
-		}
-	]
-	const changeStartEndTime = () => {
-		console.log(queryParams.timeScope);
-		if (queryParams.timeScope[0] && queryParams.timeScope[1]) {
-			queryParams.start_time = moment(queryParams.timeScope[0]).format('YYYY-MM-DD') + ' 00:00:00'
-			queryParams.end_time = moment(queryParams.timeScope[1]).format('YYYY-MM-DD') + ' 23:59:59'
-		} else {
-			queryParams.start_time = ''
-			queryParams.end_time = ''
-		}
-	}
-
-	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-	// 是否显示编辑框
-	const showEdit = ref(false)
-
-	// 查询条件
-	const queryParams = reactive({
-		store_name: '',
-		start_time: '',
-		end_time: '',
-		timeScope: [],
-		status: ''
-	})
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiStoreProductPriceLists,
-		params: queryParams
-	})
-
-	// 编辑
-	const handleEdit = async (data : any) => {
-		showEdit.value = true
-		await nextTick()
-		editRef.value?.open('edit')
-		editRef.value?.setFormData(data)
-	}
-
-	// 确认
-	const handleEnter = async (data : any) => {
-		await feedback.confirm('是否改价:' + data.store_name)
-		await apiStoreProductPriceEnterPrice({ id: data.id })
-		getLists()
-	}
-
-	const xlsx = () => {
-		apiStoreProductPriceExport(queryParams).then((res) => {
-			window.open(res.url, '_blank')
-			ElMessage.success('导出成功')
-		})
-	}
-
-	getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/store_product_price_list/details.vue b/src/views/store_product_price_list/details.vue
deleted file mode 100644
index 4d428fd6f..000000000
--- a/src/views/store_product_price_list/details.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="订单详情" :size="700">
-        <el-card class="mb-3" v-for="item in formData" :key="item.id">
-            <div style="display: inline-block; margin-right: 20px">{{ item.title }}:</div>
-            <div style="display: inline-block; margin-right: 20px">供货价:{{ item.purchase }}</div>
-            <div style="display: inline-block; margin-right: 20px">
-                计算方式:
-                <el-select
-                    v-model="item.price_type"
-                    placeholder="请选择计算方式"
-                    style="width: 80px"
-                    @change="handleChange(item)"
-                >
-                    <el-option :value="1" label="加"></el-option>
-                    <el-option :value="2" label="减"></el-option>
-                    <el-option :value="3" label="乘"></el-option>
-                </el-select>
-            </div>
-            <div style="display: inline-block; margin-right: 20px">
-                加价值:<el-input
-                    v-model="item.base_rate"
-                    style="width: 80px"
-                    @change="handleChange(item)"
-                />
-            </div>
-            <div style="display: inline-block; margin-right: 20px">
-                售价:<el-input v-model="item.price" style="width: 80px" />
-            </div>
-        </el-card>
-        <el-button type="primary" @click="handleSubmit">确定</el-button>
-    </el-drawer>
-</template>
-
-<script lang="ts" setup name="storeProductGroupPriceDETAILS">
-import type { FormInstance } from 'element-plus'
-import {
-    apiStoreProductPriceListDetail,
-    apiStoreProductPriceListEdit
-} from '@/api/store_product_price_list'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const showDialog = ref(false)
-function handleChange(row) {
-    if (row.base_rate > 0 && row.purchase > 0) {
-        if (row.price_type == 1) {
-            row.price = (parseFloat(row.purchase) + parseFloat(row.base_rate)).toFixed(2)
-        } else if (row.price_type == 2) {
-            row.price = (parseFloat(row.purchase) - parseFloat(row.base_rate)).toFixed(2)
-        } else if (row.price_type == 3) {
-            row.price = (parseFloat(row.purchase) * parseFloat(row.base_rate) / 100).toFixed(2)
-        }
-    }
-}
-
-// 表单数据
-const formData = ref([])
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = data
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductPriceListDetail({
-        product_id: row.id
-    })
-    setFormData(data)
-}
-const handleSubmit = () => {
-    apiStoreProductPriceListEdit(formData.value).then(() => {
-        emit('close')
-    })
-}
-//打开弹窗
-const open = () => {
-    showDialog.value = true
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store_product_price_list/edit.vue b/src/views/store_product_price_list/edit.vue
deleted file mode 100644
index a8e4b6e5d..000000000
--- a/src/views/store_product_price_list/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductGroupPriceEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreProductGroupPriceAdd, apiStoreProductGroupPriceEdit, apiStoreProductGroupPriceDetail } from '@/api/store_product_group_price'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑分组报价' : '新增分组报价'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreProductGroupPriceDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiStoreProductGroupPriceEdit(data) 
-        : await apiStoreProductGroupPriceAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/store_product_price_list/index.vue b/src/views/store_product_price_list/index.vue
deleted file mode 100644
index d1e675a65..000000000
--- a/src/views/store_product_price_list/index.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-	<div>
-		<el-card class="!border-none mb-4" shadow="never">
-			<el-form class="mb-[-16px]" :model="queryParams" inline>
-				<el-form-item label="商品名称" prop="store_name">
-					<el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入商品名称" />
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="resetPage">查询</el-button>
-					<el-button @click="resetParams">重置</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<div class="mt-4">
-				<el-table :data="pager.lists" @selection-change="handleSelectionChange">
-					<el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-					<el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-					<el-table-column label="商户价" prop="cost" show-overflow-tooltip />
-					<el-table-column label="用户vip价" prop="vip_price" show-overflow-tooltip />
-					<el-table-column label="零售价" prop="price" show-overflow-tooltip />
-					<el-table-column label="操作" width="120" fixed="right">
-						<template #default="{ row }">
-							<el-button type="primary" link @click="handleDetai(row)">详情</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="flex mt-4 justify-end">
-				<pagination v-model="pager" @change="getLists" />
-			</div>
-		</el-card>
-		<details-popup v-if="showDetails" ref="detailsRef" @success="getLists" @close="showDetails = false"
-			:dictData="dictData" />
-	</div>
-</template>
-
-<script lang="ts" setup name="storeProductGroupPriceLists">
-	import { usePaging } from '@/hooks/usePaging'
-	import { useDictData } from '@/hooks/useDictOptions'
-	import {
-		apiStoreProductPriceListLists,
-		apiStoreProductPriceListDelete
-	} from '@/api/store_product_price_list'
-	import { timeFormat } from '@/utils/util'
-	import feedback from '@/utils/feedback'
-	import EditPopup from './edit.vue'
-	import DetailsPopup from './details.vue'
-
-	const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-	// 是否显示编辑框
-	const showEdit = ref(false)
-	const showDetails = ref(false)
-
-	// 查询条件
-	const queryParams = reactive({
-		store_name: ''
-	})
-
-	// 选中数据
-	const selectData = ref<any[]>([])
-
-	// 表格选择后回调事件
-	const handleSelectionChange = (val : any[]) => {
-		selectData.value = val.map(({ id }) => id)
-	}
-
-	// 获取字典数据
-	const { dictData } = useDictData('')
-
-	// 分页相关
-	const { pager, getLists, resetParams, resetPage } = usePaging({
-		fetchFun: apiStoreProductPriceListLists,
-		params: queryParams
-	})
-
-	// 详情
-	const handleDetai = async (data : any) => {
-		showDetails.value = true
-		await nextTick()
-		detailsRef.value?.open()
-		detailsRef.value?.getDetail(data)
-	}
-	getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/supplier/details.vue b/src/views/supplier/details.vue
deleted file mode 100644
index 84db9d9a5..000000000
--- a/src/views/supplier/details.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="商户名称" prop="mer_name">
-                    <el-input v-model="formData.mer_name" clearable placeholder="请输入商户名称" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="商户电话" prop="phone">
-                    <el-input v-model="formData.phone" clearable placeholder="请输入商户电话" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="结算周期，单位天" prop="settle_cycle">
-                    <el-input v-model="formData.settle_cycle" clearable placeholder="请输入结算周期，单位天" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="商户地址" prop="address">
-                    <el-input v-model="formData.address" clearable placeholder="请输入商户地址" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="商户备注" prop="mark">
-                    <el-input v-model="formData.mark" clearable placeholder="请输入商户备注" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-radio-group v-model="formData.status" placeholder="请选择状态" :disabled="true">
-                        <el-radio 
-                            v-for="(item, index) in dictData.show_status"
-                            :key="index"
-                            :label="parseInt(item.value)"
-                        >
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="supplierDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiSupplierAdd, apiSupplierEdit, apiSupplierDetail } from '@/api/supplier'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    mer_name: '',
-    phone: '',
-    settle_cycle: '',
-    address: '',
-    mark: '',
-    status: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiSupplierDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/supplier/edit.vue b/src/views/supplier/edit.vue
deleted file mode 100644
index f3720ba43..000000000
--- a/src/views/supplier/edit.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="商户名称" prop="mer_name">
-                    <el-input
-                        v-model="formData.mer_name"
-                        clearable
-                        placeholder="请输入商户名称"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="商户电话" prop="phone">
-                    <el-input
-                        v-model="formData.phone"
-                        clearable
-                        placeholder="请输入商户电话"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="结算周期" prop="settle_cycle">
-                    <el-input
-                        v-model="formData.settle_cycle"
-                        clearable
-                        placeholder="请输入结算周期，单位天"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="商户地址" prop="address">
-                    <el-input
-                        v-model="formData.address"
-                        clearable
-                        placeholder="请输入商户地址"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="商户备注" prop="mark">
-                    <el-input
-                        v-model="formData.mark"
-                        clearable
-                        placeholder="请输入商户备注"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="supplierEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiSupplierAdd, apiSupplierEdit, apiSupplierDetail } from '@/api/supplier'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑供应商户表' : '新增供应商户表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    mer_name: '',
-    phone: '',
-    settle_cycle: '',
-    address: '',
-    mark: '',
-    status: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    mer_name: [
-        {
-            required: true,
-            message: '请输入商户名称',
-            trigger: ['blur']
-        }
-    ],
-    phone: [
-        {
-            required: true,
-            message: '请输入商户电话',
-            trigger: ['blur']
-        }
-    ],
-    settle_cycle: [
-        {
-            required: true,
-            message: '请输入结算周期，单位天',
-            trigger: ['blur']
-        }
-    ],
-    address: [
-        {
-            required: true,
-            message: '请输入商户地址',
-            trigger: ['blur']
-        }
-    ],
-    status: [
-        {
-            required: true,
-            message: '请选择状态',
-            trigger: ['blur']
-        }
-    ]
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiSupplierDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit' ? await apiSupplierEdit(data) : await apiSupplierAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/supplier/index.vue b/src/views/supplier/index.vue
deleted file mode 100644
index 52fca1bf3..000000000
--- a/src/views/supplier/index.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商户名称" prop="mer_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.mer_name"
-                        clearable
-                        placeholder="请输入商户名称"
-                    />
-                </el-form-item>
-                <el-form-item label="商户电话" prop="phone">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.phone"
-                        clearable
-                        placeholder="请输入商户电话"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['supplier.supplier/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['supplier.supplier/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <!-- <el-table-column label="商户分类 id" prop="category_id" show-overflow-tooltip /> -->
-                    <el-table-column label="商户名称" prop="mer_name" show-overflow-tooltip />
-                    <el-table-column label="商户电话" prop="phone" show-overflow-tooltip />
-                    <el-table-column label="结算周期" prop="settle_cycle" show-overflow-tooltip />
-                    <el-table-column label="商户地址" prop="address" show-overflow-tooltip />
-                    <el-table-column label="商户备注" prop="mark" show-overflow-tooltip />
-                    <el-table-column
-                        label="已结"
-                        prop="total_completed_amount"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleWarehouseProduct(row, 1)"
-                                >{{ row.total_completed_amount || 0 }}</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="未结"
-                        prop="total_outstanding_amount"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <el-button
-                                type="primary"
-                                link
-                                @click="handleWarehouseProduct(row, 0)"
-                                >{{ row.total_outstanding_amount || 0 }}</el-button
-                            >
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['supplier.supplier/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['supplier.supplier/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <warehouseProduct ref="warehouseProductRef"></warehouseProduct>
-    </div>
-</template>
-
-<script lang="ts" setup name="supplierLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupplierLists, apiSupplierDelete } from '@/api/supplier'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import warehouseProduct from './warehouseProduct.vue'
-
-const showWarehouseProduct = ref(false)
-const warehouseProductRef = ref(null)
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    mer_name: '',
-    phone: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-// 商品出入库详情
-const handleWarehouseProduct = async (data: any, type = 1) => {
-    showWarehouseProduct.value = true
-    await nextTick()
-    warehouseProductRef.value?.open()
-    warehouseProductRef.value?.getDetail(data, type)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('show_status')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiSupplierLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiSupplierDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/supplier/warehouseProduct.vue b/src/views/supplier/warehouseProduct.vue
deleted file mode 100644
index 8c352a1f6..000000000
--- a/src/views/supplier/warehouseProduct.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="结算详情" :size="1000" v-model="isOpen">
-            <div>
-                <div>
-                    <el-table :data="pager.lists">
-                        <el-table-column label="id" prop="id" show-overflow-tooltip />
-                        <el-table-column label="商品图片" prop="image" min-width="80">
-                            <template #default="{ row }">
-                                <el-image
-                                    style="width: 50px; height: 50px"
-                                    :src="row.image"
-                                    :preview-teleported="true"
-                                />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
-                        <el-table-column label="仓库" prop="warehouse_name" show-overflow-tooltip />
-                        <el-table-column
-                            label="供应商"
-                            prop="supplier_name"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                        <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                        <el-table-column label="价值" prop="total_price" show-overflow-tooltip />
-                        <el-table-column
-                            label="操作"
-                            width="120"
-                            fixed="right"
-                            v-if="queryParams.is_pay == 0"
-                        >
-                            <template #default="{ row }">
-                                <el-button
-                                    type="primary"
-                                    link
-                                    @click="handlePay(row)"
-                                    v-if="row.is_pay == 0"
-                                >
-                                    结算
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </div>
-                <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                    <pagination v-model="pager" @change="getLists" />
-                </div>
-            </div>
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { apiWarehouseProductLists, apiWarehouseProductSettlement } from '@/api/warehouse_product'
-import type { PropType } from 'vue'
-
-const emit = defineEmits(['success', 'close'])
-const isOpen = ref(false)
-// 查询条件
-const queryParams = reactive({
-    supplier_id: '',
-    is_pay: 1
-})
-const getDetail = async (row: Record<string, any>, type: number) => {
-    queryParams.supplier_id = row.id
-    queryParams.is_pay = type
-
-    getLists()
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true
-}
-const handlePay = (row: Record<string, any>) => {
-    apiWarehouseProductSettlement({ id: row.id }).then((res) => {
-        getLists()
-    })
-}
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseProductLists,
-    params: queryParams
-})
-
-defineExpose({
-    open,
-    getDetail
-})
-</script>
diff --git a/src/views/system_store/details.vue b/src/views/system_store/details.vue
deleted file mode 100644
index 9d5aa6978..000000000
--- a/src/views/system_store/details.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup ref="popupRef" title="详情" :async="true" width="550px" :cancelButtonText="false" :confirmButtonText="false">
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="门店名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入门店名称" :readonly="true" />
-                </el-form-item>
-                <el-form-item label="简介" prop="introduction">
-                    <el-input v-model="formData.introduction" clearable placeholder="请输入简介" :readonly="true" />
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phone">
-                    <el-input v-model="formData.phone" clearable placeholder="请输入手机号码" :readonly="true" />
-                </el-form-item>
-                <el-form-item label="详细地址" prop="detailed_address">
-                    <el-input v-model="formData.detailed_address" clearable placeholder="请输入详细地址" :readonly="true" />
-                </el-form-item>
-                <el-form-item label="门店logo" prop="image">
-                    <el-input v-model="formData.image" clearable placeholder="请输入门店logo" :readonly="true" />
-                </el-form-item>
-                <el-form-item label="是否显示" prop="is_show">
-                    <el-input v-model="formData.is_show" clearable placeholder="请输入是否显示" :readonly="true" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="systemStoreDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiSystemStoreAdd, apiSystemStoreEdit, apiSystemStoreDetail } from '@/api/system_store'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    name: '',
-    introduction: '',
-    phone: '',
-    detailed_address: '',
-    image: '',
-    is_show: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiSystemStoreDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/system_store/edit.vue b/src/views/system_store/edit.vue
deleted file mode 100644
index 4bdf4f0dd..000000000
--- a/src/views/system_store/edit.vue
+++ /dev/null
@@ -1,357 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="600px" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formDataInfo" label-width="90px" :rules="formRules">
-                <el-form-item label="门店logo" prop="image">
-                    <material-picker v-model="formDataInfo.image" :limit="1" />
-                </el-form-item>
-                <el-form-item label="门店名称" prop="name">
-                    <el-input v-model="formDataInfo.name" clearable placeholder="请输入门店名称" :readonly="false" />
-                </el-form-item>
-                <el-form-item label="简介" prop="introduction">
-                    <el-input v-model="formDataInfo.introduction" clearable placeholder="请输入简介" type="textarea" :rows="3"
-                        :readonly="false" />
-                </el-form-item>
-                <el-form-item label="负责人" prop="staff_name">
-                    <el-input v-model="formDataInfo.staff_name" clearable placeholder="请输入负责人姓名" :readonly="false" />
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phone">
-                    <el-input v-model="formDataInfo.phone" clearable placeholder="请输入手机号码/管理员账号"
-                        :readonly="mode == 'edit'" />
-                    <div class="text-sm text-orange-400">输入的手机号将作为管理员账户登录</div>
-                </el-form-item>
-                <el-form-item label="登录密码" prop="password" v-if="mode == 'add'">
-                    <el-input v-model="formDataInfo.password" clearable placeholder="请输入登录密码" :readonly="false" />
-                </el-form-item>
-                <el-form-item label="登录密码" v-else>
-                    <el-input v-model="formDataInfo.password" clearable placeholder="请输入登录密码" :readonly="false" />
-                    <div class="text-sm text-orange-400">不修改请留空</div>
-                </el-form-item>
-                <el-form-item label="保证金" prop="security_deposit">
-                    <el-input v-model="formDataInfo.security_deposit" clearable placeholder="请输入应缴纳保证金" />
-                </el-form-item>
-                <el-form-item label="已缴纳" prop="paid_deposit" v-if="mode!='add'">
-                    <el-input v-model="formDataInfo.paid_deposit" clearable placeholder="已缴纳保证金"
-                        :readonly="true" />
-                </el-form-item>
-                <el-form-item label="银行卡号" prop="bank_code">
-                    <el-input v-model="formDataInfo.bank_code" clearable placeholder="请输入银行卡号" />
-                </el-form-item>
-                <el-form-item label="银行名称" prop="bank">
-                    <el-input v-model="formDataInfo.bank" clearable placeholder="请输入银行名称" />
-                </el-form-item>
-                <el-form-item label="开户地址" prop="bank_address">
-                    <el-input v-model="formDataInfo.bank_address" clearable placeholder="请输入开户地址" />
-                </el-form-item>
-                <el-form-item label="姓名" prop="realname">
-                    <el-input v-model="formDataInfo.realname" clearable placeholder="请输入姓名" />
-                </el-form-item>
-                <el-form-item label="营业状态" prop="is_show">
-                    <el-switch v-model="formDataInfo.is_show" :active-value="1" :inactive-value="0" active-text="营业"
-                        inactive-text="打烊" inline-prompt />
-                </el-form-item>
-                <el-form-item label="营业时间" prop="startEndTime">
-                    <el-time-picker v-model="formDataInfo.startEndTime"
-                        :default-value="[new Date(2024, 6, 1, 8, 0), new Date(2024, 6, 1, 22, 0)]" is-range
-                        start-placeholder="开始时间" end-placeholder="结束时间" />
-                </el-form-item>
-                <el-form-item label="门店地址" prop="selectedValues">
-                    <el-cascader v-model="formDataInfo.selectedValues" :options="options" :props="props" :load="loadOptions"
-                        class="w-full" />
-                </el-form-item>
-                <el-form-item label="详细地址" prop="detailed_address">
-                    <el-input v-model="formDataInfo.detailed_address" clearable placeholder="请输入详细地址" :readonly="false" />
-                </el-form-item>
-                <el-form-item label="到店自提" prop="is_store">
-                    <el-switch v-model="formDataInfo.is_store" :active-value="1" :inactive-value="0" active-text="开启"
-                        inactive-text="关闭" inline-prompt disabled />
-                </el-form-item>
-                <el-form-item label="同城配送" prop="is_send">
-                    <el-switch v-model="formDataInfo.is_send" :active-value="1" :inactive-value="0" active-text="开启"
-                        inactive-text="关闭" inline-prompt />
-                </el-form-item>
-                <el-form-item label="具体坐标" prop="coord">
-                    <div class="flex w-full">
-                        <el-input v-model="formDataInfo.coord" clearable placeholder="请输入具体坐标, 例如116.403872, 39.904989"
-                            class="flex-1 mr-4" :readonly="false" />
-                        <a href="https://lbs.qq.com/getPoint/" target="_blank"><el-button
-                                type="primary">获取坐标</el-button></a>
-                    </div>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="systemStoreEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiSystemStoreAdd, apiSystemStoreEdit, apiSystemStoreDetail } from '@/api/system_store'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { apiProvince, apiCity, apiArea, apiStreet } from "@/api/public"
-import { ElMessage } from 'element-plus'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店列表' : '新增门店列表'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    name: '',
-    introduction: '',
-    phone: '',
-    detailed_address: '',
-    image: '',
-    is_show: 1,
-    password: "",
-    staff_name: "",
-    is_store: 1,
-    is_send: 0,
-    security_deposit: "",
-    paid_deposit: "",
-    bank: "",
-    bank_code: "",
-    bank_address: "",
-    realname: ""
-})
-
-const formDataInfo = reactive({
-    id: '',
-    name: '',
-    introduction: '',
-    phone: '',
-    detailed_address: '',
-    image: '',
-    is_show: 1,
-    password: "",
-    staff_name: "",
-    is_store: 1,
-    is_send: 0,
-    coord: '',
-    startEndTime: [],
-    selectedValues: [],
-    security_deposit: "",
-    paid_deposit: "",
-    bank: "",
-    bank_code: "",
-    bank_address: "",
-    realname: ""
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    name: [{
-        required: true,
-        message: '请输入门店名称',
-        trigger: ['blur']
-    }],
-    phone: [{
-        required: true,
-        message: '请输入手机号码',
-        trigger: ['blur']
-    }],
-    staff_name: [{
-        required: true,
-        message: '请输入负责人姓名',
-        trigger: ['blur']
-    }],
-    password: [{
-        required: true,
-        message: '请输入登录密码',
-        trigger: ['blur']
-    }],
-    detailed_address: [{
-        required: true,
-        message: '请输入详细地址',
-        trigger: ['blur']
-    }],
-    security_deposit: [{
-        required: true,
-        message: '请输入保证金',
-        trigger: ['blur', 'change']
-    }],
-    image: [{
-        required: true,
-        message: '请输入门店logo',
-        trigger: ['blur', 'change']
-    }],
-    coord: [{
-        required: true,
-        message: '请输入坐标',
-        trigger: ['blur']
-    }],
-    startEndTime: [{
-        required: true,
-        message: '请选择营业时间',
-        trigger: ['blur', 'change']
-    }],
-    selectedValues: [{
-        required: true,
-        message: '请选择门店地址',
-        trigger: ['blur', 'change']
-    }]
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            // formData[key] = data[key]
-            formDataInfo[key] = data[key]
-        }
-    }
-
-    if (data.province && data.city && data.area && data.street) {
-        formDataInfo.selectedValues = [data.province + '', data.city + '', data.area + '', data.street + ''];
-    } else formDataInfo.selectedValues = [];
-    if (data.latitude && data.longitude) {
-        formDataInfo.coord = data.latitude + ',' + data.longitude;
-    } else formDataInfo.coord = '';
-    if (data.day_start && data.day_end) {
-        formDataInfo.startEndTime = [new Date(2024, 6, 1, data.day_start.split(':')[0], data.day_start.split(':')[1]), new Date(2024, 6, 1, data.day_end.split(':')[0], data.day_end.split(':')[1])];
-    } else formDataInfo.startEndTime = [];
-}
-
-
-// 获取详情
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiSystemStoreDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    Object.keys(formData).forEach((key: string) => {
-        if (formDataInfo[key] !== '' && formDataInfo[key] !== null && formDataInfo[key] !== undefined) formData[key] = formDataInfo[key];
-    })
-    const data = { ...formData };
-    if (mode.value == 'edit' && !data.password) data.password = '';
-    const test = /^[+-]?\d*(\.\d+)?$/;
-    let latlng = formDataInfo.coord.split(',');
-    if (latlng.length < 2 || !test.test(latlng[0]) || !test.test(latlng[1])) return ElMessage.error('请输入正确的坐标');
-    data.latitude = latlng[0];
-    data.longitude = latlng[1];
-    data.day_start = timeFormat(formDataInfo.startEndTime[0], 'hh:MM')
-    data.day_end = timeFormat(formDataInfo.startEndTime[1], 'hh:MM')
-    data.province_code = formDataInfo.selectedValues[0]
-    data.city_code = formDataInfo.selectedValues[1]
-    data.area_code = formDataInfo.selectedValues[2]
-    data.street_code = formDataInfo.selectedValues[3]
-    delete data.paid_deposit;
-    mode.value == 'edit'
-        ? await apiSystemStoreEdit(data)
-        : await apiSystemStoreAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-const options = ref([]);
-
-// 异步加载数据的方法
-const loadOptions = async (node: any, resolve: any) => {
-    const level = node.level;
-    let response;
-    if (level !== 0 && !node.data.code) return resolve([]);
-    if (level === 0) {
-        response = await apiProvince();
-        response = response.map((item: any) => {
-            return {
-                code: item.province_code,
-                name: item.province_name
-            }
-        })
-    } else if (level === 1) {
-        response = await apiCity({
-            code: node.data.code
-        });
-        response = response.map((item: any) => {
-            return {
-                code: item.city_code,
-                name: item.city_name
-            }
-        })
-    } else if (level === 2) {
-        response = await apiArea({
-            code: node.data.code
-        });
-        response = response.map((item: any) => {
-            return {
-                code: item.area_code,
-                name: item.area_name
-            }
-        })
-    }
-    else {
-        response = await apiStreet({
-            code: node.data.code
-        });
-        response = response.map((item: any) => {
-            return {
-                code: item.street_code,
-                name: item.street_name,
-                leaf: true
-            }
-        })
-    }
-
-    resolve(response);
-};
-const props = {
-    value: 'code',
-    label: 'name',
-    children: 'children',
-    lazy: true,
-    lazyLoad: loadOptions
-};
-
-
-// 初始化第一级数据
-onMounted(async () => {
-    const response = await apiProvince();
-    options.value = response.map((item: any) => {
-        return {
-            code: item.province_code,
-            name: item.province_name
-        }
-    });
-});
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/system_store/index.vue b/src/views/system_store/index.vue
deleted file mode 100644
index d94d34d30..000000000
--- a/src/views/system_store/index.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店名称" prop="name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.name"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入门店名称"
-                    />
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phone">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.phone"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入手机号码"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-segmented v-model="storeType" :options="['全部', '营业中', '未营业']" size="large" /> -->
-            <el-button
-                v-perms="['system_store.system_store/add']"
-                type="primary"
-                @click="handleAdd"
-            >
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['system_store.system_store/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="门店logo" prop="image" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-image
-                                :src="row.image"
-                                class="w-[50px] h-[50px]"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="负责人" prop="staff_name" show-overflow-tooltip />
-                    <el-table-column label="门店名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="门店地址" prop="detailed_address" />
-                    <el-table-column label="手机号码" prop="phone" show-overflow-tooltip />
-                    <el-table-column label="保证金" prop="phone">
-                        <template #default="{ row }">
-                            <div>应缴纳: {{ row.security_deposit || '-' }}</div>
-                            <div>
-                                已缴纳:
-                                <span class="text-danger">{{ row.paid_deposit || '-' }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="营业时间" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.day_start }} - {{ row.day_end }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="营业状态" prop="is_show" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.is_show ? '营业' : '打烊' }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="180" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['system_store.system_store/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <a
-                                href="https://admin-store.lihaink.cn/store/"
-                                target="_blank"
-                                class="ml-2"
-                            >
-                                <el-button
-                                    v-perms="['system_store.system_store/edit']"
-                                    type="primary"
-                                    link
-                                >
-                                    进入门店
-                                </el-button>
-                            </a>
-                            <el-button type="primary" link
-                                ><router-link
-                                    :to="{
-                                        path: '/user/userList',
-                                        query: { store_id: row.id }
-                                    }"
-                                    >门店会员</router-link
-                                >
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="systemStoreLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiSystemStoreLists, apiSystemStoreDelete } from '@/api/system_store'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 营业状态编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    name: '',
-    phone: '',
-    is_show: ''
-})
-const storeType = ref('全部')
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiSystemStoreLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.getDetail(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiSystemStoreDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/user/components/balance.vue b/src/views/user/components/balance.vue
deleted file mode 100644
index 36d497c39..000000000
--- a/src/views/user/components/balance.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-    <div>
-        <el-table :data="pager.lists">
-            <!-- <el-table-column label="id" prop="lab" show-overflow-tooltip /> -->
-            <el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
-            <el-table-column label="金额" prop="amount">
-                <template #default="{ row }">
-                    <span class="text-success" v-if="row.type!='out'"> +{{ row.amount }}</span>
-                    <span class="text-danger" v-else> -{{ row.amount }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-            <el-table-column label="备注" prop="title" show-overflow-tooltip />
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="balance">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserFoundList } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const props = defineProps({
-    user_id: {
-        type: [Number, String],
-        required: true
-    }
-})
-
-// 查询条件
-const queryParams = reactive({
-    id: props.user_id,
-    type: 2
-})
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserFoundList,
-    params: queryParams
-})
-
-const getList = (e: any) => {
-    queryParams.id = e.id;
-    getLists();
-}
-
-defineExpose({
-    getLists,
-    getList
-})
-</script>
diff --git a/src/views/user/components/freeze.vue b/src/views/user/components/freeze.vue
deleted file mode 100644
index 3113186aa..000000000
--- a/src/views/user/components/freeze.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-    <div>
-        <el-table :data="pager.lists">
-            <el-table-column label="订单号" prop="order_id" show-overflow-tooltip />
-            <!-- <el-table-column label="金额" prop="number" show-overflow-tooltip /> -->
-            <el-table-column label="金额" prop="number">
-                <template #default="{ row }">
-                    <span class="text-success" v-if="row.type!='out'"> +{{ row.number }}</span>
-                    <span class="text-danger" v-else> -{{ row.number }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-            <el-table-column label="备注" prop="title" show-overflow-tooltip />
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="freeze">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserSingList } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const props = defineProps({
-    user_id: {
-        type: [Number, String],
-        required: true
-    }
-})
-
-// 查询条件
-const queryParams = reactive({
-    uid: props.user_id,
-})
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserSingList,
-    params: queryParams
-})
-
-const getList = (e: any) => {
-    queryParams.uid = e.id;
-    getLists();
-}
-
-defineExpose({
-    getLists,
-    getList
-})
-</script>
diff --git a/src/views/user/components/merchandise.vue b/src/views/user/components/merchandise.vue
deleted file mode 100644
index 5f23c5f25..000000000
--- a/src/views/user/components/merchandise.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-    <div>
-        <el-table :data="pager.lists">
-            <el-table-column label="订单号" prop="order_id" show-overflow-tooltip />
-            <!-- <el-table-column label="金额" prop="number" show-overflow-tooltip /> -->
-            <el-table-column label="金额" prop="number">
-                <template #default="{ row }">
-                    <span class="text-success" v-if="row.type!='out'"> +{{ row.number }}</span>
-                    <span class="text-danger" v-else> -{{ row.number }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-            <el-table-column label="备注" prop="title" show-overflow-tooltip />
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="merchandise">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserFoundList } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const props = defineProps({
-    user_id: {
-        type: [Number, String],
-        required: true
-    }
-})
-
-// 查询条件
-const queryParams = reactive({
-    id: props.user_id,
-    type: 3
-})
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserFoundList,
-    params: queryParams
-})
-
-const getList = (e: any) => {
-    queryParams.id = e.id;
-    getLists();
-}
-
-defineExpose({
-    getLists,
-    getList
-})
-</script>
diff --git a/src/views/user/components/now_money.vue b/src/views/user/components/now_money.vue
deleted file mode 100644
index 9b20914bf..000000000
--- a/src/views/user/components/now_money.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            title="修改用户余额"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-            ref="popupRef"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="修改余额" prop="username">
-                    <el-radio-group v-model="formData.type">
-                        <el-radio value="1" size="large" label="1">增加</el-radio>
-                        <el-radio value="-1" size="large" label="-1">减少</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="金额">
-                    <el-input-number v-model="formData.now_money" :min="0.01" :max="99999" />
-                </el-form-item>
-                <el-form-item label="备注">
-                    <el-input v-model="formData.mark" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="balance">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { setnowMoney } from '@/api/user'
-
-const formRef = shallowRef<FormInstance>()
-const emit = defineEmits(['success', 'close'])
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    type: '1',
-    now_money: '',
-    mark: ''
-})
-//打开弹窗
-const open = (type = 'add') => {
-    popupRef.value?.open()
-}
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    await setnowMoney(data)
-    // const data = { ...formData }
-    // await apiUserEdit(data)
-
-    popupRef.value?.close()
-    emit('success')
-}
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.id = data.id
-}
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/user/components/purchase.vue b/src/views/user/components/purchase.vue
deleted file mode 100644
index 003a164d9..000000000
--- a/src/views/user/components/purchase.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-    <div>
-        <el-table :data="pager.lists">
-            <el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
-            <el-table-column label="金额" prop="amount">
-                <template #default="{ row }">
-                    <span class="text-success" v-if="row.type!='out'"> +{{ row.amount }}</span>
-                    <span class="text-danger" v-else> -{{ row.amount }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-            <el-table-column label="备注" prop="title" show-overflow-tooltip />
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="purchase">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserFoundList } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const props = defineProps({
-    user_id: {
-        type: [Number, String],
-        required: true
-    }
-})
-
-// 查询条件
-const queryParams = reactive({
-    id: props.user_id,
-    type: 1
-})
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserFoundList,
-    params: queryParams
-})
-
-const getList = (e: any) => {
-    queryParams.id = e.id;
-    getLists();
-}
-
-defineExpose({
-    getLists,
-    getList
-})
-</script>
diff --git a/src/views/user/components/purchase_funds.vue b/src/views/user/components/purchase_funds.vue
deleted file mode 100644
index 1ea6ed94b..000000000
--- a/src/views/user/components/purchase_funds.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            title="修改用户采购款"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-            ref="popupRef"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="修改采购款" prop="username">
-                    <el-radio-group v-model="formData.type">
-                        <el-radio value="1" size="large" label="1">增加</el-radio>
-                        <el-radio value="-1" size="large" label="-1">减少</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="金额">
-                    <el-input-number v-model="formData.purchase_funds" :min="0.01" :max="99999" />
-                </el-form-item>
-                <el-form-item label="备注">
-                    <el-input v-model="formData.mark" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="balance">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { setPurchaseFunds } from '@/api/user'
-
-const formRef = shallowRef<FormInstance>()
-const emit = defineEmits(['success', 'close'])
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    type: '1',
-    purchase_funds: '',
-    mark: ''
-})
-//打开弹窗
-const open = (type = 'add') => {
-    popupRef.value?.open()
-}
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    await setPurchaseFunds(data)
-    // const data = { ...formData }
-    // await apiUserEdit(data)
-
-    popupRef.value?.close()
-    emit('success')
-}
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.id = data.id
-}
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/user/components/receiveGifts.vue b/src/views/user/components/receiveGifts.vue
deleted file mode 100644
index 87d0d55e7..000000000
--- a/src/views/user/components/receiveGifts.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-    <div>
-        <el-table :data="pager.lists">
-            <el-table-column label="门店" prop="store_name" show-overflow-tooltip />
-            <el-table-column label="门店电话" prop="store_phone" show-overflow-tooltip />
-            <el-table-column label="商品" prop="number" min-width="200">
-                <template #default="{ row }">
-                    <div class="flex items-center">
-                        <el-image :src="row.image" class="w-8 h-8 mr-2" />
-                        <span>{{ row.goods_name }}</span>
-                    </div>
-                </template>
-            </el-table-column>
-            <el-table-column label="数量" prop="nums" />
-            <el-table-column label="价值" prop="price" />
-            <el-table-column label="创建时间" prop="create_time" min-width="120" />
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="receiveGifts">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserGiftList } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const props = defineProps({
-    user_id: {
-        type: [Number, String],
-        required: true
-    }
-})
-
-// 查询条件
-const queryParams = reactive({
-    id: props.user_id,
-})
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserGiftList,
-    params: queryParams
-})
-
-const getList = (e: any) => {
-    queryParams.id = e.id;
-    getLists();
-}
-
-defineExpose({
-    getLists,
-    getList
-})
-</script>
diff --git a/src/views/user/components/returnMoney.vue b/src/views/user/components/returnMoney.vue
deleted file mode 100644
index 3226af5f2..000000000
--- a/src/views/user/components/returnMoney.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-    <div>
-        <el-table :data="pager.lists">
-            <el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
-            <!-- <el-table-column label="金额" prop="number" show-overflow-tooltip /> -->
-            <el-table-column label="金额" prop="number">
-                <template #default="{ row }">
-                    <span class="text-success" v-if="row.type!='out'"> +{{ row.number }}</span>
-                    <span class="text-danger" v-else> -{{ row.number }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-            <el-table-column label="备注" prop="title" show-overflow-tooltip />
-        </el-table>
-        <div class="flex mt-4 justify-end">
-            <pagination v-model="pager" @change="getLists" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup name="returnMoney">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserFoundList } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-
-const props = defineProps({
-    user_id: {
-        type: [Number, String],
-        required: true
-    }
-})
-
-// 查询条件
-const queryParams = reactive({
-    id: props.user_id,
-    type: 4
-})
-
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserFoundList,
-    params: queryParams
-})
-
-const getList = (e: any) => {
-    queryParams.id = e.id;
-    getLists();
-}
-
-defineExpose({
-    getLists,
-    getList
-})
-</script>
diff --git a/src/views/user/details.vue b/src/views/user/details.vue
deleted file mode 100644
index d83fd8d90..000000000
--- a/src/views/user/details.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <el-drawer title="用户详情" :size="1200" v-model="isOpen">
-            <div class="flex mb-4">
-                <el-avatar :src="formData.avatar" size="large"></el-avatar>
-                <div class="ml-4 flex flex-col justify-around">
-                    <div>昵称: {{ formData.nickname }}</div>
-                    <div>电话: {{ formData.mobile }}</div>
-                </div>
-                <div class="ml-8 flex flex-col justify-around">
-                    <div>账号: {{ formData.account }}</div>
-                    <div>ID: {{ formData.id }}</div>
-                </div>
-            </div>
-            <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                <el-tab-pane label="基础信息" name="first">
-                    <el-descriptions class="margin-top" :column="2" border>
-                        <el-descriptions-item label="真实姓名">
-                            {{ formData.real_name }}
-                        </el-descriptions-item>
-                        <el-descriptions-item label="用户性别">
-                            <dict-value :options="dictData.sex" :value="formData.sex" />
-                        </el-descriptions-item>
-                        <el-descriptions-item label="注册渠道">
-                            {{ formData.channel }}
-                        </el-descriptions-item>
-                        <el-descriptions-item label="用户类型">
-                            {{ formData.vip_name }}
-                        </el-descriptions-item>
-                        <el-descriptions-item label="用户标签">{{ formData.label_name }}</el-descriptions-item>
-                        <el-descriptions-item label="礼品券">{{ formData.integral }}</el-descriptions-item>
-                        <el-descriptions-item label="返还金">{{ Number(formData.return_money).toFixed(2) }}</el-descriptions-item>
-                        <el-descriptions-item label="采购款">{{ formData.purchase_funds }}</el-descriptions-item>
-                        <el-descriptions-item label="用户余额">{{ formData.now_money }}</el-descriptions-item>
-                        <el-descriptions-item label="累计充值金额">{{ formData.total_recharge_amount }}</el-descriptions-item>
-                        <el-descriptions-item label="用户地址" :span="2">{{ formData.format_address }}</el-descriptions-item>
-                        <el-descriptions-item label="创建时间" :span="2">{{ formData.create_time }}</el-descriptions-item>
-                    </el-descriptions>
-                </el-tab-pane>
-                <el-tab-pane label="采购款明细" name="second">
-                    <purchase ref="purchaseRef" :user_id="formData.id" :key="key + 'a'" />
-                </el-tab-pane>
-                <el-tab-pane label="余额明细" name="three">
-                    <balance ref="balanceRef" :user_id="formData.id" :key="key + 'b'" />
-                </el-tab-pane>
-                <el-tab-pane label="礼品券明细" name="four">
-                    <merchandise ref="merchandiseRef" :user_id="formData.id" :key="key + 'c'" />
-                </el-tab-pane>
-                <el-tab-pane label="冻结券明细" name="seven">
-                    <freeze ref="freezeRef" :user_id="formData.id" :key="key + 'c'" />
-                </el-tab-pane>
-                <el-tab-pane label="返还金明细" name="five">
-                    <returnMoney ref="returnMoneyRef" :user_id="formData.id" :key="key + 'd'" />
-                </el-tab-pane>
-                <el-tab-pane label="赠品领取记录" name="six">
-                    <receiveGifts ref="receiveGiftsRef" :user_id="formData.id" :key="key + 'e'" />
-                </el-tab-pane>
-            </el-tabs>
-
-        </el-drawer>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeProductDETAILS">
-import { usePaging } from '@/hooks/usePaging'
-import { ElMessage, type FormInstance } from 'element-plus'
-import { apiUserDetail } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import feedback from '@/utils/feedback'
-import purchase from './components/purchase.vue'
-import balance from './components/balance.vue'
-import merchandise from './components/merchandise.vue'
-import freeze from './components/freeze.vue'
-import returnMoney from './components/returnMoney.vue'
-import receiveGifts from './components/receiveGifts.vue'
-
-const purchaseRef = ref(null)
-const balanceRef = ref(null)
-const merchandiseRef = ref(null)
-const freezeRef = ref(null)
-const returnMoneyRef = ref(null)
-const receiveGiftsRef = ref(null)
-const key = ref(0);
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const isOpen = ref(false);
-const activeName = ref('first');
-const handleClick = (tab: any) => {
-    if (tab.paneName == "second") purchaseRef.value?.getList({ id: formData.id });
-    if (tab.paneName == "three") balanceRef.value?.getList({ id: formData.id });
-    if (tab.paneName == "four") merchandiseRef.value?.getList({ id: formData.id });
-    if (tab.paneName == "seven") freezeRef.value?.getList({ id: formData.id });
-    if (tab.paneName == "five") returnMoneyRef.value?.getList({ id: formData.id });
-    if (tab.paneName == "six") receiveGiftsRef.value?.getList({ id: formData.id });
-};
-
-// 表单数据
-const formData = reactive({
-    "id": "",
-    "nickname": "",
-    "real_name": "",
-    "sex": 0,
-    "avatar": "",
-    "account": "",
-    "mobile": "",
-    "channel": "",
-    "create_time": "",
-    "purchase_funds": "",
-    "format_address": "",
-    "label_id": 0,
-    "integral": "",
-    "vip_name": "",
-    "discount": 0,
-    "limit": 0,
-    "label_name": "",
-    "sex_text": "",
-    "user_address": "",
-    "return_money": 0,
-    "total_recharge_amount": "",
-    "now_money": ""
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    queryParams.product_id = data.id;
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    handleClick({
-        paneName: activeName.value
-    })
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    queryParams.product_id = row.id
-    const data = await apiUserDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    isOpen.value = true;
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-// 查询条件
-const queryParams = reactive({
-    product_id: "",
-})
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/user/edit.vue b/src/views/user/edit.vue
deleted file mode 100644
index a75e788ce..000000000
--- a/src/views/user/edit.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="用户标签" prop="username">
-                    <el-select class="flex-1" v-model="formData.label_id">
-                        <el-option
-                            v-for="item in labelList"
-                            :key="item.label_id"
-                            :label="item.label_name"
-                            :value="item.label_id"
-                        />
-                    </el-select>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserAdd, apiUserEdit, apiUserDetail } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import { apiUserLabelLists, apiUserLabelDelete } from '@/api/user_label'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-const labelList = ref([])
-
-const initList = ()=>{
-    apiUserLabelLists({
-        page_size: 9999
-    }).then(res=>{
-        labelList.value = res.lists;
-    })
-}
-initList();
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑用户' : '新增用户'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    label_id: ''
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    if(!formData.label_id) formData.label_id = ''
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiUserEdit(data) 
-        : await apiUserAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/user/indexList.vue b/src/views/user/indexList.vue
deleted file mode 100644
index 35063ba13..000000000
--- a/src/views/user/indexList.vue
+++ /dev/null
@@ -1,329 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="用户昵称" prop="nickname">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.nickname"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入用户昵称"
-                    />
-                </el-form-item>
-                <el-form-item label="用户账号" prop="account">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.account"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入用户账号"
-                    />
-                </el-form-item>
-                <el-form-item label="用户电话" prop="mobile">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.mobile"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入用户电话"
-                    />
-                </el-form-item>
-                <el-form-item label="用户类型" prop="user_ship">
-                    <el-select
-                        class="w-[280px]"
-                        v-model="queryParams.user_ship"
-                        placeholder="请选择用户类型"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            :label="item.title"
-                            :value="item.id"
-                            v-for="item in user_ship_data"
-                            :key="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="所属门店" prop="store_id">
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiUserLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-button v-perms="['user.user/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-新增
-</el-button>
-<el-button v-perms="['user.user/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
-    删除
-</el-button> -->
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <!-- <el-table-column type="selection" width="55" /> -->
-                    <el-table-column label="ID" prop="id" min-width="55" />
-                    <!-- <el-table-column label="头像" prop="avatar" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-avatar :src="row.avatar" />
-                        </template>
-                    </el-table-column> -->
-                    <el-table-column label="真实姓名" prop="real_name" />
-                    <el-table-column label="用户昵称" prop="nickname" min-width="100" />
-                    <el-table-column label="用户账号" prop="account" min-width="100" />
-                    <!-- <el-table-column label="用户密码" prop="password" /> -->
-                    <el-table-column label="用户电话" prop="mobile" min-width="100" />
-                    <!-- <el-table-column label="用户性别" prop="sex">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.sex" :value="row.sex" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="注册渠道" prop="channel" /> -->
-                    <el-table-column label="用户类型" prop="vip_name" />
-                    <el-table-column label="开通时间" prop="vip_time" />
-
-                    <!-- <el-table-column label="用户标签" prop="label_name" /> -->
-                    <el-table-column label="礼品券" prop="integral" />
-                    <el-table-column label="返还金" prop="return_money">
-                        <template #default="{ row }">
-                            {{ Number(row.return_money).toFixed(2) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="采购款" prop="purchase_funds" />
-                    <el-table-column label="用户余额" prop="now_money" />
-                    <el-table-column label="累计消费" prop="total_recharge_amount" />
-                    <el-table-column label="地址" prop="format_address" width="150" />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['user.user/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['user.user/detail']"
-                                type="primary"
-                                link
-                                @click="handleDetail(row)"
-                            >
-                                详情
-                            </el-button>
-                            <el-dropdown trigger="click">
-                                <el-button type="primary" link>更多</el-button>
-                                <template #dropdown>
-                                    <el-dropdown-menu>
-                                        <el-dropdown-item
-                                            @click="PurchaseFunds(row)"
-                                            v-perms="['user.user/purchase_funds']"
-                                            >设置采购金</el-dropdown-item
-                                        >
-                                        <el-dropdown-item
-                                            v-perms="['user.user/now_money']"
-                                            @click="NowMoney(row)"
-                                            >设置余额</el-dropdown-item
-                                        >
-                                    </el-dropdown-menu>
-                                </template>
-                            </el-dropdown>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <Details ref="detailsRef" :dict-data="dictData"></Details>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <PurchaseFundsPopup
-            v-if="PurchaseFundsEdit"
-            ref="purchaseFundsRef"
-            @success="getLists"
-            @close="PurchaseFundsEdit = false"
-        />
-        <NowMoneyPopup
-            v-if="nowmoneyRefEdit"
-            ref="nowmoneyRef"
-            @success="getLists"
-            @close="nowmoneyRefEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="userList">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserLists, apiUserDelete } from '@/api/user'
-import { apiUserShipLists } from '@/api/user_ship'
-import { apiSystemStoreLists } from '@/api/system_store'
-
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import PurchaseFundsPopup from './components/purchase_funds.vue'
-import NowMoneyPopup from './components/now_money.vue'
-import Details from './details.vue'
-import moment from 'moment'
-
-const route = useRoute()
-const detailsRef = ref(null)
-const user_ship_data = ref([])
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const purchaseFundsRef = shallowRef<InstanceType<typeof PurchaseFundsPopup>>()
-const nowmoneyRef = shallowRef<InstanceType<typeof NowMoneyPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const PurchaseFundsEdit = ref(false)
-const nowmoneyRefEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    nickname: '',
-    account: '',
-    mobile: '',
-    store_id: route.query.store_id ?? '',
-    user_ship: '',
-    start_time: '',
-    end_time: ''
-})
-apiUserShipLists([]).then((res) => {
-    user_ship_data.value = res.lists
-})
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('sex,system_disable')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-const PurchaseFunds = async (data: any) => {
-    PurchaseFundsEdit.value = true
-    await nextTick()
-    purchaseFundsRef.value?.open('edit')
-    purchaseFundsRef.value?.setFormData(data)
-}
-const NowMoney = async (data: any) => {
-    nowmoneyRefEdit.value = true
-    await nextTick()
-    nowmoneyRef.value?.open('edit')
-    nowmoneyRef.value?.setFormData(data)
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 详情
-const handleDetail = async (data: any) => {
-    detailsRef.value?.open()
-    detailsRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiUserDelete({ id })
-    getLists()
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-const startEndTime = ref([new Date(), new Date()])
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/user/setting.vue b/src/views/user/setting.vue
deleted file mode 100644
index 4341d9abb..000000000
--- a/src/views/user/setting.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<!-- 个人资料 -->
-<template>
-    <div class="user-setting">
-        <el-card class="!border-none" shadow="never">
-            <el-form
-                ref="formRef"
-                class="ls-form"
-                :model="formData"
-                :rules="rules"
-                label-width="100px"
-            >
-                <el-form-item label="头像：" prop="avatar">
-                    <material-picker v-model="formData.avatar" :limit="1" />
-                </el-form-item>
-
-                <el-form-item label="账号：" prop="account">
-                    <div class="w-80">
-                        <el-input v-model="formData.account" disabled />
-                    </div>
-                </el-form-item>
-
-                <el-form-item label="名称：" prop="name">
-                    <div class="w-80">
-                        <el-input v-model="formData.name" placeholder="请输入名称" />
-                    </div>
-                </el-form-item>
-
-                <el-form-item label="当前密码：" prop="password_old">
-                    <div class="w-80">
-                        <el-input
-                            v-model.trim="formData.password_old"
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
-                    </div>
-                </el-form-item>
-
-                <el-form-item label="新的密码：" prop="password">
-                    <div class="w-80">
-                        <el-input
-                            v-model.trim="formData.password"
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
-                    </div>
-                </el-form-item>
-
-                <el-form-item label="确定密码：" prop="password_confirm">
-                    <div class="w-80">
-                        <el-input
-                            v-model.trim="formData.password_confirm"
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
-                    </div>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <footer-btns>
-            <el-button type="primary" @click="handleSubmit">保存</el-button>
-        </footer-btns>
-    </div>
-</template>
-
-<script setup lang="ts" name="userSetting">
-import { setUserInfo } from '@/api/user'
-import useUserStore from '@/stores/modules/user'
-import feedback from '@/utils/feedback'
-import type { FormInstance } from 'element-plus'
-const formRef = ref<FormInstance>()
-const userStore = useUserStore()
-// 表单数据
-const formData = reactive({
-    avatar: '', // 头像
-    account: '', // 账号
-    name: '', // 名称
-    password_old: '', // 当前密码
-    password: '', // 新的密码
-    password_confirm: '' // 确定密码
-})
-
-// 表单校验规则
-const rules = reactive<object>({
-    avatar: [
-        {
-            required: true,
-            message: '头像不能为空',
-            trigger: ['change']
-        }
-    ],
-    name: [
-        {
-            required: true,
-            message: '请输入名称',
-            trigger: ['blur']
-        }
-    ]
-})
-
-// 获取个人设置
-const getUser = async () => {
-    const userInfo = userStore.userInfo
-    for (const key in formData) {
-        //@ts-ignore
-        formData[key] = userInfo[key]
-    }
-}
-
-// 设置个人设置
-const setUser = async () => {
-    if (formData.password_old || formData.password || formData.password_confirm) {
-        if (!formData.password_old) {
-            return feedback.msgError('请输入当前密码')
-        }
-
-        if (!formData.password) {
-            return feedback.msgError('请输入新的密码')
-        }
-
-        if (!formData.password_confirm) {
-            return feedback.msgError('请输入确定密码')
-        }
-
-        if (formData.password_confirm != formData.password) {
-            return feedback.msgError('两次输入的密码不一样')
-        }
-    }
-
-    if (formData.password_old && formData.password && formData.password_confirm) {
-        if (formData.password_old.length < 6 || formData.password_old.length > 32) {
-            return feedback.msgError('密码长度在6到32之间')
-        }
-        if (formData.password.length < 6 || formData.password.length > 32) {
-            return feedback.msgError('密码长度在6到32之间')
-        }
-        if (formData.password_confirm.length < 6 || formData.password_confirm.length > 32) {
-            return feedback.msgError('密码长度在6到32之间')
-        }
-    }
-    await setUserInfo(formData)
-    userStore.getUserInfo()
-}
-
-// 提交数据
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    setUser()
-}
-
-getUser()
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/user_label/details.vue b/src/views/user_label/details.vue
deleted file mode 100644
index d9503db38..000000000
--- a/src/views/user_label/details.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="标签名称" prop="label_name">
-                    <el-input v-model="formData.label_name" clearable placeholder="请输入标签名称" :readonly="true"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userLabelDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserLabelAdd, apiUserLabelEdit, apiUserLabelDetail } from '@/api/user_label'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    label_id: '',
-    label_name: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserLabelDetail({
-        label_id: row.label_id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/user_label/edit.vue b/src/views/user_label/edit.vue
deleted file mode 100644
index 4e79da256..000000000
--- a/src/views/user_label/edit.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="标签名称" prop="label_name">
-                    <el-input v-model="formData.label_name" clearable placeholder="请输入标签名称" :readonly="false"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userLabelEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserLabelAdd, apiUserLabelEdit, apiUserLabelDetail } from '@/api/user_label'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑用户标签表' : '新增用户标签表'
-})
-
-// 表单数据
-const formData = reactive({
-    label_id: '',
-    label_name: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    label_name: [{
-        required: true,
-        message: '请输入标签名称',
-        trigger: ['blur']
-    }]
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserLabelDetail({
-        label_id: row.label_id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiUserLabelEdit(data) 
-        : await apiUserLabelAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/user_label/index.vue b/src/views/user_label/index.vue
deleted file mode 100644
index 0a213c2af..000000000
--- a/src/views/user_label/index.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="标签名称" prop="label_name">
-                    <el-input class="w-[280px]" v-model="queryParams.label_name" clearable placeholder="请输入标签名称" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['user_label.user_label/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['user_label.user_label/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="ID" prop="label_id" width="100" />
-                    <el-table-column label="标签名称" prop="label_name" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['user_label.user_label/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['user_label.user_label/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.label_id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="userLabelLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserLabelLists, apiUserLabelDelete } from '@/api/user_label'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    label_name: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ label_id }) => label_id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserLabelLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (label_id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiUserLabelDelete({ label_id })
-    getLists()
-}
-
-getLists()
-</script>
-
diff --git a/src/views/user_ship/details.vue b/src/views/user_ship/details.vue
deleted file mode 100644
index 82e2615d4..000000000
--- a/src/views/user_ship/details.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="会员名称" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入会员名称" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="充值金额" prop="limit">
-                    <el-input v-model="formData.limit" clearable placeholder="请输入充值金额" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="排序倒序" prop="sort">
-                    <el-input v-model="formData.sort" clearable placeholder="请输入排序倒序" :readonly="true"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userShipDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserShipAdd, apiUserShipEdit, apiUserShipDetail } from '@/api/user_ship'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    title: '',
-    limit: '',
-    sort: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserShipDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/user_ship/edit.vue b/src/views/user_ship/edit.vue
deleted file mode 100644
index b8860e5f4..000000000
--- a/src/views/user_ship/edit.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="会员名称" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入会员名称" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="充值金额" prop="limit">
-                    <el-input v-model="formData.limit" clearable placeholder="请输入充值金额" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="排序倒序" prop="sort">
-                    <el-input v-model="formData.sort" clearable placeholder="请输入排序倒序" :readonly="false"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="userShipEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiUserShipAdd, apiUserShipEdit, apiUserShipDetail } from '@/api/user_ship'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑会员类型' : '新增会员类型'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    title: '',
-    limit: '',
-    sort: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    title: [{
-        required: true,
-        message: '请输入会员名称',
-        trigger: ['blur']
-    }],
-    limit: [{
-        required: true,
-        message: '请输入充值金额',
-        trigger: ['blur']
-    }],
-    sort: [{
-        required: true,
-        message: '请输入排序倒序',
-        trigger: ['blur']
-    }]
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiUserShipDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiUserShipEdit(data) 
-        : await apiUserShipAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/user_ship/index.vue b/src/views/user_ship/index.vue
deleted file mode 100644
index f18530c81..000000000
--- a/src/views/user_ship/index.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="会员名称" prop="title">
-                    <el-input class="w-[280px]" v-model="queryParams.title" @keydown.enter="resetPage" @clear="resetPage" clearable placeholder="请输入会员名称" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['user_ship.user_ship/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['user_ship.user_ship/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="会员名称" prop="title" show-overflow-tooltip />
-                    <el-table-column label="折扣" prop="discount" show-overflow-tooltip />
-                    <el-table-column label="充值金额" prop="limit" show-overflow-tooltip />
-                    <el-table-column label="排序倒序" prop="sort" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['user_ship.user_ship/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['user_ship.user_ship/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="userShipLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiUserShipLists, apiUserShipDelete } from '@/api/user_ship'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    title: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiUserShipLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiUserShipDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
diff --git a/src/views/warehouse/details.vue b/src/views/warehouse/details.vue
deleted file mode 100644
index 43b01d3e6..000000000
--- a/src/views/warehouse/details.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="仓库名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入仓库名称" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="仓库编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入仓库编号" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="联系人员" prop="contacts">
-                    <el-input v-model="formData.contacts" clearable placeholder="请输入联系人员" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="联系电话" prop="tel">
-                    <el-input v-model="formData.tel" clearable placeholder="请输入联系电话" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="仓库地址" prop="address">
-                    <el-input v-model="formData.address" clearable placeholder="请输入仓库地址" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="备注信息" prop="notes">
-                    <el-input v-model="formData.notes" clearable placeholder="请输入备注信息" :readonly="true"/>
-                </el-form-item>
-                <el-form-item label="排序" prop="sort">
-                    <el-input v-model="formData.sort" clearable placeholder="请输入排序" :readonly="true"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiWarehouseAdd, apiWarehouseEdit, apiWarehouseDetail } from '@/api/warehouse'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    name: '',
-    code: '',
-    contacts: '',
-    tel: '',
-    address: '',
-    notes: '',
-    sort: '',
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiWarehouseDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/warehouse/edit.vue b/src/views/warehouse/edit.vue
deleted file mode 100644
index f00904d66..000000000
--- a/src/views/warehouse/edit.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="仓库名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入仓库名称" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="仓库编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入仓库编号" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="联系人员" prop="contacts">
-                    <el-input v-model="formData.contacts" clearable placeholder="请输入联系人员" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="联系电话" prop="tel">
-                    <el-input v-model="formData.tel" clearable placeholder="请输入联系电话" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="仓库地址" prop="address">
-                    <el-input v-model="formData.address" clearable placeholder="请输入仓库地址" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="备注信息" prop="notes">
-                    <el-input v-model="formData.notes" clearable placeholder="请输入备注信息" :readonly="false"/>
-                </el-form-item>
-                <el-form-item label="排序" prop="sort">
-                    <el-input v-model="formData.sort" clearable placeholder="请输入排序" :readonly="false"/>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiWarehouseAdd, apiWarehouseEdit, apiWarehouseDetail } from '@/api/warehouse'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑仓库信息' : '新增仓库信息'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    name: '',
-    code: '',
-    contacts: '',
-    tel: '',
-    address: '',
-    notes: '',
-    sort: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    name: [{
-        required: true,
-        message: '请输入仓库名称',
-        trigger: ['blur']
-    }]
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiWarehouseDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiWarehouseEdit(data) 
-        : await apiWarehouseAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/warehouse/import.vue b/src/views/warehouse/import.vue
deleted file mode 100644
index 532326971..000000000
--- a/src/views/warehouse/import.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<template>
-    <el-card>
-        <div class="mb-4 text-lg font-bold">出库商品</div>
-        <div>
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="仓库" prop="uid">
-                    <el-select v-model="warehouse_id" style="width: 240px">
-                        <el-option
-                            v-for="item in warehouseList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="出库时间">
-                    <el-date-picker
-                        :readonly="false"
-                        class="flex-1 !flex"
-                        v-model="formData.manufacture"
-                        clearable
-                        type="date"
-                        value-format="YYYY-MM-DD"
-                        placeholder="选择出库日期"
-                    >
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <el-input v-model="formData.remark" type="input" rows="4" />
-                </el-form-item>
-                <el-form-item label="商品" prop="store_id">
-                    <div class="flex-1 w-full">
-                        <div class="mb-2">
-                            <el-button type="primary" @click="showProduct = true"
-                                >添加商品</el-button
-                            >
-                        </div>
-                        <el-table :data="productList">
-                            <el-table-column
-                                label="商品ID"
-                                prop="product_id"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column label="商品图片" prop="image" min-width="80">
-                                <template #default="{ row }">
-                                    <el-image
-                                        style="width: 50px; height: 50px"
-                                        :src="row.image"
-                                        :preview-teleported="true"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="商品名称"
-                                prop="store_name"
-                                min-width="200"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="分类"
-                                prop="cate_name"
-                                min-width="120"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="单位"
-                                prop="unit_name"
-                                min-width="80"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="商品价格"
-                                prop="price"
-                                min-width="100"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="库存"
-                                prop="stock"
-                                min-width="100"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column label="分配库存" min-width="150">
-                                <template #default="{ row }">
-                                    <el-input v-model="row.new_stock" @change="handleStock" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" width="120" fixed="right">
-                                <template #default="{ row }">
-                                    <el-button
-                                        type="danger"
-                                        link
-                                        @click="handleDeleteProdut(row.id)"
-                                    >
-                                        删除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-form-item>
-                <el-form-item label="库存类型" prop="order_type">
-                    <el-radio-group v-model="order_type" class="ml-6">
-                        <el-radio :value="1" :label="1">退供应商</el-radio>
-                        <el-radio :value="2" :label="2">报损</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="">
-                    <el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <el-dialog v-model="showProduct" title="选择商品" width="70%">
-            <product-pop
-                @onBindStore="onBindProduct"
-                is_warehouse="1"
-                :warehouse_id="warehouse_id"
-            ></product-pop>
-        </el-dialog>
-    </el-card>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from 'element-plus'
-import useMultipleTabs from '@/hooks/useMultipleTabs'
-import { apiWarehouseOrderOutbound } from '@/api/warehouse_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { onMounted } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { apiStoreProductUnitLists } from '@/api/store_product_unit'
-import { apiWarehouseLists } from '@/api/warehouse'
-
-const route = useRoute()
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const { removeTab } = useMultipleTabs()
-const mode = ref('add')
-const warehouse_id = ref('')
-const warehouseList = ref([])
-const stock = ref(0)
-
-// 表单数据
-const formData = reactive({
-    store_id: '',
-    manufacture: '',
-    remark: ''
-})
-if (route.query.warehouse_id) {
-    warehouse_id.value = parseInt(route.query.warehouse_id)
-}
-
-const warehouse = () => {
-    apiWarehouseLists({}).then((res) => {
-        warehouseList.value = res.lists
-    })
-}
-const showStore = ref(false) // 选择门店列表是否显示
-// 门店列表
-const storeList = ref([])
-// 删除已有门店
-const handleDelete = (id: number) => {
-    storeList.value = storeList.value.filter((item: any) => item.id !== id)
-}
-// 选择门店
-const onBindStore = (e: any[]) => {
-    storeList.value = []
-    storeList.value.push(e)
-    handleStock()
-    showStore.value = false
-}
-
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-
-const unitList = ref([])
-const getUnitList = () => {
-    apiStoreProductUnitLists({}).then((res) => {
-        unitList.value = res.lists
-    })
-}
-getUnitList()
-
-const order_type = ref(1)
-const isSubmit = ref(true)
-
-const handleStock = () => {
-    // const counts = storeList.value.length
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            id: item.product_id,
-            stock: item.new_stock || 0,
-            stocks: item.stock || 0
-        }
-    })
-    // const store_arr = storeList.value.length
-    // if (store_arr > 0 && product_arr.length > 0) {
-    //     try {
-    //         product_arr.forEach((item) => {
-    //             const stock = item.stock * store_arr
-    //             if (stock > item.stocks) {
-    //                 isSubmit.value = false
-    //                 throw new Error('超出仓库库存,请重新设置')
-    //             }
-    //         })
-    //     } catch (e) {
-    //         ElMessage.error('超出仓库库存,请重新设置')
-    //         return
-    //     }
-    // }
-    // isSubmit.value = true
-}
-
-const router = useRouter()
-// 提交按钮
-const handleSubmit = async () => {
-    if (warehouse_id.value == '') {
-        ElMessage.error('请选择仓库')
-        return
-    }
-    handleStock()
-    if (isSubmit.value == false) {
-        return
-    }
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            id: item.product_id,
-            stock: item.new_stock || 0,
-            batch: item.batch || 0
-        }
-    })
-    const store_arr = storeList.value.map((item: any) => item.id)
-    if (store_arr.length > 1) {
-        ElMessage.error('门店不能超过一个')
-        return
-    }
-    apiWarehouseOrderOutbound({
-        product_arr,
-        store_arr,
-        order_type: order_type.value,
-        warehouse_id: warehouse_id.value,
-        delivery_time: formData.manufacture,
-        mark: formData.remark
-    }).then((res) => {
-        removeTab()
-        // if (res.code == 1) {
-        ElMessage.success(res.msg)
-        // setTimeout(() => {
-        //     router.push({
-        //         path: '/warehouse/outbound_order'
-        //     })
-        // }, 2000)
-        // } else {
-        //     ElMessage.error(res.msg)
-        // }
-    })
-}
-warehouse()
-</script>
diff --git a/src/views/warehouse/indexs.vue b/src/views/warehouse/indexs.vue
deleted file mode 100644
index 8759c6749..000000000
--- a/src/views/warehouse/indexs.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="仓库名称" prop="name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.name"
-                        clearable
-                        placeholder="请输入仓库名称"
-                    />
-                </el-form-item>
-                <el-form-item label="联系人员" prop="contacts">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.contacts"
-                        clearable
-                        placeholder="请输入联系人员"
-                    />
-                </el-form-item>
-                <el-form-item label="联系电话" prop="tel">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.tel"
-                        clearable
-                        placeholder="请输入联系电话"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['admin.warehouse/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['admin.warehouse/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="" prop="id" show-overflow-tooltip />
-                    <el-table-column label="仓库名称" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <router-link
-                                :to="{
-                                    path: 'product_import',
-                                    query: { id: row.id }
-                                }"
-                                class="ml-4 text-success"
-                            >
-                                {{ row.name }}
-                            </router-link>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="仓库编号" prop="code" show-overflow-tooltip />
-                    <el-table-column label="联系人员" prop="contacts" show-overflow-tooltip />
-                    <el-table-column label="联系电话" prop="tel" show-overflow-tooltip />
-                    <el-table-column label="仓库地址" prop="address" show-overflow-tooltip />
-                    <el-table-column label="备注信息" prop="notes" show-overflow-tooltip />
-                    <el-table-column label="排序" prop="sort" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['admin.warehouse/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['admin.warehouse/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiWarehouseLists, apiWarehouseDelete } from '@/api/warehouse'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    name: '',
-    contacts: '',
-    tel: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiWarehouseDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
diff --git a/src/views/warehouse/product_import.vue b/src/views/warehouse/product_import.vue
deleted file mode 100644
index 998f6f76c..000000000
--- a/src/views/warehouse/product_import.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        @keydown.enter="resetPage"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <el-form-item label="商品分类" prop="store_name">
-                    <el-cascader
-                        class="w-[280px]"
-                        v-model="queryParams.class_all"
-                        filterable
-                        clearable
-                        :before-filter="beforeFilter"
-                        :props="props"
-                        placeholder="请选择商品分类"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <!-- <el-form-item label="商品条码" prop="bar_code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.bar_code"
-                        clearable
-                        placeholder="请输入商品条码"
-                    />
-                </el-form-item> -->
-                <el-form-item label="排序" prop="order_by">
-                    <el-select
-                        v-model="queryParams.order_by"
-                        placeholder="请选择排序"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in [
-                                { id: 'asc', name: '升序' },
-                                { id: 'desc', name: '降序' }
-                            ]"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiWarehouseProductStoregeLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <router-link
-                :to="{
-                    path: 'import',
-                    query: { warehouse_id: queryParams.warehouse_id }
-                }"
-                class="ml-4"
-            >
-                <el-button type="primary"> 出库 </el-button>
-            </router-link>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="商品名称"
-                        prop="store_name"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="分类"
-                        prop="cate_name"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="单位"
-                        prop="unit_name"
-                        min-width="80"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="价格" prop="price" min-width="80" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <p>商户价{{ row.cost }}</p>
-                            <p>供货价{{ row.purchase }}</p>
-                            <p>零售{{ row.price }}</p>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="规格"
-                        prop="store_info"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="毛利率"
-                        prop="rose"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="库存"
-                        prop="nums"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="价值"
-                        prop="total_price"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="强制校验" prop="is_verify">
-                        <template #default="{ row }">
-                            <el-switch
-                                size="large"
-                                @change="verifyChange(row)"
-                                v-model="row.is_verify"
-                                :active-value="1"
-                                :inactive-value="0"
-                                active-text="校验"
-                                inactive-text="不校验"
-                                inline-prompt
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                link
-                                @click="resetProductStoregeClick(row)"
-                                v-perms="[
-                                    'warehouse_product_storege.warehouse_product_storege/edit'
-                                ]"
-                            >
-                                重置数量
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <!-- <Details ref="detailsRef"></Details> -->
-    </div>
-    <el-dialog v-model="resetProductStoregeShow" title="重置数量" width="600">
-        <el-form :model="formData" label-width="90px">
-            <el-form-item label="商品名称" prop="store_name">
-                <el-input v-model="formData.store_name" clearable :readonly="false" disabled />
-            </el-form-item>
-            <el-form-item label="数量" prop="nums">
-                <el-input
-                    v-model="formData.nums"
-                    clearable
-                    :readonly="false"
-                    placeholder="请输入数量"
-                />
-            </el-form-item>
-            <el-form-item label="备注" prop="remark">
-                <el-input
-                    v-model="formData.remark"
-                    clearable
-                    :readonly="false"
-                    placeholder="请输入数量"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="resetProductStoregeShow = false">取消</el-button>
-                <el-button type="primary" @click="resetProductStorege"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-
-<script lang="ts" setup name="storeProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiWarehouseProductStoregeLists,
-    apiWarehouseProductStoregeEdit,
-    apiWarehouseProductStoregeVerify
-} from '@/api/warehouse_product_storege'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-// import Details from './details.vue'
-import { apiStoreCategoryLists } from '@/api/store_category'
-import { useRoute } from 'vue-router'
-
-const route = useRoute()
-
-const resetProductStoregeShow = ref(false)
-const formData = ref({
-    id: '',
-    store_name: '',
-    nums: '',
-    remark: ''
-})
-// 查询条件
-const queryParams = reactive({
-    store_name: '',
-    class_all: '',
-    warehouse_id: '',
-    bar_code: '',
-    order_by: '',
-    field: 'nums'
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-// 获取字典数据
-const { dictData } = useDictData('')
-// 分页相关
-let page_no = 1
-if (route.query.page_no) {
-    page_no = parseInt(route.query.page_no)
-}
-if (route.query.id) {
-    queryParams.warehouse_id = parseInt(route.query.id)
-}
-console.log(route.query.id)
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    page: page_no,
-    fetchFun: apiWarehouseProductStoregeLists,
-    params: queryParams
-})
-const resetProductStoregeClick = (data: any) => {
-    resetProductStoregeShow.value = true
-    formData.value.id = data.id
-    formData.value.store_name = data.store_name
-    formData.value.nums = data.nums
-}
-const resetProductStorege = (data: any) => {
-    resetProductStoregeShow.value = false
-    if (formData.value.id <= 0) {
-        ElMessage.error('id不能为空')
-        return false
-    }
-    apiWarehouseProductStoregeEdit(formData.value).then((res) => {
-        getLists()
-    })
-}
-
-let resolves
-let nodes
-const flag = ref(false)
-let name
-const beforeFilter = (value) => {
-    name = value
-    flag.value = true
-    props.lazyLoad(nodes, resolves)
-    return false
-}
-const props = {
-    value: 'id',
-    label: 'name',
-    emitPath: false,
-    lazy: true,
-    lazyLoad(node, resolve) {
-        if (!resolves) resolves = resolve
-        if (!nodes) nodes = node
-        const pid = node.value || 0
-        let data = {}
-        if (flag.value) {
-            data = { name: name }
-            if (!name) {
-                data = {
-                    pid: pid,
-                    page_size: 10000
-                }
-            }
-        } else {
-            data = {
-                pid: pid,
-                page_size: 10000
-            }
-        }
-        apiStoreCategoryLists({
-            ...data
-        }).then((res) => {
-            resolve(
-                res.lists.map((item: any) => {
-                    // item.leaf = item.is_children == 0;
-                    item.leaf = true
-                    flag.value = false
-                    return item
-                })
-            )
-        })
-    }
-}
-const verifyChange = (row: any) => {
-    apiWarehouseProductStoregeVerify({
-        id: row.id,
-        is_verify: row.is_verify
-    })
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/warehouse_order/details.vue b/src/views/warehouse_order/details.vue
deleted file mode 100644
index 99956c5c7..000000000
--- a/src/views/warehouse_order/details.vue
+++ /dev/null
@@ -1,479 +0,0 @@
-<template>
-    <el-drawer v-model="showDialog" title="订单详情" :size="1200">
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">仓库：</div>
-                <div style="color: black">{{ formData.warehouse_name }}</div>
-            </div>
-            <div class="flex flex-col" v-if="formData.financial_pm == 1">
-                <div style="color: gray">供应商：</div>
-                <div style="color: black">{{ formData.supplier_name }}</div>
-            </div>
-            <div class="flex flex-col" v-else>
-                <div style="color: gray">门店：</div>
-                <div style="color: black">{{ formData.system_store }}</div>
-            </div>
-            <div class="flex flex-col">
-                <div style="color: gray">单号：</div>
-                <div style="color: black">{{ formData.code }}</div>
-            </div>
-        </div>
-        <div class="flex items-center justify-between m-4">
-            <div class="flex flex-col">
-                <div style="color: gray">总价</div>
-                <div style="color: black">￥{{ formData.total_price }}</div>
-            </div>
-            <div class="flex flex-col flex-2">
-                <div style="color: gray">时间</div>
-                <div style="color: black">{{ formData.create_time }}</div>
-            </div>
-            <el-button @click="xlsx(formData.id, 1)"> 打印采购单 </el-button>
-            <el-button @click="xlsx(formData.id, 2)"> 打印供货单 </el-button>
-            <el-button @click="xlsx(formData.id, 3)"> 打印商户/会员单 </el-button>
-            <el-button @click="xlsx(formData.id, 4)"> 打印零售单 </el-button>
-            <el-button @click="xlsx2(formData.id)"> 打印商品标签 </el-button>
-        </div>
-        <el-button type="primary" @click="dialogShop = true" v-if="formData.financial_pm == 1">
-            入库
-        </el-button>
-        <el-button type="primary" @click="dialogShop = true" v-else> 出库 </el-button>
-
-        <el-tabs v-model="activeName" class="demo-tabs mt-3" type="border-card">
-            <el-tab-pane label="明细" name="second">
-                <div>
-                    <div>
-                        <el-table :data="pager.lists" v-loading="pager.loading">
-                            <el-table-column
-                                label="商品信息"
-                                prop="store_name"
-                                show-overflow-tooltip
-                            >
-                                <template #default="{ row }">
-                                    <div class="flex items-center">
-                                        <el-image
-                                            :src="row.image"
-                                            class="w-16 h-16 mr-2"
-                                            :preview-teleported="true"
-                                        ></el-image>
-                                        <div>{{ row.store_name }}</div>
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                            <el-table-column
-                                label="采购价"
-                                prop="purchase"
-                                show-overflow-tooltip
-                                v-if="formData.financial_pm == 1"
-                            />
-                            <el-table-column
-                                label="供货价"
-                                prop="purchase"
-                                show-overflow-tooltip
-                                v-else
-                            />
-                            <el-table-column label="零售价" prop="price" show-overflow-tooltip />
-                            <el-table-column
-                                label="合计"
-                                prop="total_price"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column label="操作" width="120" fixed="right">
-                                <template #default="{ row }">
-                                    <el-button
-                                        v-perms="['warehouse_product.warehouse_product/edit']"
-                                        type="primary"
-                                        link
-                                        @click="handleEdit(row)"
-                                    >
-                                        编辑
-                                    </el-button>
-                                    <el-button
-                                        v-perms="['warehouse_product.warehouse_product/delete']"
-                                        type="danger"
-                                        link
-                                        @click="handleDeletes(row.id)"
-                                    >
-                                        删除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                    <div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
-                        <pagination v-model="pager" @change="getLists" />
-                    </div>
-                </div>
-            </el-tab-pane>
-        </el-tabs>
-    </el-drawer>
-    <el-dialog v-model="dialogShop" title="追加商品" width="1500">
-        <el-form ref="formRef" :model="updateInfo" label-width="90px">
-            <div class="mb-2">
-                <el-button type="primary" @click="showProduct = true">添加商品</el-button>
-            </div>
-            <el-table :data="productList">
-                <el-table-column
-                    label="商品ID"
-                    prop="id"
-                    show-overflow-tooltip
-                    v-if="formData.financial_pm == 1"
-                />
-                <el-table-column label="商品ID" prop="product_id" show-overflow-tooltip v-else />
-
-                <el-table-column label="商品图片" prop="image" min-width="80">
-                    <template #default="{ row }">
-                        <el-image
-                            style="width: 50px; height: 50px"
-                            :src="row.image"
-                            :preview-teleported="true"
-                        />
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="商品名称"
-                    prop="store_name"
-                    min-width="160"
-                    show-overflow-tooltip
-                />
-                <el-table-column
-                    label="分类"
-                    prop="cate_name"
-                    min-width="80"
-                    show-overflow-tooltip
-                />
-                <el-table-column
-                    label="单位"
-                    prop="unit_name"
-                    min-width="60"
-                    show-overflow-tooltip
-                />
-                <template v-if="formData.financial_pm == 1">
-                    <el-table-column label="数量" width="100">
-                        <template #default="{ row }">
-                            <el-input v-model="row.num" @change="handleChange(row)" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="价格" width="100">
-                        <template #default="{ row }">
-                            <el-input v-model="row.purchases" @change="handleChange(row)" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="总价" width="100">
-                        <template #default="{ row }">
-                            <el-input v-model="row.total_price" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="供应商" width="140">
-                        <template #default="{ row }">
-                            <el-select
-                                v-model="row.supplier_id"
-                                filterable
-                                remote
-                                reserve-keyword
-                                placeholder="输入供应商名称搜索"
-                                remote-show-suffix
-                                :remote-method="remoteMethodSupplier"
-                                :loading="supplierLoading"
-                                style="width: 120px"
-                            >
-                                <el-option
-                                    v-for="item in supplierList"
-                                    :key="item.id"
-                                    :label="item.mer_name"
-                                    :value="item.id"
-                                />
-                            </el-select>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="付款方式" min-width="180">
-                        <template #default="{ row }">
-                            <el-radio-group v-model="row.pay_type">
-                                <el-radio :label="1" :value="1">赊账</el-radio>
-                                <el-radio :label="2" :value="2">现金</el-radio>
-                            </el-radio-group>
-                        </template>
-                    </el-table-column>
-                </template>
-                <template v-else>
-                    <el-table-column
-                        label="商品价格"
-                        prop="price"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="库存"
-                        prop="stock"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="分配库存" min-width="150">
-                        <template #default="{ row }">
-                            <el-input v-model="row.num" />
-                        </template>
-                    </el-table-column>
-                </template>
-				<el-table-column label="生产日期" prop="manufacture" width="160">
-					<template #default="{ row }">
-						<el-date-picker v-model="row.manufacture" type="date" clearable value-format="YYYY-MM-DD" placeholder="请输入生产日期"/>
-					</template>
-				</el-table-column>
-				<el-table-column label="保质期" prop="expiration_date" width="160">
-					<template #default="{ row }">
-						<el-date-picker v-model="row.expiration_date" type="date" clearable value-format="YYYY-MM-DD" placeholder="请输入保质期"/>
-					</template>
-				</el-table-column>
-                <el-table-column label="操作" width="120" fixed="right">
-                    <template #default="{ row }">
-                        <el-button type="danger" link @click="handleDeleteProdut(row.id)">
-                            删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="dialogShop = false">取消</el-button>
-                <el-button type="primary" @click="goodsOfferUpdate"> 确认 </el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <el-dialog v-model="showProduct" title="选择商品" width="70%">
-        <product-pop
-            @onBindStore="onBindProduct"
-            :warehouse_id="warehouse_id"
-            :is_warehouse="is_warehouse"
-        ></product-pop>
-    </el-dialog>
-    <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
-</template>
-
-<script lang="ts" setup name="storeOrderDETAILS">
-import { ElMessage, type FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiWarehouseProductLists, apiWarehouseProductDelete } from '@/api/warehouse_product'
-import {
-    apiWarehouseOrderRentryExport,
-    apiWarehouseOrderExport,
-    apiWarehouseOrderEdit,
-    apiWarehouseOrderExportTags
-} from '@/api/warehouse_order'
-import type { PropType } from 'vue'
-import { usePaging } from '@/hooks/usePaging'
-import { useRoute } from 'vue-router'
-import feedback from '@/utils/feedback'
-import EditPopup from './editProduct.vue'
-import { apiSupplierLists } from '@/api/supplier'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-const route = useRoute()
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-
-const emit = defineEmits(['success', 'close'])
-const showDialog = ref(false)
-const dialogShop = ref(false)
-const activeName = ref('second')
-const warehouse_id = ref(0)
-const is_warehouse = ref(0)
-const financial_pm = ref(0)
-// 表单数据
-const formData = ref({
-    id: '',
-    code: '',
-    total_price: '',
-    supplier_name: '',
-    warehouse_name: '',
-    system_store: '',
-    pay_type: '',
-    supplier_id: '',
-    financial_pm: '',
-	manufacture: '',
-	expiration_date: ''
-})
-const updateInfo = ref({})
-const goodsOfferUpdate = () => {
-    const product_arr = productList.value.map((item: any) => {
-        if (financial_pm.value == 1) {
-            return {
-                id: item.id,
-                supplier_id: item.supplier_id || 0,
-                pay_type: item.pay_type || 0,
-                nums: item.num || 0,
-                purchase: item.purchases || 0,
-                prices: item.purchase || 0,
-                total_price: item.total_price || 0,
-                manufacture: item.manufacture,
-                expiration_date: item.expiration_date
-            }
-        } else {
-            return {
-                id: item.product_id,
-                nums: item.num || 0,
-                purchase: item.purchases || 0,
-                prices: item.purchase || 0,
-                total_price: item.total_price || 0,
-                manufacture: item.manufacture,
-                expiration_date: item.expiration_date
-            }
-        }
-    })
-    apiWarehouseOrderEdit({
-        id: queryParams.oid,
-        product_arr: product_arr
-    }).then((res) => {
-        dialogShop.value = false
-        getLists()
-    })
-}
-const queryParams = reactive({
-    oid: '',
-    pay_type: ''
-})
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    formData.value = { ...data }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    formData.value = { ...row }
-    queryParams.oid = row.id
-    warehouse_id.value = row.warehouse_id
-    if (row.financial_pm == 0) {
-        is_warehouse.value = 1
-    } else {
-        financial_pm.value = 1
-    }
-    productList.value = []
-    // setFormData(data)
-    getLists()
-}
-const xlsx = (id, type) => {
-    if (formData.value.financial_pm == 1) {
-        apiWarehouseOrderRentryExport({
-            id: id
-        }).then((res) => {
-            window.open(res.url, '_blank')
-            ElMessage.success('导出成功')
-        })
-    } else {
-        apiWarehouseOrderExport({
-            id: id,
-            type: type
-        }).then((res) => {
-            window.open(res.url, '_blank')
-            ElMessage.success('导出成功')
-        })
-    }
-}
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-			item.manufacture = ''
-			item.expiration_date = ''
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-function handleChange(row) {
-    row.total_price = row.num * row.purchases
-}
-const isSubmit = ref(true)
-
-const handleStock = () => {
-    // const counts = storeList.value.length
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            id: item.product_id,
-            stock: item.new_stock || 0,
-            stocks: item.stock || 0
-        }
-    })
-    if (product_arr.length > 0) {
-        try {
-            product_arr.forEach((item) => {
-                const stock = item.stock * 1
-                if (stock > item.stocks) {
-                    isSubmit.value = false
-                    throw new Error('超出仓库库存,请重新设置')
-                }
-            })
-        } catch (e) {
-            ElMessage.error('超出仓库库存,请重新设置')
-            return
-        }
-    }
-    isSubmit.value = true
-}
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-// 删除
-const handleDeletes = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiWarehouseProductDelete({ id })
-    getLists()
-}
-const supplierLoading = ref(false)
-const supplierList = ref([])
-const remoteMethodSupplier = (e = '') => {
-    supplierLoading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            supplierList.value = res.lists
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-}
-//打开弹窗
-const open = () => {
-    showDialog.value = true
-}
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseProductLists,
-    params: queryParams
-})
-const xlsx2 = (id) => {
-    apiWarehouseOrderExportTags({
-        id: id
-    }).then((res) => {
-        window.open(res.url, '_blank')
-        ElMessage.success('导出成功')
-    })
-}
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/warehouse_order/edit.vue b/src/views/warehouse_order/edit.vue
deleted file mode 100644
index e98114fbb..000000000
--- a/src/views/warehouse_order/edit.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="已结金额" prop="completed_amount">
-                    <el-input
-                        v-model="formData.completed_amount"
-                        clearable
-                        placeholder="请输入总价格"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="未结金额" prop="outstanding_amount">
-                    <el-input
-                        v-model="formData.outstanding_amount"
-                        clearable
-                        placeholder="请输入未结金额"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="总价格" prop="total_price">
-                    <el-input
-                        v-model="formData.total_price"
-                        clearable
-                        placeholder="请输入总价格"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiWarehouseOrderAdd,
-    apiWarehouseOrderUpdateEdit,
-    apiWarehouseOrderDetail
-} from '@/api/warehouse_order'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品仓储订单' : '新增商品仓储订单'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    total_price: '',
-    outstanding_amount: '',
-    completed_amount: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    warehouse_id: [
-        {
-            required: true,
-            message: '请输入仓库',
-            trigger: ['blur']
-        }
-    ],
-    batch: [
-        {
-            required: true,
-            message: '请输入批次',
-            trigger: ['blur']
-        }
-    ],
-    total_price: [
-        {
-            required: true,
-            message: '请输入总价格',
-            trigger: ['blur']
-        }
-    ],
-    status: [
-        {
-            required: true,
-            message: '请输入状态',
-            trigger: ['blur']
-        }
-    ]
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiWarehouseOrderDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit'
-        ? await apiWarehouseOrderUpdateEdit(data)
-        : await apiWarehouseOrderAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/warehouse_order/editProduct.vue b/src/views/warehouse_order/editProduct.vue
deleted file mode 100644
index 2703491fd..000000000
--- a/src/views/warehouse_order/editProduct.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="商品名称" prop="store_name">
-                    <el-input v-model="formData.store_name" disabled />
-                </el-form-item>
-                <el-form-item label="供应商" v-if="formData.financial_pm == 1">
-                    <el-select
-                        v-model="formData.supplier_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入供应商名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodSupplier"
-                        :loading="supplierLoading"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in supplierList"
-                            :key="item.id"
-                            :label="item.mer_name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input
-                        v-model="formData.nums"
-                        clearable
-                        placeholder="请输入数量"
-                        :readonly="false"
-                        @change="handleChange()"
-                    />
-                </el-form-item>
-                <el-form-item label="采购价" prop="purchase" v-if="formData.financial_pm == 1">
-                    <el-input
-                        v-model="formData.purchase"
-                        clearable
-                        placeholder="请输入采购价"
-                        :readonly="false"
-                        @change="handleChange()"
-                    />
-                </el-form-item>
-                <el-form-item label="零售价" prop="price" v-else>
-                    <el-input
-                        v-model="formData.price"
-                        clearable
-                        placeholder="请输入零售价"
-                        :readonly="false"
-                        @change="handleChange()"
-                    />
-                </el-form-item>
-                <el-form-item label="总价格" prop="total_price">
-                    <el-input
-                        v-model="formData.total_price"
-                        clearable
-                        placeholder="请输入总价格"
-                        :readonly="false"
-                    />
-                </el-form-item>
-				<el-form-item label="生产日期" prop="manufacture">
-				    <el-date-picker v-model="formData.manufacture" type="date" clearable value-format="YYYY-MM-DD" placeholder="请输入生产日期"/>
-				</el-form-item>
-				<el-form-item label="保质期" prop="expiration_date">
-				    <el-date-picker v-model="formData.expiration_date" type="date" clearable value-format="YYYY-MM-DD" placeholder="请输入保质期"/>
-				</el-form-item>
-                <el-form-item label="付款方式" prop="pay_type" v-if="formData.financial_pm == 1">
-                    <el-radio-group v-model="formData.pay_type">
-                        <el-radio :label="1" :value="1">赊账</el-radio>
-                        <el-radio :label="2" :value="2">现金</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseOrderEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiWarehouseOrderDetail } from '@/api/warehouse_order'
-import { apiWarehouseProductEdit } from '@/api/warehouse_product'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { apiSupplierLists } from '@/api/supplier'
-
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品' : '新增商品仓储订单'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    oid: '',
-    supplier_id: '',
-    store_name: '',
-    total_price: '',
-    nums: '',
-    pay_type: '',
-    purchase: '',
-    financial_pm: '',
-    price: '',
-	manufacture: '',
-	expiration_date: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    warehouse_id: [
-        {
-            required: true,
-            message: '请输入仓库',
-            trigger: ['blur']
-        }
-    ],
-    total_price: [
-        {
-            required: true,
-            message: '请输入总价格',
-            trigger: ['blur']
-        }
-    ]
-})
-function handleChange() {
-    if (formData.nums > 0 && formData.purchase > 0 && formData.financial_pm == 1) {
-        formData.total_price = (parseFloat(formData.purchase) * parseFloat(formData.nums)).toFixed(
-            2
-        )
-    } else if (formData.nums > 0 && formData.price > 0 && formData.financial_pm == 0) {
-        formData.total_price = (parseFloat(formData.price) * parseFloat(formData.nums)).toFixed(2)
-    }
-}
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    remoteMethodSupplier()
-}
-const supplierLoading = ref(false)
-const supplierList = ref([])
-const remoteMethodSupplier = (e = '') => {
-    supplierLoading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            supplierList.value = res.lists
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                supplierLoading.value = false
-            }, 300)
-        })
-}
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    await apiWarehouseProductEdit(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData
-})
-</script>
diff --git a/src/views/warehouse_order/index.vue b/src/views/warehouse_order/index.vue
deleted file mode 100644
index 003b65917..000000000
--- a/src/views/warehouse_order/index.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="ID" prop="id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.id"
-                        clearable
-                        placeholder="请输入id"
-                    />
-                </el-form-item>
-                <el-form-item label="单号" prop="code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.code"
-                        clearable
-                        placeholder="请输入单号"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item label="仓库ID" prop="warehouse_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.warehouse_id"
-                        clearable
-                        placeholder="请输入仓库"
-                    />
-                </el-form-item>
-                <el-form-item label="供应商" prop="supplier_id">
-                    <el-select
-                        v-model="queryParams.supplier_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入供应商名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="item.mer_name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="日期" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiWarehouseOrderLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <router-link
-                v-perms="['warehousing']"
-                :to="{
-                    path: 'warehousing'
-                }"
-                class="ml-4"
-            >
-                <el-button type="primary"> 入库 </el-button>
-            </router-link>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <!-- <el-table-column type="selection" width="55" /> -->
-                    <el-table-column label="id" prop="id" show-overflow-tooltip width="70" />
-                    <el-table-column label="操作时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="仓库" prop="warehouse_name" show-overflow-tooltip />
-                    <!-- <el-table-column label="供应商" prop="supplier_name" show-overflow-tooltip /> -->
-                    <el-table-column label="单号" prop="code" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="financial_pm_name" show-overflow-tooltip />
-                    <el-table-column label="填写人员" prop="admin_name" show-overflow-tooltip />
-                    <!-- <el-table-column label="批次" prop="batch" show-overflow-tooltip /> -->
-                    <el-table-column label="已结" prop="completed_amount" show-overflow-tooltip />
-                    <el-table-column label="未结" prop="outstanding_amount" show-overflow-tooltip />
-                    <el-table-column label="总价格" prop="total_price" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleDetai(row)"
-                                >详情</el-button
-                            >
-                            <el-button
-                                v-perms="['warehouse_order.warehouse_order/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['warehouse_order.warehouse_order/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <details-popup
-            v-if="showDetails"
-            ref="detailsRef"
-            @success="getLists"
-            @close="showDetails = false"
-            :dictData="dictData"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseOrderLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiWarehouseOrderLists, apiWarehouseOrderDelete } from '@/api/warehouse_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailsPopup from './details.vue'
-import { apiSystemStoreLists } from '@/api/system_store'
-import moment from 'moment'
-import { apiSupplierLists } from '@/api/supplier'
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDetails = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    id: '',
-    warehouse_id: '',
-    product_name: '',
-    financial_pm: 1,
-    store_id: '',
-    start_time: '',
-    end_time: '',
-    code: '',
-    supplier_id: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseOrderLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiWarehouseOrderDelete({ id })
-    getLists()
-}
-// 详情
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-const startEndTime = ref([])
-
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/warehouse_order/outbound_order.vue b/src/views/warehouse_order/outbound_order.vue
deleted file mode 100644
index 15db56528..000000000
--- a/src/views/warehouse_order/outbound_order.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="单号" prop="code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.code"
-                        clearable
-                        placeholder="请输入单号"
-                        @change="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item label="门店名称" prop="store_id">
-                    <div class="flex items-center mr-4">
-                        <el-select
-                            v-model="queryParams.store_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="输入门店名称搜索"
-                            remote-show-suffix
-                            :remote-method="remoteMethod"
-                            :loading="storeloading"
-                            style="width: 240px"
-                            @change="resetPage"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item label="仓库ID" prop="warehouse_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.warehouse_id"
-                        clearable
-                        placeholder="请输入仓库"
-                    />
-                </el-form-item>
-                <el-form-item label="供应商" prop="supplier_id">
-                    <el-select
-                        v-model="queryParams.supplier_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入供应商名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="item.mer_name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="日期" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiWarehouseOrderLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <router-link
-                v-perms="['import']"
-                :to="{
-                    path: 'import'
-                }"
-                class="ml-4"
-            >
-                <el-button type="primary"> 出库 </el-button>
-            </router-link>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip width="55" />
-                    <el-table-column label="操作时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="仓库" prop="warehouse_name" show-overflow-tooltip />
-                    <el-table-column label="门店" prop="system_store" show-overflow-tooltip />
-                    <el-table-column label="单号" prop="code" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="financial_pm_name" show-overflow-tooltip />
-                    <el-table-column label="填写人员" prop="admin_name" show-overflow-tooltip />
-                    <!-- <el-table-column label="批次" prop="batch" show-overflow-tooltip /> -->
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                    <el-table-column label="总价格" prop="total_price" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleDetai(row)"
-                                >详情</el-button
-                            >
-                            <el-button
-                                v-perms="['warehouse_order.warehouse_order/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <details-popup
-            v-if="showDetails"
-            ref="detailsRef"
-            @success="getLists"
-            @close="showDetails = false"
-            :dictData="dictData"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseOrderLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiWarehouseOrderLists, apiWarehouseOrderDelete } from '@/api/warehouse_order'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailsPopup from './details.vue'
-import { apiSystemStoreLists } from '@/api/system_store'
-import moment from 'moment'
-import { apiSupplierLists } from '@/api/supplier'
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDetails = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    warehouse_id: '',
-    product_name: '',
-    financial_pm: 0,
-    store_id: '',
-    start_time: '',
-    end_time: '',
-    code: '',
-    supplier_id: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseOrderLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiWarehouseOrderDelete({ id })
-    getLists()
-}
-// 详情
-const handleDetai = async (data: any) => {
-    showDetails.value = true
-    await nextTick()
-    detailsRef.value?.open()
-    detailsRef.value?.getDetail(data)
-}
-const startEndTime = ref([])
-
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/warehouse_product/edit.vue b/src/views/warehouse_product/edit.vue
deleted file mode 100644
index c74d530cb..000000000
--- a/src/views/warehouse_product/edit.vue
+++ /dev/null
@@ -1,358 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="仓库" prop="warehouse_id">
-                    <el-input
-                        v-model="formData.warehouse_name"
-                        clearable
-                        placeholder="请选择仓库"
-                        :readonly="false"
-                        @click="showWarehouse = true"
-                    />
-                </el-form-item>
-                <el-form-item label="商品" prop="product_id">
-                    <el-input
-                        v-model="formData.product_name"
-                        clearable
-                        placeholder="请选择商品"
-                        :readonly="false"
-                        @click="showProduct = true"
-                    />
-                </el-form-item>
-                <el-form-item label="供应商" prop="supplier_id">
-                    <el-select
-                        v-model="formData.supplier_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入供应商名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="item.mer_name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="状态" prop="financial_pm">
-                    <el-select v-model="formData.financial_pm" clearable placeholder="请选择出入库">
-                        <el-option label="入库" value="1" />
-                    </el-select>
-                </el-form-item>
-                <!-- <el-form-item label="批次" prop="batch">
-                    <el-input
-                        v-model="formData.batch"
-                        clearable
-                        placeholder="请输入批次"
-                        :readonly="false"
-                    />
-                </el-form-item> -->
-                <el-form-item label="单号" prop="code">
-                    <el-input
-                        v-model="formData.code"
-                        clearable
-                        placeholder="请输入单号"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="生产日期" prop="manufacture">
-                    <el-date-picker
-                        :readonly="false"
-                        class="flex-1 !flex"
-                        v-model="formData.manufacture"
-                        clearable
-                        type="datetime"
-                        value-format="YYYY-MM-DD"
-                        placeholder="选择生产日期"
-                    >
-                    </el-date-picker>
-                </el-form-item>
-
-                <el-form-item label="保质期" prop="expiration_date">
-                    <el-date-picker
-                        :readonly="false"
-                        class="flex-1 !flex"
-                        v-model="formData.expiration_date"
-                        clearable
-                        type="datetime"
-                        value-format="YYYY-MM-DD"
-                        placeholder="选择保质期"
-                    >
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="数量" prop="nums">
-                    <el-input
-                        v-model="formData.nums"
-                        clearable
-                        placeholder="请输入数量"
-                        :readonly="false"
-                        @change="changePrice"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <span style="color: red">注意:下面价格会同步到商品中，请仔细检查</span>
-                </el-form-item>
-
-                <el-form-item label="采购价" prop="purchase">
-                    <el-input
-                        v-model="formData.purchase"
-                        clearable
-                        placeholder="请输入采购价"
-                        :readonly="false"
-                        @change="changePrice"
-                    />
-                </el-form-item>
-                <!-- <el-form-item label="商户价" prop="cost">
-                    <el-input
-                        v-model="formData.cost"
-                        clearable
-                        placeholder="请输入商户价"
-                        :readonly="false"
-                    />
-                </el-form-item>
-                <el-form-item label="零售价" prop="price">
-                    <el-input
-                        v-model="formData.price"
-                        clearable
-                        placeholder="请输入零售价"
-                        :readonly="false"
-                    />
-                </el-form-item> -->
-                <el-form-item label="总价" prop="total_price">
-                    <el-input
-                        v-model="formData.total_price"
-                        clearable
-                        placeholder="请输入总价"
-                        :readonly="false"
-                    />
-                </el-form-item>
-            </el-form>
-        </popup>
-        <el-dialog v-model="showWarehouse" title="选择仓库" width="70%">
-            <warehouse-pop @onBindWarehouse="onBindWarehouse"></warehouse-pop>
-        </el-dialog>
-        <el-dialog v-model="showProduct" title="选择商品" width="70%">
-            <product-pop @onBindStore="onBindStore"></product-pop>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseProductEdit">
-import { watermarkProps, type FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import {
-    apiWarehouseProductAdd,
-    apiWarehouseProductEdit,
-    apiWarehouseProductDetail
-} from '@/api/warehouse_product'
-import { apiSupplierLists } from '@/api/supplier'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-const showWarehouse = ref(false) // 选择仓库列表是否显示
-const showProduct = ref(false) // 选择商品列表是否显示
-// const productList = ref([])
-
-const onBindWarehouse = (e: any[]) => {
-    formData.warehouse_name = e.name
-    formData.warehouse_id = e.id
-    // e.forEach((item: any) => {
-    //     if (!productList.value.find((t: any) => t.id == item.id)) {
-    //         productList.value.push(item)
-    //     }
-    // })
-    showWarehouse.value = false
-}
-const onBindStore = (e: any[]) => {
-    formData.product_name = e[0].store_name
-    formData.product_id = e[0].id
-    formData.purchase = e[0].purchase
-    formData.cost = e[0].cost
-    formData.price = e[0].price
-    showProduct.value = false
-}
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品仓储信息' : '新增商品仓储信息'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    warehouse_id: '',
-    product_id: '',
-    supplier_id: '',
-    financial_pm: '',
-    batch: '',
-    nums: '',
-    price: '',
-    total_price: '',
-    status: '',
-    warehouse_name: '',
-    product_name: '',
-    manufacture: '',
-    expiration_date: '',
-    code: '',
-    purchase: '',
-    cost: ''
-})
-
-// 表单验证
-const formRules = reactive<any>({
-    warehouse_id: [
-        {
-            required: true,
-            message: '请输入仓库ID',
-            trigger: ['blur']
-        }
-    ],
-    product_id: [
-        {
-            required: true,
-            message: '请输入商品ID',
-            trigger: ['blur']
-        }
-    ],
-    financial_pm: [
-        {
-            required: true,
-            message: '请选择0 = 出库 1 = 获得',
-            trigger: ['blur']
-        }
-    ],
-    batch: [
-        {
-            required: true,
-            message: '请输入批次',
-            trigger: ['blur']
-        }
-    ],
-    nums: [
-        {
-            required: true,
-            message: '请输入数量',
-            trigger: ['blur']
-        }
-    ],
-    price: [
-        {
-            required: true,
-            message: '请输入零售价',
-            trigger: ['blur']
-        }
-    ],
-    purchase: [
-        {
-            required: true,
-            message: '请输入采购价',
-            trigger: ['blur']
-        }
-    ],
-    cost: [
-        {
-            required: true,
-            message: '请输入商户价',
-            trigger: ['blur']
-        }
-    ],
-    total_price: [
-        {
-            required: true,
-            message: '请输入总价',
-            trigger: ['blur']
-        }
-    ],
-    status: [
-        {
-            required: true,
-            message: '请输入状态',
-            trigger: ['blur']
-        }
-    ]
-})
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiWarehouseProductDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-const changePrice = () => {
-    if (formData.purchase > 0 && formData.nums > 0) {
-        formData.total_price = formData.purchase * formData.nums
-    }
-}
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit' ? await apiWarehouseProductEdit(data) : await apiWarehouseProductAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiSupplierLists({})
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/warehouse_product/index.vue b/src/views/warehouse_product/index.vue
deleted file mode 100644
index fcd367606..000000000
--- a/src/views/warehouse_product/index.vue
+++ /dev/null
@@ -1,326 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店名称" prop="store_id">
-                    <div class="flex items-center mr-4">
-                        <el-select
-                            v-model="queryParams.store_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="输入门店名称搜索"
-                            remote-show-suffix
-                            :remote-method="remoteMethod"
-                            :loading="storeloading"
-                            style="width: 240px"
-                            @change="resetPage"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item label="仓库ID" prop="warehouse_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.warehouse_id"
-                        clearable
-                        placeholder="请输入仓库"
-                    />
-                </el-form-item>
-                <el-form-item label="供应商" prop="supplier_id">
-                    <el-select
-                        v-model="queryParams.supplier_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入供应商名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="item.mer_name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="商品" prop="product_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.product_name"
-                        clearable
-                        placeholder="请输入商品"
-                    />
-                </el-form-item>
-                <el-form-item label="商品条码" prop="bar_code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.bar_code"
-                        clearable
-                        placeholder="请输入商品条码"
-                    />
-                </el-form-item>
-                <el-form-item label="日期" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiWarehouseProductLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-button
-                v-perms="['warehouse_product.warehouse_product/add']"
-                type="primary"
-                @click="handleAdd"
-            >
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['warehouse_product.warehouse_product/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除 -->
-            <!-- </el-button> -->
-            <!-- <router-link
-                :to="{
-                    path: 'warehousing'
-                }"
-                class="ml-4"
-            >
-                <el-button type="primary"> 入库 </el-button>
-            </router-link> -->
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="单号" prop="code" width="180" show-overflow-tooltip />
-                    <el-table-column label="操作人员" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="供应商" prop="supplier_name" show-overflow-tooltip />
-                    <el-table-column label="仓库" prop="warehouse_name" show-overflow-tooltip />
-                    <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="出入库"
-                        prop="financial_pm_name"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="批次" prop="batch" show-overflow-tooltip />
-                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                    <el-table-column label="采购价" prop="purchase" show-overflow-tooltip />
-                    <!-- <el-table-column label="商户价" prop="cost" show-overflow-tooltip />
-                    <el-table-column label="零售价" prop="price" show-overflow-tooltip /> -->
-                    <el-table-column label="总价" prop="total_price" show-overflow-tooltip />
-                    <el-table-column label="操作时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="生产期" prop="manufacture" show-overflow-tooltip />
-                    <el-table-column label="保质期" prop="expiration_date" show-overflow-tooltip />
-                    <!-- <el-table-column label="状态" prop="status_name" show-overflow-tooltip /> -->
-                    <el-table-column label="备注" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span style="color: red">{{ row.mark }}</span>
-                        </template>
-                    </el-table-column>
-                    <!-- <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['warehouse_product.warehouse_product/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                                v-if="row.status == 0"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['warehouse_product.warehouse_product/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                            <el-button
-                                v-perms="['warehouse_product.warehouse_product/enter']"
-                                type="primary"
-                                link
-                                @click="handleEnter(row.id)"
-                                v-if="row.status == 0"
-                            >
-                                确认
-                            </el-button>
-                        </template>
-                    </el-table-column> -->
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiWarehouseProductLists,
-    apiWarehouseProductDelete,
-    apiWarehouseProductEnter
-} from '@/api/warehouse_product'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-// import EditPopup from './edit.vue'
-import ImportPopup from './warehousing.vue'
-import { apiSystemStoreLists } from '@/api/system_store'
-import moment from 'moment'
-import { apiSupplierLists } from '@/api/supplier'
-
-const editRef = shallowRef<InstanceType<typeof ImportPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    warehouse_id: '',
-    product_name: '',
-    financial_pm: 1,
-    store_id: '',
-    bar_code: '',
-    start_time: '',
-    end_time: '',
-    supplier_id: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('warehouse_produc_pm')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseProductLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-const handleEnter = async (id: number | any[]) => {
-    // await feedback.confirm('确定要删除？')
-    await apiWarehouseProductEnter({ id })
-    getLists()
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiWarehouseProductDelete({ id })
-    getLists()
-}
-const startEndTime = ref([])
-
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/warehouse_product/outbound_list.vue b/src/views/warehouse_product/outbound_list.vue
deleted file mode 100644
index 02b81da6f..000000000
--- a/src/views/warehouse_product/outbound_list.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="单号" prop="code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.code"
-                        clearable
-                        placeholder="请输入单号"
-                    />
-                </el-form-item>
-                <el-form-item label="门店名称" prop="store_id">
-                    <div class="flex items-center mr-4">
-                        <el-select
-                            v-model="queryParams.store_id"
-                            filterable
-                            remote
-                            reserve-keyword
-                            placeholder="输入门店名称搜索"
-                            remote-show-suffix
-                            :remote-method="remoteMethod"
-                            :loading="storeloading"
-                            style="width: 240px"
-                            @change="resetPage"
-                        >
-                            <el-option
-                                v-for="item in storeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </div>
-                </el-form-item>
-                <el-form-item label="仓库ID" prop="warehouse_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.warehouse_id"
-                        clearable
-                        placeholder="请输入仓库"
-                    />
-                </el-form-item>
-                <el-form-item label="商品" prop="product_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.product_name"
-                        clearable
-                        placeholder="请输入商品"
-                    />
-                </el-form-item>
-                <el-form-item label="商品条码" prop="bar_code">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.bar_code"
-                        clearable
-                        placeholder="请输入商品条码"
-                    />
-                </el-form-item>
-                <el-form-item label="日期" prop="create_time">
-                    <el-date-picker
-                        v-model="startEndTime"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        unlink-panels
-                        @change="changeStartEndTime"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="apiWarehouseProductLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <router-link
-                :to="{
-                    path: 'import'
-                }"
-                class="ml-4"
-            >
-                <el-button type="primary"> 出库 </el-button>
-            </router-link> -->
-
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="单号" prop="code" show-overflow-tooltip />
-                    <el-table-column label="操作人员" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="仓库" prop="warehouse_name" show-overflow-tooltip />
-                    <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
-                    <el-table-column label="图片" prop="image" min-width="80">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="出入库"
-                        prop="financial_pm_name"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="门店" prop="system_store_name" show-overflow-tooltip />
-                    <el-table-column label="订单类型" prop="order_type_name" show-overflow-tooltip />
-                    <el-table-column label="总价" prop="total_price" show-overflow-tooltip />
-                    <el-table-column label="批次" prop="batch" show-overflow-tooltip />
-                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                    <el-table-column label="操作时间" prop="create_time" show-overflow-tooltip />
-                    <!-- <el-table-column label="状态" prop="status_name" show-overflow-tooltip /> -->
-                    <el-table-column label="备注" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span style="color: red">{{ row.mark }}</span>
-                        </template>
-                    </el-table-column>
-                    <!-- <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['warehouse_product.warehouse_product/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                                v-if="row.status == 0"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['warehouse_product.warehouse_product/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                            <el-button
-                                v-perms="['warehouse_product.warehouse_product/enter']"
-                                type="primary"
-                                link
-                                @click="handleEnter(row.id)"
-                                v-if="row.status == 0"
-                            >
-                                确认
-                            </el-button>
-                        </template>
-                    </el-table-column> -->
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseProductLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiWarehouseProductLists,
-    apiWarehouseProductDelete,
-    apiWarehouseProductEnter
-} from '@/api/warehouse_product'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import { apiSystemStoreLists } from '@/api/system_store'
-import moment from 'moment'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    warehouse_id: '',
-    product_name: '',
-    financial_pm: 0,
-    store_id: '',
-    bar_code: '',
-    start_time: '',
-    code: '',
-    end_time: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('warehouse_produc_pm')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseProductLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-const handleEnter = async (id: number | any[]) => {
-    // await feedback.confirm('确定要删除？')
-    await apiWarehouseProductEnter({ id })
-    getLists()
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiWarehouseProductDelete({ id })
-    getLists()
-}
-const startEndTime = ref([])
-
-const changeStartEndTime = () => {
-    if (startEndTime.value[0] && startEndTime.value[1]) {
-        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
-        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
-    } else {
-        queryParams.start_time = ''
-        queryParams.end_time = ''
-    }
-    getLists()
-}
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-onMounted(() => {
-    getLists()
-})
-</script>
diff --git a/src/views/warehouse_product/warehousing.vue b/src/views/warehouse_product/warehousing.vue
deleted file mode 100644
index fad7fa84e..000000000
--- a/src/views/warehouse_product/warehousing.vue
+++ /dev/null
@@ -1,288 +0,0 @@
-<template>
-    <el-card>
-        <div class="mb-4 text-lg font-bold">商品入库操作</div>
-        <div>
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <el-form-item label="仓库" prop="uid">
-                    <el-select v-model="formData.warehouse_id" style="width: 240px">
-                        <el-option
-                            v-for="item in warehouseList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="供应商" prop="supplier_id">
-                    <el-select
-                        v-model="formData.supplier_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入供应商名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="item.mer_name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="单号" prop="code">
-                    <el-input
-                        v-model="formData.code"
-                        clearable
-                        placeholder="请输入单号"
-                        :readonly="false"
-                        style="width: 240px"
-                    />
-                </el-form-item>
-                <el-form-item label="总价" prop="total_price">
-                    <el-input
-                        v-model="formData.total_price"
-                        clearable
-                        placeholder="请输入总价"
-                        :readonly="false"
-                        style="width: 240px"
-                    />
-                </el-form-item>
-                <el-form-item label="已结金额" prop="completed_amount">
-                    <el-input
-                        v-model="formData.completed_amount"
-                        clearable
-                        placeholder="请输入已结金额"
-                        :readonly="false"
-                        style="width: 240px"
-                    />
-                </el-form-item>
-                <el-form-item label="未结金额" prop="outstanding_amount">
-                    <el-input
-                        v-model="formData.outstanding_amount"
-                        clearable
-                        placeholder="请输入未接金额"
-                        :readonly="false"
-                        style="width: 240px"
-                    />
-                </el-form-item>
-                <el-form-item label="备注">
-                    <el-input v-model="formData.remark" type="input" rows="4" />
-                </el-form-item>
-                <el-form-item label="商品" prop="store_id">
-                    <div class="flex-1 w-full">
-                        <div class="mb-2">
-                            <el-button type="primary" @click="showProduct = true"
-                                >添加商品</el-button
-                            >
-                        </div>
-                        <el-table :data="productList">
-                            <el-table-column label="商品ID" prop="id" show-overflow-tooltip />
-                            <el-table-column label="商品图片" prop="image" min-width="80">
-                                <template #default="{ row }">
-                                    <el-image
-                                        style="width: 50px; height: 50px"
-                                        :src="row.image"
-                                        :preview-teleported="true"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                label="商品名称"
-                                prop="store_name"
-                                min-width="200"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column
-                                label="单位"
-                                prop="unit_name"
-                                min-width="80"
-                                show-overflow-tooltip
-                            />
-                            <el-table-column label="生产日期" min-width="240">
-                                <template #default="{ row }">
-                                    <el-date-picker
-                                        :readonly="false"
-                                        class="flex-1 !flex"
-                                        v-model="row.manufacture"
-                                        clearable
-                                        type="datetime"
-                                        value-format="YYYY-MM-DD"
-                                        placeholder="选择生产日期"
-                                    >
-                                    </el-date-picker>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="保质期" min-width="240">
-                                <template #default="{ row }">
-                                    <el-date-picker
-                                        :readonly="false"
-                                        class="flex-1 !flex"
-                                        v-model="row.expiration_date"
-                                        clearable
-                                        type="datetime"
-                                        value-format="YYYY-MM-DD"
-                                        placeholder="选择保质期"
-                                    >
-                                    </el-date-picker>
-                                </template>
-                            </el-table-column>
-
-                            <el-table-column label="数量" min-width="150">
-                                <template #default="{ row }">
-                                    <el-input v-model="row.nums" @change="handleChange(row)" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="价格" min-width="150">
-                                <template #default="{ row }">
-                                    <el-input v-model="row.purchases" @change="handleChange(row)" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="总价" min-width="150">
-                                <template #default="{ row }">
-                                    <el-input v-model="row.total_price" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" width="120" fixed="right">
-                                <template #default="{ row }">
-                                    <el-button
-                                        type="danger"
-                                        link
-                                        @click="handleDeleteProdut(row.id)"
-                                    >
-                                        删除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-form-item>
-                <el-form-item label="">
-                    <el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <el-dialog v-model="showProduct" title="选择商品" width="70%">
-            <product-pop @onBindStore="onBindProduct"></product-pop>
-        </el-dialog>
-    </el-card>
-</template>
-
-<script lang="ts" setup name="storeProductEdit">
-import { ElMessage, type FormInstance } from 'element-plus'
-import useMultipleTabs from '@/hooks/useMultipleTabs'
-import { apiStoreProductImport } from '@/api/store_product'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-import { onMounted } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { apiWarehouseOrderAdd } from '@/api/warehouse_order'
-import { apiWarehouseLists } from '@/api/warehouse'
-import { apiSupplierLists } from '@/api/supplier'
-
-const route = useRoute()
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const { removeTab } = useMultipleTabs()
-
-const warehouseList = ref([])
-
-// 表单数据
-const formData = reactive({
-    total_price: '',
-    warehouse_id: '',
-    supplier_id: '',
-    code: '',
-    total_price: 0,
-    remark: '',
-    outstanding_amount: 0,
-    completed_amount: 0
-})
-
-const warehouse = () => {
-    apiWarehouseLists({}).then((res) => {
-        warehouseList.value = res.lists
-    })
-}
-
-const showProduct = ref(false) // 选择商品列表是否显示
-// 商品列表
-const productList = ref([])
-// 删除已有商品
-const handleDeleteProdut = (id: number) => {
-    productList.value = productList.value.filter((item: any) => item.id !== id)
-}
-// 选择商品
-const onBindProduct = (e: any[]) => {
-    e.forEach((item: any) => {
-        if (!productList.value.find((t: any) => t.id == item.id)) {
-            productList.value.push(item)
-        }
-    })
-    showProduct.value = false
-}
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiSupplierLists({ mer_name: e })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-function handleChange(row) {
-    row.total_price = row.nums * row.purchases
-    if (row.total_price > 0) {
-        formData.total_price = parseFloat(formData.total_price) + parseFloat(row.total_price)
-    }
-}
-
-const router = useRouter()
-// 提交按钮
-const handleSubmit = async () => {
-    const product_arr = productList.value.map((item: any) => {
-        return {
-            product_id: item.id,
-            nums: item.nums,
-            purchase: item.purchases || 0,
-            total_price: item.total_price || 0,
-            manufacture: item.manufacture,
-            expiration_date: item.expiration_date
-        }
-    })
-    apiWarehouseOrderAdd({
-        product_arr,
-        ...formData
-    }).then((res) => {
-        // removeTab()
-        // if (res.code == 1) {
-        // ElMessage.success(res.msg)
-        setTimeout(() => {
-            router.push({
-                path: '/warehouse/warehouse_order'
-            })
-        }, 2000)
-        // } else {
-        //     ElMessage.error(res.msg)
-        // }
-    })
-}
-warehouse()
-</script>
diff --git a/src/views/warehouse_product_return/details.vue b/src/views/warehouse_product_return/details.vue
deleted file mode 100644
index c6d2e15d6..000000000
--- a/src/views/warehouse_product_return/details.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseProductReturnDETAILS">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiWarehouseProductReturnAdd, apiWarehouseProductReturnEdit, apiWarehouseProductReturnDetail } from '@/api/warehouse_product_return'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiWarehouseProductReturnDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-//打开弹窗
-const open = () => {
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/warehouse_product_return/edit.vue b/src/views/warehouse_product_return/edit.vue
deleted file mode 100644
index 63a57aff8..000000000
--- a/src/views/warehouse_product_return/edit.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseProductReturnEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiWarehouseProductReturnAdd, apiWarehouseProductReturnEdit, apiWarehouseProductReturnDetail } from '@/api/warehouse_product_return'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑仓库商品退货处理' : '新增仓库商品退货处理'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiWarehouseProductReturnDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiWarehouseProductReturnEdit(data) 
-        : await apiWarehouseProductReturnAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/warehouse_product_return/index.vue b/src/views/warehouse_product_return/index.vue
deleted file mode 100644
index 41ec12193..000000000
--- a/src/views/warehouse_product_return/index.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="仓库ID" prop="warehouse_id">
-                    <el-input class="w-[280px]" v-model="queryParams.warehouse_id" clearable placeholder="请输入仓库ID" />
-                </el-form-item>
-                <el-form-item label="供应商id" prop="supplier_id">
-                    <el-input class="w-[280px]" v-model="queryParams.supplier_id" clearable placeholder="请输入供应商id" />
-                </el-form-item>
-                <el-form-item label="门店id" prop="store_id">
-                    <el-input class="w-[280px]" v-model="queryParams.store_id" clearable placeholder="请输入门店id" />
-                </el-form-item>
-                <el-form-item label="商品ID" prop="product_id">
-                    <el-input class="w-[280px]" v-model="queryParams.product_id" clearable placeholder="请输入商品ID" />
-                </el-form-item>
-                <el-form-item label="单号id" prop="oid">
-                    <el-input class="w-[280px]" v-model="queryParams.oid" clearable placeholder="请输入单号id" />
-                </el-form-item>
-                <el-form-item label="单号" prop="code">
-                    <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入单号" />
-                </el-form-item>
-                <el-form-item label="1仓库2供应商" prop="return_type">
-                    <el-input class="w-[280px]" v-model="queryParams.return_type" clearable placeholder="请输入1仓库2供应商" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['warehouse_product_return.warehouse_product_return/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['warehouse_product_return.warehouse_product_return/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="仓库ID" prop="warehouse_id" show-overflow-tooltip />
-                    <el-table-column label="供应商id" prop="supplier_id" show-overflow-tooltip />
-                    <el-table-column label="门店id" prop="store_id" show-overflow-tooltip />
-                    <el-table-column label="商品ID" prop="product_id" show-overflow-tooltip />
-                    <el-table-column label="单位" prop="unit" show-overflow-tooltip />
-                    <el-table-column label="单号id" prop="oid" show-overflow-tooltip />
-                    <el-table-column label="单号" prop="code" show-overflow-tooltip />
-                    <el-table-column label="0 = 出库 1 = 获得" prop="financial_pm" show-overflow-tooltip />
-                    <el-table-column label="填写人员" prop="admin_id" show-overflow-tooltip />
-                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                    <el-table-column label="零售价格" prop="price" show-overflow-tooltip />
-                    <el-table-column label="总价格" prop="total_price" show-overflow-tooltip />
-                    <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
-                    <el-table-column label="商户价" prop="cost" show-overflow-tooltip />
-                    <el-table-column label="1仓库2供应商" prop="return_type" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['warehouse_product_return.warehouse_product_return/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['warehouse_product_return.warehouse_product_return/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="warehouseProductReturnLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiWarehouseProductReturnLists, apiWarehouseProductReturnDelete } from '@/api/warehouse_product_return'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    warehouse_id: '',
-    supplier_id: '',
-    store_id: '',
-    product_id: '',
-    oid: '',
-    code: '',
-    return_type: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWarehouseProductReturnLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiWarehouseProductReturnDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-