From ad740ab1fa8ea629287c4188aada28382933f7bd Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 4 Mar 2025 16:18:50 +0800
Subject: [PATCH] =?UTF-8?q?refactor(psi):=20=E9=87=8D=E6=9E=84=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了供应商相关无用代码
- 优化了商品列表展示逻辑
- 删除了未使用的复制订单、报损、订单流程等功能组件
- 新增了追加商品和分拣相关 API 接口
---
 src/api/psi/purchase_product.ts               |  23 +
 src/api/{ => psi}/supplier.ts                 |  12 +-
 src/components/productPop/index.vue           |  54 +-
 .../psi/purchase_order/component/copyPop.vue  |  77 --
 .../psi/purchase_order/component/damage.vue   | 170 ----
 .../psi/purchase_order/component/drawer.vue   | 151 ----
 .../purchase_order/component/goodsOffer.vue   | 547 -------------
 .../component/orderCartInfo.vue               | 370 ---------
 .../psi/purchase_order/component/outbound.vue | 315 -------
 .../component/returnSupplier.vue              |  56 --
 .../component/returnWarehouse.vue             | 125 ---
 .../purchase_order/component/warehousing.vue  | 114 ---
 src/views/psi/purchase_order/details.vue      | 766 +++++++-----------
 src/views/psi/purchase_order/editProduct.vue  | 203 +++++
 src/views/psi/purchase_order/index.vue        |  10 +-
 src/views/psi/purchase_order_info/index.vue   |   2 +-
 .../editProduct.vue => supplier/edit.vue}     | 126 +--
 src/views/psi/supplier/index.vue              | 155 ++++
 18 files changed, 775 insertions(+), 2501 deletions(-)
 rename src/api/{ => psi}/supplier.ts (84%)
 delete mode 100644 src/views/psi/purchase_order/component/copyPop.vue
 delete mode 100644 src/views/psi/purchase_order/component/damage.vue
 delete mode 100644 src/views/psi/purchase_order/component/drawer.vue
 delete mode 100644 src/views/psi/purchase_order/component/goodsOffer.vue
 delete mode 100644 src/views/psi/purchase_order/component/orderCartInfo.vue
 delete mode 100644 src/views/psi/purchase_order/component/outbound.vue
 delete mode 100644 src/views/psi/purchase_order/component/returnSupplier.vue
 delete mode 100644 src/views/psi/purchase_order/component/returnWarehouse.vue
 delete mode 100644 src/views/psi/purchase_order/component/warehousing.vue
 create mode 100644 src/views/psi/purchase_order/editProduct.vue
 rename src/views/psi/{purchase_order/component/editProduct.vue => supplier/edit.vue} (53%)
 create mode 100644 src/views/psi/supplier/index.vue

diff --git a/src/api/psi/purchase_product.ts b/src/api/psi/purchase_product.ts
index 8aac0f84b..a9070e2f4 100644
--- a/src/api/psi/purchase_product.ts
+++ b/src/api/psi/purchase_product.ts
@@ -23,6 +23,17 @@ export function apiWarehouseProductEdit(params: any) {
         { urlPrefix: 'psi' }
     )
 }
+/**
+ * 追加商品
+ * @param params
+ * @returns
+ */
+export function apiWarehouseProductArr(params: any) {
+    return request.post(
+        { url: '/purchase_product/purchaseproduct/add_arr', params },
+        { urlPrefix: 'psi' }
+    )
+}
 
 // 删除商品仓储信息
 export function apiWarehouseProductDelete(params: any) {
@@ -65,3 +76,15 @@ export function apiWarehouseProductSetNums(params: any) {
         { urlPrefix: 'psi' }
     )
 }
+
+/**
+ * 分拣
+ * @param params
+ * @returns
+ */
+export function apiWarehouseProductWarehouse(params: any) {
+    return request.post(
+        { url: '/purchase_product/purchaseproduct/warehouse', params },
+        { urlPrefix: 'psi' }
+    )
+}
diff --git a/src/api/supplier.ts b/src/api/psi/supplier.ts
similarity index 84%
rename from src/api/supplier.ts
rename to src/api/psi/supplier.ts
index 01c7448bf..31e8a6fd1 100644
--- a/src/api/supplier.ts
+++ b/src/api/psi/supplier.ts
@@ -2,25 +2,25 @@ import request from '@/utils/request'
 
 // 供应商户表列表
 export function apiSupplierLists(params: any) {
-    return request.get({ url: '/supplier/supplier/lists', params })
+    return request.get({ url: '/supplier/supplier/lists', params }, { urlPrefix: 'psi' })
 }
 
 // 添加供应商户表
 export function apiSupplierAdd(params: any) {
-    return request.post({ url: '/supplier/supplier/add', params })
+    return request.post({ url: '/supplier/supplier/add', params }, { urlPrefix: 'psi' })
 }
 
 // 编辑供应商户表
 export function apiSupplierEdit(params: any) {
-    return request.post({ url: '/supplier/supplier/edit', params })
+    return request.post({ url: '/supplier/supplier/edit', params }, { urlPrefix: 'psi' })
 }
 
 // 删除供应商户表
 export function apiSupplierDelete(params: any) {
-    return request.post({ url: '/supplier/supplier/delete', params })
+    return request.post({ url: '/supplier/supplier/delete', params }, { urlPrefix: 'psi' })
 }
 
 // 供应商户表详情
 export function apiSupplierDetail(params: any) {
-    return request.get({ url: '/supplier/supplier/detail', params })
-}
\ No newline at end of file
+    return request.get({ url: '/supplier/supplier/detail', params }, { urlPrefix: 'psi' })
+}
diff --git a/src/components/productPop/index.vue b/src/components/productPop/index.vue
index 889713263..4b5329628 100644
--- a/src/components/productPop/index.vue
+++ b/src/components/productPop/index.vue
@@ -58,7 +58,6 @@
                     min-width="100"
                     show-overflow-tooltip
                 />
-                <el-table-column label="成本价" prop="cost" min-width="100" show-overflow-tooltip />
                 <el-table-column
                     label="供货价"
                     prop="purchase"
@@ -71,20 +70,6 @@
                     min-width="100"
                     show-overflow-tooltip
                 />
-                <el-table-column
-                    label="兑换库存"
-                    prop="swap"
-                    min-width="100"
-                    show-overflow-tooltip
-                    v-if="props.is_warehouse != 1"
-                />
-                <el-table-column
-                    label="销量"
-                    prop="sales"
-                    min-width="100"
-                    show-overflow-tooltip
-                    v-if="props.is_warehouse != 1"
-                />
             </el-table>
         </div>
         <div class="flex mt-4 justify-end">
@@ -98,8 +83,6 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiStoreProductLists } from '@/api/store_product'
-import { apiStoreBranchProductLists } from '@/api/store_branch_product'
-import { apiWarehouseProductStoregeLists } from '@/api/warehouse_product_storege'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import { ElMessage } from 'element-plus'
@@ -114,7 +97,6 @@ const props = defineProps<{
 // 查询条件
 const queryParams = reactive({
     store_name: '',
-    warehouse_id: '',
     store_id: '',
     product_type: ''
 })
@@ -132,35 +114,12 @@ const handleSelectionChange = (val: any[]) => {
 const { dictData } = useDictData('')
 
 // 分页相关
-if (props.is_warehouse == 1) {
-    if (props.warehouse_id == '' || props.warehouse_id == null) {
-        ElMessage.error('请先选择仓库')
-    } else {
-        queryParams.warehouse_id = props.warehouse_id
-        datas.value = {
-            fetchFun: apiWarehouseProductStoregeLists,
-            params: queryParams
-        }
-    }
-} else {
-    if (props.is_branch == 1) {
-        if (props.store_id == '' || props.store_id == null) {
-            ElMessage.error('请先选择门店')
-        } else {
-            queryParams.store_id = props.store_id
-        }
-        datas.value = {
-            fetchFun: apiStoreBranchProductLists,
-            params: queryParams
-        }
-    } else {
-        queryParams.product_type = '0'
-        datas.value = {
-            fetchFun: apiStoreProductLists,
-            params: queryParams
-        }
-    }
+
+datas.value = {
+    fetchFun: apiStoreProductLists,
+    params: queryParams
 }
+
 const productList = () => {
     getLists()
 }
@@ -170,8 +129,9 @@ getLists()
 const emits = defineEmits(['onBindStore'])
 // 绑定用户
 const bindStore = () => {
+    console.log(223)
     const list = pager.lists.filter((item) => selectData.value.includes(item.id))
-    if (!list.length) return ElMessage.error('请先选择门店')
+    if (!list.length) return ElMessage.error('请先选择商品')
     emits('onBindStore', list)
 }
 </script>
diff --git a/src/views/psi/purchase_order/component/copyPop.vue b/src/views/psi/purchase_order/component/copyPop.vue
deleted file mode 100644
index ee57f8d3e..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/component/damage.vue b/src/views/psi/purchase_order/component/damage.vue
deleted file mode 100644
index 4770c7a25..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/component/drawer.vue b/src/views/psi/purchase_order/component/drawer.vue
deleted file mode 100644
index 09a83b94e..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/component/goodsOffer.vue b/src/views/psi/purchase_order/component/goodsOffer.vue
deleted file mode 100644
index e7b104b00..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/component/orderCartInfo.vue b/src/views/psi/purchase_order/component/orderCartInfo.vue
deleted file mode 100644
index b2b60d1bc..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/component/outbound.vue b/src/views/psi/purchase_order/component/outbound.vue
deleted file mode 100644
index 2b95b62c1..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/component/returnSupplier.vue b/src/views/psi/purchase_order/component/returnSupplier.vue
deleted file mode 100644
index 6213aafb2..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/component/returnWarehouse.vue b/src/views/psi/purchase_order/component/returnWarehouse.vue
deleted file mode 100644
index 16aa3c565..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/component/warehousing.vue b/src/views/psi/purchase_order/component/warehousing.vue
deleted file mode 100644
index 18cb675ac..000000000
--- a/src/views/psi/purchase_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/psi/purchase_order/details.vue b/src/views/psi/purchase_order/details.vue
index 655dfd6ed..a720e1373 100644
--- a/src/views/psi/purchase_order/details.vue
+++ b/src/views/psi/purchase_order/details.vue
@@ -1,92 +1,13 @@
 <template>
-    <el-card>
+    <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.other_data?.nickname }}</div>
+                <div style="color: gray">仓库：</div>
+                <div style="color: black">{{ formData.warehouse_name }}</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 style="color: black">{{ formData.code }}</div>
             </div>
         </div>
         <div class="flex items-center justify-between m-4">
@@ -94,95 +15,97 @@
                 <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>
+            <el-button @click="xlsx(formData.id, 1)"> 打印采购单 </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-button type="primary" @click="dialogShop = true"> 追加商品 </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-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="price" show-overflow-tooltip />
+                            <el-table-column label="零售价" prop="price" show-overflow-tooltip />
+                            <el-table-column label="状态" prop="is_warehouse" show-overflow-tooltip>
+                                <template #default="{ row }">
+                                    <el-tag :type="row.is_warehouse == 0 ? 'danger' : 'success'">{{
+                                        row.is_warehouse == 0 ? '未入库' : '已入库'
+                                    }}</el-tag>
+                                </template>
+                            </el-table-column>
+                            <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-if="row.is_warehouse == 0"
+                                        type="primary"
+                                        link
+                                        v-perms="[
+                                            'beforehand_order.beforehand_order/oneClickStorage'
+                                        ]"
+                                        @click="storeroomClick(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-card>
-    <el-dialog v-model="dialogShop" title="追加商品" width="1200">
-        <el-form ref="formRef" label-width="90px">
+    </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 />
+                <el-table-column label="ID" prop="id" show-overflow-tooltip />
+
                 <el-table-column label="商品图片" prop="image" min-width="80">
                     <template #default="{ row }">
                         <el-image
@@ -195,7 +118,7 @@
                 <el-table-column
                     label="商品名称"
                     prop="store_name"
-                    min-width="180"
+                    min-width="160"
                     show-overflow-tooltip
                 />
                 <el-table-column
@@ -207,50 +130,74 @@
                 <el-table-column
                     label="单位"
                     prop="unit_name"
-                    min-width="80"
+                    min-width="60"
                     show-overflow-tooltip
                 />
-                <el-table-column label="数量" min-width="150">
+                <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="价格" min-width="150">
+                <el-table-column label="价格" width="100">
                     <template #default="{ row }">
-                        <el-input v-model="row.price" disabled />
+                        <el-input v-model="row.price" @change="handleChange(row)" />
                     </template>
                 </el-table-column>
-                <el-table-column label="总价" min-width="150">
+                <el-table-column label="总价" width="100">
                     <template #default="{ row }">
-                        <el-input v-model="row.total_price" disabled />
+                        <el-input v-model="row.total_price" />
                     </template>
                 </el-table-column>
-                <el-table-column label="生产日期" min-width="140">
+                <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.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>
+                <el-table-column label="生产日期" prop="manufacture" width="160">
                     <template #default="{ row }">
                         <el-date-picker
-                            :readonly="false"
-                            class="flex-1 !flex"
                             v-model="row.manufacture"
-                            clearable
                             type="date"
+                            clearable
                             value-format="YYYY-MM-DD"
-                            placeholder="选择生产日期"
-                        >
-                        </el-date-picker>
+                            placeholder="请输入生产日期"
+                        />
                     </template>
                 </el-table-column>
-                <el-table-column label="保质期" min-width="140">
+                <el-table-column label="保质期" prop="expiration_date" width="160">
                     <template #default="{ row }">
                         <el-date-picker
-                            :readonly="false"
-                            class="flex-1 !flex"
                             v-model="row.expiration_date"
-                            clearable
                             type="date"
+                            clearable
                             value-format="YYYY-MM-DD"
-                            placeholder="选择保质期"
-                        >
-                        </el-date-picker>
+                            placeholder="请输入保质期"
+                        />
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
@@ -265,119 +212,57 @@
         <template #footer>
             <div class="dialog-footer">
                 <el-button @click="dialogShop = false">取消</el-button>
-                <el-button type="primary" @click="appendAdd"> 确认 </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="1"
-        ></product-pop> -->
-        <product-warehouse-pop
-            :key="productModalKey"
-            :userId="formData.uid"
-            :order_type="formData.order_type"
-            @onBindStore="onBindProduct"
-        ></product-warehouse-pop>
+        <product-pop @onBindStore="onBindProduct"></product-pop>
     </el-dialog>
-
-    <el-dialog v-model="generateOrderShow" title="生成支付订单设置" width="600">
-        <el-form :model="generateOrderData" label-width="90px">
-            <el-form-item label="用户">
+    <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    <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="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="请选择门店"
+                    v-model="storeroom.warehouse_id"
+                    placeholder="请选择仓库"
                     size="large"
                     style="width: 240px"
                 >
                     <el-option
-                        v-for="item in storeList"
-                        :key="item.id"
+                        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="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 label="采购数量" prop="buyer_nums">
+                <el-input v-model="storeroom.buyer_nums" readonly />
             </el-form-item>
-            <el-form-item label="优惠金额" prop="deduction_price">
+            <el-form-item label="分拣数量" prop="nums">
                 <el-input
-                    v-model="generateOrderData.deduction_price"
+                    v-model="storeroom.nums"
                     clearable
-                    placeholder="请输入优惠金额"
+                    placeholder="请输入分拣数量"
                     :readonly="false"
                 />
             </el-form-item>
             <el-form-item label="备注" prop="mark">
                 <el-input
-                    v-model="generateOrderData.mark"
+                    v-model="storeroom.mark"
                     clearable
-                    placeholder="请输入订单备注"
+                    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>
+                <el-button @click="storeroomShow = false">取消</el-button>
+                <el-button type="primary" @click="putInStorage" :disabled="disableClick">
+                    确认
+                </el-button>
             </div>
         </template>
     </el-dialog>
@@ -385,66 +270,33 @@
 
 <script lang="ts" setup name="storeOrderDETAILS">
 import { ElMessage, type FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
 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'
+    apiWarehouseProductLists,
+    apiWarehouseProductDelete,
+    apiWarehouseProductWarehouse,
+    apiWarehouseProductArr
+} from '@/api/psi/purchase_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 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 { hiprint } from 'vue-plugin-hiprint'
-import { apiDeliveryServiceLists } from '@/api/delivery_service'
-import { apiPurchaseProductOfferAddPurchasesOneClick } from '@/api/purchase_product_offer'
+import feedback from '@/utils/feedback'
+import EditPopup from './editProduct.vue'
+import { apiSupplierLists } from '@/api/psi/supplier'
+import { apiPsiWarehouseLists } from '@/api/psi/warehouse'
 
-const generateOrderShow = ref(false)
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = 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[]>>,
@@ -459,6 +311,10 @@ const activeName = ref('second')
 const warehouse_id = ref(0)
 const is_warehouse = ref(0)
 const financial_pm = ref(0)
+const warehouse_list = ref([])
+const storeroomShow = ref(false)
+const disableClick = ref(false)
+
 // 表单数据
 const formData = ref({
     id: '',
@@ -467,119 +323,74 @@ const formData = ref({
     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: ''
+    supplier_id: '',
+    financial_pm: '',
+    manufacture: '',
+    expiration_date: ''
 })
-const appendAdd = () => {
+const updateInfo = ref({})
+const goodsOfferUpdate = () => {
     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
+        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,
+                price: item.price || 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,
+                price: item.price || 0,
+                total_price: item.total_price || 0,
+                manufacture: item.manufacture,
+                expiration_date: item.expiration_date
+            }
         }
     })
-    apiBeforehandOrderCartInfoAppendAdd({
-        id: queryParams.bhoid,
+    apiWarehouseProductArr({
+        oid: queryParams.oid,
         product_arr: product_arr
     }).then((res) => {
         dialogShop.value = false
+        getLists()
     })
-    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: ''
+    oid: '',
+    pay_type: ''
 })
 
-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)
-            })
-        }
-    })
+const getDetail = async (row: Record<string, any>) => {
+    queryParams.oid = row.id
+    warehouse_id.value = row.warehouse_id
+    productList.value = []
+    formData.value = { ...row }
+    getLists()
 }
-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 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) // 选择商品列表是否显示
 // 商品列表
@@ -592,6 +403,8 @@ const handleDeleteProdut = (id: number) => {
 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)
         }
     })
@@ -600,76 +413,91 @@ const onBindProduct = (e: any[]) => {
 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
-    })
+const isSubmit = ref(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) => {
-            userList.value = res.lists
+            supplierList.value = res.lists
             setTimeout(() => {
-                userloading.value = false
+                supplierLoading.value = false
             }, 300)
         })
         .catch((err) => {
             setTimeout(() => {
-                userloading.value = false
+                supplierLoading.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 open = () => {
+    showDialog.value = true
+    console.log('open', showDialog.value)
 }
-const purchase_product_offer = ref({
-    order_id: '',
-    buyer_id: ''
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiWarehouseProductLists,
+    params: queryParams
 })
-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 storeroom = ref({
+    id: '',
+    nums: '',
+    buyer_nums: '',
+    warehouse_id: '',
+    mark: ''
+})
+const storeroomClick = (data: any) => {
+    storeroom.value.id = data.id
+    storeroom.value.buyer_nums = data.nums
+    storeroom.value.nums = data.nums
+    storeroom.value.warehouse_id = data.warehouse_id
+    storeroom.value.mark = data.mark
+    storeroomShow.value = true
+    apiPsiWarehouseLists({}).then((res) => {
+        warehouse_list.value = res.lists
     })
 }
-const delivery_list = ref([])
-const DeliveryService = () => {
-    apiDeliveryServiceLists({ type: 3 }).then((res) => {
-        delivery_list.value = res.lists
-    })
+const putInStorage = () => {
+    try {
+        apiWarehouseProductWarehouse(storeroom.value).then((res) => {
+            storeroomShow.value = false
+            disableClick.value = false
+            getLists()
+        })
+    } catch (error) {
+        setTimeout(() => {
+            disableClick.value = false
+        }, 2000)
+    }
 }
-/**
- * 是否需采购
- * @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++
+const xlsx2 = (id) => {
+    // apiWarehouseOrderExportTags({
+    //     id: id
+    // }).then((res) => {
+    //     window.open(res.url, '_blank')
+    //     ElMessage.success('导出成功')
+    // })
 }
 defineExpose({
-    open
+    open,
+    getDetail
 })
 </script>
diff --git a/src/views/psi/purchase_order/editProduct.vue b/src/views/psi/purchase_order/editProduct.vue
new file mode 100644
index 000000000..8f1bc4d2f
--- /dev/null
+++ b/src/views/psi/purchase_order/editProduct.vue
@@ -0,0 +1,203 @@
+<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="供应商">
+                    <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.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="price">
+                    <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">
+                    <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 { apiWarehouseProductEdit } from '@/api/psi/purchase_product'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+import { apiSupplierLists } from '@/api/psi/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() {
+    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/psi/purchase_order/index.vue b/src/views/psi/purchase_order/index.vue
index 3cab7782f..242de54a0 100644
--- a/src/views/psi/purchase_order/index.vue
+++ b/src/views/psi/purchase_order/index.vue
@@ -125,13 +125,13 @@
             @success="getLists"
             @close="showEdit = false"
         /> -->
-        <!-- <details-popup
+        <details-popup
             v-if="showDetails"
             ref="detailsRef"
             @success="getLists"
             @close="showDetails = false"
             :dictData="dictData"
-        /> -->
+        />
     </div>
 </template>
 
@@ -142,12 +142,12 @@ import { apiWarehouseOrderLists, apiWarehouseOrderDelete } from '@/api/psi/purch
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 // import EditPopup from './edit.vue'
-// import DetailsPopup from './details.vue'
+import DetailsPopup from './details.vue'
 import { apiSystemStoreLists } from '@/api/system_store'
 import moment from 'moment'
-import { apiSupplierLists } from '@/api/supplier'
+import { apiSupplierLists } from '@/api/psi/supplier'
 const editRef = ref()
-const detailsRef = ref()
+const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
 
 // 是否显示编辑框
 const showEdit = ref(false)
diff --git a/src/views/psi/purchase_order_info/index.vue b/src/views/psi/purchase_order_info/index.vue
index 4f3289ed2..11f5cfa7d 100644
--- a/src/views/psi/purchase_order_info/index.vue
+++ b/src/views/psi/purchase_order_info/index.vue
@@ -149,7 +149,7 @@ import feedback from '@/utils/feedback'
 // import EditPopup from './edit.vue'
 import { apiSystemStoreLists } from '@/api/system_store'
 import moment from 'moment'
-import { apiSupplierLists } from '@/api/supplier'
+import { apiSupplierLists } from '@/api/psi/supplier'
 
 // 查询条件
 const queryParams = reactive({
diff --git a/src/views/psi/purchase_order/component/editProduct.vue b/src/views/psi/supplier/edit.vue
similarity index 53%
rename from src/views/psi/purchase_order/component/editProduct.vue
rename to src/views/psi/supplier/edit.vue
index 7d888585e..24c7dfa85 100644
--- a/src/views/psi/purchase_order/component/editProduct.vue
+++ b/src/views/psi/supplier/edit.vue
@@ -9,41 +9,43 @@
             @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-form-item label="商户名称" prop="name">
                     <el-input
-                        v-model="formData.nums"
+                        v-model="formData.mer_name"
                         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="请输入价格"
+                        placeholder="请输入商户名称"
                         :readonly="false"
                     />
                 </el-form-item>
-                <el-form-item label="备注" prop="mark">
+                <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="请输入备注"
+                        placeholder="请输入商户备注"
                         :readonly="false"
                     />
                 </el-form-item>
@@ -52,13 +54,10 @@
     </div>
 </template>
 
-<script lang="ts" setup name="warehouseOrderEdit">
+<script lang="ts" setup name="supplierEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import {
-    apiBeforehandOrderCartInfoEdit,
-    apiBeforehandOrderCartInfoDetail
-} from '@/api/beforehand_order_cart_info'
+import { apiSupplierAdd, apiSupplierEdit, apiSupplierDetail } from '@/api/psi/supplier'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -74,26 +73,59 @@ const mode = ref('add')
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑商品' : '新增商品仓储订单'
+    return mode.value == 'edit' ? '编辑供应商户表' : '新增供应商户表'
 })
 
 // 表单数据
 const formData = reactive({
     id: '',
-    bhoid: '',
-    type: 0,
-    store_name: '',
-    total_price: '',
-    nums: '',
-    purchases: '',
-    mark: ''
+    mer_name: '',
+    phone: '',
+    settle_cycle: '',
+    address: '',
+    mark: '',
+    status: ''
 })
 
 // 表单验证
-const formRules = reactive<any>({})
-const compute = () => {
-    formData.total_price = (formData.nums * formData.purchases).toFixed(2)
-}
+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) {
@@ -102,12 +134,10 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    formData.nums = data.cart_num
-    formData.purchases = data.price
 }
 
 const getDetail = async (row: Record<string, any>) => {
-    const data = await apiBeforehandOrderCartInfoDetail({
+    const data = await apiSupplierDetail({
         id: row.id
     })
     setFormData(data)
@@ -117,7 +147,7 @@ const getDetail = async (row: Record<string, any>) => {
 const handleSubmit = async () => {
     await formRef.value?.validate()
     const data = { ...formData }
-    await apiBeforehandOrderCartInfoEdit(data)
+    mode.value == 'edit' ? await apiSupplierEdit(data) : await apiSupplierAdd(data)
     popupRef.value?.close()
     emit('success')
 }
diff --git a/src/views/psi/supplier/index.vue b/src/views/psi/supplier/index.vue
new file mode 100644
index 000000000..c72563e41
--- /dev/null
+++ b/src/views/psi/supplier/index.vue
@@ -0,0 +1,155 @@
+<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="操作" 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"
+        />
+    </div>
+</template>
+
+<script lang="ts" setup name="supplierLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupplierLists, apiSupplierDelete } from '@/api/psi/supplier'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.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>