diff --git a/src/api/store_product_price.ts b/src/api/store_product_price.ts
index 8e29779f4..ad09d9da7 100644
--- a/src/api/store_product_price.ts
+++ b/src/api/store_product_price.ts
@@ -28,3 +28,7 @@ export function apiStoreProductPriceEnterPrice(params: any) {
 export function apiStoreProductPriceDetail(params: any) {
     return request.get({ url: '/store_product_price/storeproductprice/detail', params })
 }
+
+export function apiStoreProductPriceExport(params: any) {
+    return request.post({ url: '/store_product_price/storeproductprice/export', params })
+}
diff --git a/src/api/system_store_storage.ts b/src/api/system_store_storage.ts
index fb183b800..975d02fcb 100644
--- a/src/api/system_store_storage.ts
+++ b/src/api/system_store_storage.ts
@@ -28,4 +28,8 @@ export function apiSystemStoreStorageDetail(params: any) {
 // 门店一键确认入库
 export function apiSystemStoreStorageBatchConfirm(params: any) {
     return request.post({ url: '/system_store_storage/systemstorestorage/batchConfirm', params })
+}
+
+export function apiSystemStoreStorageRollback(params: any) {
+    return request.post({ url: '/system_store_storage/systemstorestorage/rollback', params })
 }
\ No newline at end of file
diff --git a/src/views/order/beforehand_order/details.vue b/src/views/order/beforehand_order/details.vue
index f700ebf19..a39786ef8 100644
--- a/src/views/order/beforehand_order/details.vue
+++ b/src/views/order/beforehand_order/details.vue
@@ -129,7 +129,7 @@
                 打印无价格出库单
             </el-button>
         </div>
-        <el-button type="primary" @click="dialogShop = true" v-if="formData.order_type != 7">
+        <el-button type="primary" @click="dialogShop = true">
             追加
         </el-button>
         <el-button
@@ -496,6 +496,7 @@ const appendAdd = () => {
         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,
@@ -509,6 +510,9 @@ const appendAdd = () => {
     }).then((res) => {
         dialogShop.value = false
     })
+	if (formData.value.order_type == 7) {
+		goodsOfferRef.value?.getList(formData.value.id)
+	}
 }
 const queryParams = reactive({
     bhoid: route.query.id,
diff --git a/src/views/store/system_store_storage/index.vue b/src/views/store/system_store_storage/index.vue
index 542194c17..c81a066a2 100644
--- a/src/views/store/system_store_storage/index.vue
+++ b/src/views/store/system_store_storage/index.vue
@@ -1,229 +1,205 @@
 <template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店" prop="store_id">
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="商品名称" prop="product_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.product_name"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
-                </el-form-item>
-                <!-- <el-form-item label="门店确认人员" prop="staff_name">
+	<div>
+		<el-card class="!border-none mb-4" shadow="never">
+			<el-form class="mb-[-16px]" :model="queryParams" inline>
+				<el-form-item label="门店" prop="store_id">
+					<el-select v-model="queryParams.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
+						remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px"
+						@change="resetPage">
+						<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="商品名称" prop="product_name">
+					<el-input class="w-[280px]" v-model="queryParams.product_name" @keydown.enter="resetPage" clearable
+						placeholder="请输入商品名称" />
+				</el-form-item>
+				<!-- <el-form-item label="门店确认人员" prop="staff_name">
                     <el-input class="w-[280px]" v-model="queryParams.staff_name" @keydown.enter="resetPage" clearable placeholder="请输入门店确认人员" />
                 </el-form-item> -->
-                <el-form-item label="状态" prop="status">
-                    <el-select
-                        v-model="queryParams.status"
-                        placeholder="输入门店名称搜索"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in [
+				<el-form-item label="状态" prop="status">
+					<el-select v-model="queryParams.status" placeholder="输入门店名称搜索" style="width: 240px"
+						@change="resetPage">
+						<el-option v-for="item in [
                                 { id: 1, name: '已入库' },
                                 { id: 0, name: '待确认' },
                                 { id: -1, name: '库存不足' }
-                            ]"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-radio-group v-model="queryParams.type" @change="resetPage">
-                <el-radio-button :label="1" :value="1">售卖库存</el-radio-button>
-                <el-radio-button :label="2" :value="2">兑换库存</el-radio-button>
-            </el-radio-group>
-            <el-button class="mt-[6px]" @click="batchConfirm">一键入库</el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="门店" prop="system_store_name" />
-                    <el-table-column label="导入人员" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="门店确认人员" prop="staff_name" show-overflow-tooltip />
-                    <el-table-column label="商品图" prop="image" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-image class="w-[40px] h-[40px]" :src="row.image" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品" prop="store_name">
-                        <template #default="{ row }">
-                            <div>{{ row.store_name }}|{{ row.product_id }}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status">
-                        <template #default="{ row }">
-                            <el-tag type="success" v-if="row.status === 1">已入库</el-tag>
-                            <el-tag type="warning" v-else-if="row.status === 0">待确认</el-tag>
-                            <el-tag type="danger" v-else-if="row.status === -1">库存不足</el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="备注" prop="mark" />
-                    <el-table-column label="创建时间" prop="create_time" />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-if="row.status == 0"
-                                v-perms="['system_store_storage.system_store_storage/edit']"
-                                type="success"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                确认入库
-                            </el-button>
-							<el-button
-							    v-if="row.status == 1"
-							    v-perms="['system_store_storage.system_store_storage/edit']"
-							    type="danger"
-							    link
-							    @click="handleEdit(row)"
-							>
-							    回退
+                            ]" :key="item.id" :label="item.name" :value="item.id" />
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="resetPage">查询</el-button>
+					<el-button @click="resetParams">重置</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
+			<el-radio-group v-model="queryParams.type" @change="resetPage">
+				<el-radio-button :label="1" :value="1">售卖库存</el-radio-button>
+				<el-radio-button :label="2" :value="2">兑换库存</el-radio-button>
+			</el-radio-group>
+			<el-button class="mt-[6px]" @click="batchConfirm">一键入库</el-button>
+			<div class="mt-4">
+				<el-table :data="pager.lists" @selection-change="handleSelectionChange">
+					<el-table-column label="门店" prop="system_store_name" />
+					<el-table-column label="导入人员" prop="admin_name" show-overflow-tooltip />
+					<el-table-column label="门店确认人员" prop="staff_name" show-overflow-tooltip />
+					<el-table-column label="商品图" prop="image" show-overflow-tooltip>
+						<template #default="{ row }">
+							<el-image class="w-[40px] h-[40px]" :src="row.image" />
+						</template>
+					</el-table-column>
+					<el-table-column label="商品" prop="store_name">
+						<template #default="{ row }">
+							<div>{{ row.store_name }}|{{ row.product_id }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="数量" prop="nums" show-overflow-tooltip />
+					<el-table-column label="退库数量" prop="refund_nums" show-overflow-tooltip />
+					<el-table-column label="状态" prop="status">
+						<template #default="{ row }">
+							<el-tag type="success" v-if="row.status === 1">已入库</el-tag>
+							<el-tag type="warning" v-else-if="row.status === 0">待确认</el-tag>
+							<el-tag type="danger" v-else-if="row.status === -1">库存不足</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="备注" prop="mark" />
+					<el-table-column label="创建时间" prop="create_time" />
+					<el-table-column label="操作" width="120" fixed="right">
+						<template #default="{ row }">
+							<el-button v-if="row.status == 0"
+								v-perms="['system_store_storage.system_store_storage/edit']" type="success" link
+								@click="handleEdit(row)">
+								确认入库
 							</el-button>
-                        </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>
+							<el-button v-if="row.status == 1 && row.refund_nums < row.nums" type="danger" link @click="showRollback(row)">
+								退库
+							</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+			<div class="flex mt-4 justify-end">
+				<pagination v-model="pager" @change="getLists" />
+			</div>
+		</el-card>
+		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+	</div>
 </template>
 
 <script lang="ts" setup name="systemStoreStorageLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiSystemStoreStorageLists,
-    apiSystemStoreStorageDelete,
-    apiSystemStoreStorageEdit,
-    apiSystemStoreStorageBatchConfirm
-} from '@/api/system_store_storage'
-import { apiSystemStoreLists } from '@/api/system_store'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import { size } from 'lodash-es'
+	import { usePaging } from '@/hooks/usePaging'
+	import { useDictData } from '@/hooks/useDictOptions'
+	import {
+		apiSystemStoreStorageLists,
+		apiSystemStoreStorageDelete,
+		apiSystemStoreStorageEdit,
+		apiSystemStoreStorageRollback,
+		apiSystemStoreStorageBatchConfirm
+	} from '@/api/system_store_storage'
+	import { apiSystemStoreLists } from '@/api/system_store'
+	import { timeFormat } from '@/utils/util'
+	import feedback from '@/utils/feedback'
+	import EditPopup from './edit.vue'
+	import { size } from 'lodash-es'
+	import { ElMessageBox } from 'element-plus'
+	const showRollback = async (row: any) => {
+		await ElMessageBox.prompt('请输入退库数量', '退库', {
+			confirmButtonText: '确认',
+			cancelButtonText: '取消'
+		}).then(({ value }) => {
+			handleRollback(row.id, value)
+		})
+	}
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
+	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+	// 是否显示编辑框
+	const showEdit = ref(false)
 
-// 查询条件
-const queryParams = reactive({
-    store_id: '',
-    admin_name: '',
-    staff_name: '',
-    status: '',
-    product_name: '',
-    type: 1
-})
+	// 查询条件
+	const queryParams = reactive({
+		store_id: '',
+		admin_name: '',
+		staff_name: '',
+		status: '',
+		product_name: '',
+		type: 1
+	})
 
-// 选中数据
-const selectData = ref<any[]>([])
+	// 选中数据
+	const selectData = ref<any[]>([])
 
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
+	// 表格选择后回调事件
+	const handleSelectionChange = (val : any[]) => {
+		selectData.value = val.map(({ id }) => id)
+	}
 
-// 获取字典数据
-const { dictData } = useDictData('')
+	// 获取字典数据
+	const { dictData } = useDictData('')
 
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiSystemStoreStorageLists,
-    params: queryParams
-})
+	// 分页相关
+	const { pager, getLists, resetParams, resetPage } = usePaging({
+		fetchFun: apiSystemStoreStorageLists,
+		params: queryParams
+	})
 
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
+	// 添加
+	const handleAdd = async () => {
+		showEdit.value = true
+		await nextTick()
+		editRef.value?.open('add')
+	}
 
-// 编辑
-const handleEdit = async (data: any) => {
-    await feedback.confirm('确定要入库吗？')
-    apiSystemStoreStorageEdit({
-        id: data.id
-    }).then((res) => {
-        getLists()
-    })
-}
+	// 编辑
+	const handleEdit = async (data : any) => {
+		await feedback.confirm('确定要入库吗？')
+		apiSystemStoreStorageEdit({
+			id: data.id
+		}).then((res) => {
+			getLists()
+		})
+	}
 
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiSystemStoreStorageDelete({ id })
-    getLists()
-}
+	const handleRollback = async (id, number) => {
+		await apiSystemStoreStorageRollback({
+			id: id,
+			num: number
+		}).then((res) => {
+			getLists()
+		})
+	}
 
-const batchConfirm = async () => {
-    await apiSystemStoreStorageBatchConfirm(queryParams)
-    getLists()
-}
+	// 删除
+	const handleDelete = async (id : number | any[]) => {
+		await feedback.confirm('确定要删除？')
+		await apiSystemStoreStorageDelete({ id })
+		getLists()
+	}
 
-getLists()
+	const batchConfirm = async () => {
+		await apiSystemStoreStorageBatchConfirm(queryParams)
+		getLists()
+	}
 
-const storeloading = ref(false)
-const storeList = ref([])
-const remoteMethod = (e = '') => {
-    storeloading.value = true
-    apiSystemStoreLists({
-        name: e,
-        page_size: 50
-    })
-        .then((res) => {
-            storeList.value = res.lists
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                storeloading.value = false
-            }, 300)
-        })
-}
-</script>
+	getLists()
+
+	const storeloading = ref(false)
+	const storeList = ref([])
+	const remoteMethod = (e = '') => {
+		storeloading.value = true
+		apiSystemStoreLists({
+			name: e,
+			page_size: 50
+		})
+			.then((res) => {
+				storeList.value = res.lists
+				setTimeout(() => {
+					storeloading.value = false
+				}, 300)
+			})
+			.catch((err) => {
+				setTimeout(() => {
+					storeloading.value = false
+				}, 300)
+			})
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/store_product_price/index.vue b/src/views/store_product_price/index.vue
index 444d1e736..1e1769a32 100644
--- a/src/views/store_product_price/index.vue
+++ b/src/views/store_product_price/index.vue
@@ -1,175 +1,200 @@
 <template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="商品" prop="store_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品"
-                    />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-select
-                        v-model="queryParams.status"
-                        placeholder="请选择状态"
-                        style="width: 240px"
-                    >
-                        <el-option :value="0" label="未设置"></el-option>
-                        <el-option :value="1" label="已设置"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists">
-                    <el-table-column label="溯源" width="150">
-                        <template #default="{ row }">
-                            <div>id: {{ row.id }}</div>
-                            <div>预订单id: {{ row.bhoid }}</div>
-                            <div>采购源id: {{ row.offer_id }}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品信息" width="150" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <div>商品名称: {{ row.store_name }}</div>
-                            <div>单位: {{ row.unit_name }}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="规格" prop="store_info" show-overflow-tooltip />
-                    <el-table-column label="商品图片" prop="image" width="120">
-                        <template #default="{ row }">
-                            <el-image
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="采购价" prop="purchase_price" show-overflow-tooltip />
-                    <el-table-column label="供货价" prop="purchase" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <div>设置价:{{ row.purchase }}|{{ row.purchase_lv }}%</div>
-                            <div>当前价:{{ row.current_purchase }}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商户价" prop="cost" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <div>设置价:{{ row.cost }}|{{ row.cost_lv }}%</div>
-                            <div>当前价:{{ row.current_cost }}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="零售价" prop="price" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <div>设置价:{{ row.price }}|{{ row.price_lv }}%</div>
-                            <div>当前价:{{ row.current_price }}</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="状态" prop="status_name" show-overflow-tooltip />
-                    <el-table-column
-                        label="时间"
-                        prop="create_time"
-                        show-overflow-tooltip
-                        width="180"
-                    />
-                    <el-table-column label="备注" prop="mark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button
-                                v-perms="['store_product_price.store_product_price/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                                v-if="row.status == 0"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['store_product_price.store_product_price/delete']"
-                                type="danger"
-                                link
-                                @click="handleEnter(row)"
-                                v-if="row.status == 0"
-                            >
-                                确认
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-    </div>
+	<div>
+		<el-card class="!border-none mb-4" shadow="never">
+			<el-form class="mb-[-16px]" :model="queryParams" inline>
+				<el-form-item label="商品" prop="store_name">
+					<el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入商品" />
+				</el-form-item>
+				<el-form-item label="状态" prop="status">
+					<el-select v-model="queryParams.status" placeholder="请选择状态" style="width: 240px">
+						<el-option :value="0" label="未设置"></el-option>
+						<el-option :value="1" label="已设置"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="日期" prop="timeScope">
+					<el-date-picker v-model="queryParams.timeScope" type="daterange" range-separator="至"
+						start-placeholder="开始日期" end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts"
+						@change="changeStartEndTime" />
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="resetPage">查询</el-button>
+					<el-button @click="resetParams">重置</el-button>
+					<el-button @click="xlsx()">导出</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
+			<div class="mt-4">
+				<el-table :data="pager.lists">
+					<el-table-column label="溯源" width="150">
+						<template #default="{ row }">
+							<div>id: {{ row.id }}</div>
+							<div>预订单id: {{ row.bhoid }}</div>
+							<div>采购源id: {{ row.offer_id }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="仓库" prop="warehouse" show-overflow-tooltip />
+					<el-table-column label="商品信息" width="150" show-overflow-tooltip>
+						<template #default="{ row }">
+							<div>商品名称: {{ row.store_name }}</div>
+							<div>单位: {{ row.unit_name }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="规格" prop="store_info" show-overflow-tooltip />
+					<el-table-column label="商品图片" prop="image" width="120">
+						<template #default="{ row }">
+							<el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
+						</template>
+					</el-table-column>
+					<el-table-column label="采购价" prop="purchase_price" show-overflow-tooltip />
+					<el-table-column label="供货价" prop="purchase" show-overflow-tooltip>
+						<template #default="{ row }">
+							<div>设置价:{{ row.purchase }}|{{ row.purchase_lv }}%</div>
+							<div>当前价:{{ row.current_purchase }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="商户价" prop="cost" show-overflow-tooltip>
+						<template #default="{ row }">
+							<div>设置价:{{ row.cost }}|{{ row.cost_lv }}%</div>
+							<div>当前价:{{ row.current_cost }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="零售价" prop="price" show-overflow-tooltip>
+						<template #default="{ row }">
+							<div>设置价:{{ row.price }}|{{ row.price_lv }}%</div>
+							<div>当前价:{{ row.current_price }}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="状态" prop="status_name" show-overflow-tooltip />
+					<el-table-column label="时间" prop="create_time" show-overflow-tooltip width="180" />
+					<el-table-column label="备注" prop="mark" show-overflow-tooltip />
+					<el-table-column label="操作" width="120" fixed="right">
+						<template #default="{ row }">
+							<el-button v-perms="['store_product_price.store_product_price/edit']" type="primary" link
+								@click="handleEdit(row)" v-if="row.status == 0">
+								编辑
+							</el-button>
+							<el-button v-perms="['store_product_price.store_product_price/delete']" type="danger" link
+								@click="handleEnter(row)" v-if="row.status == 0">
+								确认
+							</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+			<div class="flex mt-4 justify-end">
+				<pagination v-model="pager" @change="getLists" />
+			</div>
+		</el-card>
+		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+	</div>
 </template>
 
 <script lang="ts" setup name="storeProductPriceLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import {
-    apiStoreProductPriceLists,
-    apiStoreProductPriceDelete,
-    apiStoreProductPriceEnterPrice
-} from '@/api/store_product_price'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
+	import { usePaging } from '@/hooks/usePaging'
+	import { useDictData } from '@/hooks/useDictOptions'
+	import {
+		apiStoreProductPriceLists,
+		apiStoreProductPriceDelete,
+		apiStoreProductPriceExport,
+		apiStoreProductPriceEnterPrice
+	} from '@/api/store_product_price'
+	import { timeFormat } from '@/utils/util'
+	import feedback from '@/utils/feedback'
+	import EditPopup from './edit.vue'
+	import moment from 'moment'
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
+	const shortcuts = [
+		{
+			text: '近一周',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setDate(start.getDate() - 7)
+				return [start, end]
+			}
+		},
+		{
+			text: '近一月',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setMonth(start.getMonth() - 1)
+				return [start, end]
+			}
+		},
+		{
+			text: '近三月',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setMonth(start.getMonth() - 3)
+				return [start, end]
+			}
+		}
+	]
+	const changeStartEndTime = () => {
+		console.log(queryParams.timeScope);
+		if (queryParams.timeScope[0] && queryParams.timeScope[1]) {
+			queryParams.start_time = moment(queryParams.timeScope[0]).format('YYYY-MM-DD') + ' 00:00:00'
+			queryParams.end_time = moment(queryParams.timeScope[1]).format('YYYY-MM-DD') + ' 23:59:59'
+		} else {
+			queryParams.start_time = ''
+			queryParams.end_time = ''
+		}
+	}
 
-// 查询条件
-const queryParams = reactive({
-    store_name: '',
-    status: ''
-})
+	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+	// 是否显示编辑框
+	const showEdit = ref(false)
 
-// 选中数据
-const selectData = ref<any[]>([])
+	// 查询条件
+	const queryParams = reactive({
+		store_name: '',
+		start_time: '',
+		end_time: '',
+		timeScope: [],
+		status: ''
+	})
 
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
+	// 选中数据
+	const selectData = ref<any[]>([])
 
-// 获取字典数据
-const { dictData } = useDictData('')
+	// 表格选择后回调事件
+	const handleSelectionChange = (val : any[]) => {
+		selectData.value = val.map(({ id }) => id)
+	}
 
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiStoreProductPriceLists,
-    params: queryParams
-})
+	// 获取字典数据
+	const { dictData } = useDictData('')
 
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
+	// 分页相关
+	const { pager, getLists, resetParams, resetPage } = usePaging({
+		fetchFun: apiStoreProductPriceLists,
+		params: queryParams
+	})
 
-// 确认
-const handleEnter = async (data: any) => {
-    await feedback.confirm('是否改价:' + data.store_name)
-    await apiStoreProductPriceEnterPrice({ id: data.id })
-    getLists()
-}
+	// 编辑
+	const handleEdit = async (data : any) => {
+		showEdit.value = true
+		await nextTick()
+		editRef.value?.open('edit')
+		editRef.value?.setFormData(data)
+	}
 
-getLists()
-</script>
+	// 确认
+	const handleEnter = async (data : any) => {
+		await feedback.confirm('是否改价:' + data.store_name)
+		await apiStoreProductPriceEnterPrice({ id: data.id })
+		getLists()
+	}
+
+	const xlsx = () => {
+		apiStoreProductPriceExport(queryParams).then((res) => {
+			window.open(res.url, '_blank')
+			ElMessage.success('导出成功')
+		})
+	}
+
+	getLists()
+</script>
\ No newline at end of file
diff --git a/src/views/warehouse_product/index.vue b/src/views/warehouse_product/index.vue
index f6e09bb03..fcd367606 100644
--- a/src/views/warehouse_product/index.vue
+++ b/src/views/warehouse_product/index.vue
@@ -53,10 +53,10 @@
                         />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商品" prop="product_id">
+                <el-form-item label="商品" prop="product_name">
                     <el-input
                         class="w-[280px]"
-                        v-model="queryParams.product_id"
+                        v-model="queryParams.product_name"
                         clearable
                         placeholder="请输入商品"
                     />
@@ -218,7 +218,7 @@ const showEdit = ref(false)
 // 查询条件
 const queryParams = reactive({
     warehouse_id: '',
-    product_id: '',
+    product_name: '',
     financial_pm: 1,
     store_id: '',
     bar_code: '',