diff --git a/src/api/store_finance_flow.ts b/src/api/store_finance_flow.ts
index dc4d0eaee..5683b7c79 100644
--- a/src/api/store_finance_flow.ts
+++ b/src/api/store_finance_flow.ts
@@ -23,4 +23,8 @@ export function apiStoreFinanceFlowDelete(params: any) {
 // 门店资金流水表详情
 export function apiStoreFinanceFlowDetail(params: any) {
     return request.get({ url: '/store_finance_flow/storefinanceflow/detail', params })
+}
+// 导出
+export function apiStoreFinanceFlowExport(params: any) {
+    return request.post({ url: '/store_finance_flow/storefinanceflow/export', params })
 }
\ No newline at end of file
diff --git a/src/views/finance/store_finance_flow/index.vue b/src/views/finance/store_finance_flow/index.vue
index e83f2a1a3..cf5e3a850 100644
--- a/src/views/finance/store_finance_flow/index.vue
+++ b/src/views/finance/store_finance_flow/index.vue
@@ -1,247 +1,246 @@
 <template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店" prop="store_id">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入门店id" /> -->
-                    <el-select
-                        v-model="queryParams.store_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="用户" prop="uid">
-                    <!-- <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户id" /> -->
-                    <el-select
-                        v-model="queryParams.user_id"
-                        filterable
-                        remote
-                        reserve-keyword
-                        placeholder="输入用户名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethodUser"
-                        :loading="userloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="`${item.nickname}  (ID:${item.id})`"
-                            :value="item.id"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="订单号" prop="order_sn">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.order_sn"
-                        clearable
-                        placeholder="请输入订单号"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div>
-                <el-table
-                    :data="pager.lists"
-                    @selection-change="handleSelectionChange"
-                    row-key="id"
-                    :tree-props="{ children: 'list' }"
-                >
-                    <el-table-column label="ID" prop="id" min-width="100" show-overflow-tooltip />
-                    <el-table-column
-                        label="交易单号"
-                        prop="order_sn"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="交易时间"
-                        prop="create_time"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="金额"
-                        prop="number"
-                        min-width="100"
-                        show-overflow-tooltip
-                    >
-                        <template #default="{ row }">
-                            <span v-if="row.number > 0" class="text-success">{{ row.number }}</span>
-                            <span v-else class="text-danger">{{ row.number }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="门店名称" prop="store_name" show-overflow-tooltip />
-                    <el-table-column
-                        label="用户"
-                        prop="nickname"
-                        min-width="80"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="收益/扣除"
-                        prop="financial_type_name"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="支付方式" prop="pay_type_name" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" fixed="right" width="100">
-                        <template #default="{ row }">
-                            <el-button link type="primary" @click="handleDetail(row)">
-                                资金走向
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
-        <details-popup ref="detailsRef" :dict-data="dictData" />
-    </div>
+	<div>
+		<el-card class="!border-none mb-4" shadow="never">
+			<el-form class="mb-[-16px]" :model="queryParams" inline>
+				<el-form-item label="门店" prop="store_id">
+					<!-- <el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入门店id" /> -->
+					<el-select v-model="queryParams.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
+						remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px"
+						@change="resetPage">
+						<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="用户" prop="uid">
+					<!-- <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户id" /> -->
+					<el-select v-model="queryParams.user_id" filterable remote reserve-keyword placeholder="输入用户名称搜索"
+						remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading" style="width: 240px"
+						@change="resetPage">
+						<el-option v-for="item in userList" :key="item.id" :label="`${item.nickname}  (ID:${item.id})`"
+							:value="item.id" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="订单号" prop="order_sn">
+					<el-input class="w-[280px]" v-model="queryParams.order_sn" clearable placeholder="请输入订单号" />
+				</el-form-item>
+				<el-form-item label="日期" prop="timeScope">
+					<el-date-picker v-model="queryParams.timeScope" type="daterange" range-separator="至"
+						start-placeholder="开始日期" end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts"
+						@change="changeStartEndTime" />
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="resetPage">查询</el-button>
+					<el-button @click="resetParams">重置</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button @click="xlsx(3)">导出手续费</el-button>
+					<el-button @click="xlsx(11)">导出其他收益</el-button>
+					<el-button @click="xlsx(16)">导出损耗</el-button>
+					<el-button @click="xlsx(12)">导出佣金</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
+			<div>
+				<el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id"
+					:tree-props="{ children: 'list' }">
+					<el-table-column label="ID" prop="id" min-width="100" show-overflow-tooltip />
+					<el-table-column label="交易单号" prop="order_sn" min-width="120" show-overflow-tooltip />
+					<el-table-column label="交易时间" prop="create_time" min-width="120" show-overflow-tooltip />
+					<el-table-column label="金额" prop="number" min-width="100" show-overflow-tooltip>
+						<template #default="{ row }">
+							<span v-if="row.number > 0" class="text-success">{{ row.number }}</span>
+							<span v-else class="text-danger">{{ row.number }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="门店名称" prop="store_name" show-overflow-tooltip />
+					<el-table-column label="用户" prop="nickname" min-width="80" show-overflow-tooltip />
+					<el-table-column label="收益/扣除" prop="financial_type_name" show-overflow-tooltip />
+					<el-table-column label="支付方式" prop="pay_type_name" show-overflow-tooltip />
+					<el-table-column label="备注" prop="remark" show-overflow-tooltip />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template #default="{ row }">
+							<el-button link type="primary" @click="handleDetail(row)">
+								资金走向
+							</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+			<div class="flex mt-4 justify-end">
+				<pagination v-model="pager" @change="getLists" />
+			</div>
+		</el-card>
+		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+		<details-popup ref="detailsRef" :dict-data="dictData" />
+	</div>
 </template>
 
 <script lang="ts" setup name="storeFinanceFlowLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiStoreFinanceFlowLists, apiStoreFinanceFlowDelete } from '@/api/store_finance_flow'
-import { apiSystemStoreLists } from '@/api/system_store'
-import { apiUserLists } from '@/api/user'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailsPopup from './details.vue'
+	import { usePaging } from '@/hooks/usePaging'
+	import { useDictData } from '@/hooks/useDictOptions'
+	import { apiStoreFinanceFlowLists, apiStoreFinanceFlowDelete, apiStoreFinanceFlowExport } from '@/api/store_finance_flow'
+	import { apiSystemStoreLists } from '@/api/system_store'
+	import { apiUserLists } from '@/api/user'
+	import { timeFormat } from '@/utils/util'
+	import feedback from '@/utils/feedback'
+	import EditPopup from './edit.vue'
+	import DetailsPopup from './details.vue'
+	import moment from 'moment'
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
+	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+	const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
+	// 是否显示编辑框
+	const showEdit = ref(false)
 
-// 查询条件
-const queryParams = reactive({
-    store_name: '',
-    store_id: '',
-    user_id: '',
-    create_time: '',
-    financial_type: 1,
-    financial_pm: 1,
-    order_sn: ''
-})
+	// 查询条件
+	const queryParams = reactive({
+		store_name: '',
+		store_id: '',
+		user_id: '',
+		create_time: '',
+		financial_type: 1,
+		financial_pm: 1,
+		order_sn: '',
+		timeScope: [],
+		start_time: '',
+		end_time: '',
+	})
+	const shortcuts = [
+		{
+			text: '近一周',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setDate(start.getDate() - 7)
+				return [start, end]
+			}
+		},
+		{
+			text: '近一月',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setMonth(start.getMonth() - 1)
+				return [start, end]
+			}
+		},
+		{
+			text: '近三月',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setMonth(start.getMonth() - 3)
+				return [start, end]
+			}
+		}
+	]
 
-// 选中数据
-const selectData = ref<any[]>([])
+	// 选中数据
+	const 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: apiStoreFinanceFlowLists,
-    params: queryParams
-})
+	// 分页相关
+	const { pager, getLists, resetParams, resetPage } = usePaging({
+		fetchFun: apiStoreFinanceFlowLists,
+		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) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
+	// 编辑
+	const handleEdit = async (data : any) => {
+		showEdit.value = true
+		await nextTick()
+		editRef.value?.open('edit')
+		editRef.value?.setFormData(data)
+	}
 
-const handleDetail = async (data: any) => {
-    detailsRef.value?.open()
-    detailsRef.value?.setFormData(data)
-}
+	const handleDetail = async (data : any) => {
+		detailsRef.value?.open()
+		detailsRef.value?.setFormData(data)
+	}
 
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiStoreFinanceFlowDelete({ id })
-    getLists()
-}
+	// 删除
+	const handleDelete = async (id : number | any[]) => {
+		await feedback.confirm('确定要删除？')
+		await apiStoreFinanceFlowDelete({ id })
+		getLists()
+	}
 
-getLists()
+	const changeStartEndTime = () => {
+		if (queryParams.timeScope[0] && queryParams.timeScope[1]) {
+			queryParams.start_time = moment(queryParams.timeScope[0]).format('YYYY-MM-DD') + ' 00:00:00'
+			queryParams.end_time = moment(queryParams.timeScope[1]).format('YYYY-MM-DD') + ' 23:59:59'
+		} else {
+			queryParams.start_time = ''
+			queryParams.end_time = ''
+		}
+		getLists()
+	}
+	
+	const xlsx = (type) => {
+		apiStoreFinanceFlowExport({
+			type: type,
+			...queryParams
+		}).then((res) => {
+			window.open(res.url, '_blank')
+			ElMessage.success('导出成功')
+		})
+	}
 
-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)
-        })
-}
+	getLists()
 
-const userloading = ref(false)
-const userList = ref([])
-const remoteMethodUser = (e = '') => {
-    userloading.value = true
-    apiUserLists({
-        nickname: e,
-        page_size: 50
-    })
-        .then((res) => {
-            userList.value = res.lists
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-        .catch((err) => {
-            setTimeout(() => {
-                userloading.value = false
-            }, 300)
-        })
-}
-</script>
+	const storeloading = ref(false)
+	const storeList = ref([])
+	const remoteMethod = (e = '') => {
+		storeloading.value = true
+		apiSystemStoreLists({
+			name: e,
+			page_size: 50
+		})
+			.then((res) => {
+				storeList.value = res.lists
+				setTimeout(() => {
+					storeloading.value = false
+				}, 300)
+			})
+			.catch((err) => {
+				setTimeout(() => {
+					storeloading.value = false
+				}, 300)
+			})
+	}
+
+	const userloading = ref(false)
+	const userList = ref([])
+	const remoteMethodUser = (e = '') => {
+		userloading.value = true
+		apiUserLists({
+			nickname: e,
+			page_size: 50
+		})
+			.then((res) => {
+				userList.value = res.lists
+				setTimeout(() => {
+					userloading.value = false
+				}, 300)
+			})
+			.catch((err) => {
+				setTimeout(() => {
+					userloading.value = false
+				}, 300)
+			})
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/order/beforehand_order/add.vue b/src/views/order/beforehand_order/add.vue
index 1a9826c4e..747ee5f32 100644
--- a/src/views/order/beforehand_order/add.vue
+++ b/src/views/order/beforehand_order/add.vue
@@ -269,7 +269,7 @@
                                     <el-input
                                         v-model="row.marques"
                                         :ref="(el) => (labelRefs[$index + 'marques'] = el)"
-                                        @keyup="moveFocus($event, $index, 'marques')"
+                                        @keyup="moveFocus($event, $index, 'marques')" readonly
                                     />
                                 </template>
                             </el-table-column>
@@ -278,7 +278,7 @@
                                     <el-input
                                         v-model="row.package"
                                         :ref="(el) => (labelRefs[$index + 'package'] = el)"
-                                        @keyup="moveFocus($event, $index, 'package')"
+                                        @keyup="moveFocus($event, $index, 'package')" readonly
                                     />
                                 </template>
                             </el-table-column>
diff --git a/src/views/store/system_store_storage/index.vue b/src/views/store/system_store_storage/index.vue
index 0fe81c6c3..542194c17 100644
--- a/src/views/store/system_store_storage/index.vue
+++ b/src/views/store/system_store_storage/index.vue
@@ -102,6 +102,15 @@
                             >
                                 确认入库
                             </el-button>
+							<el-button
+							    v-if="row.status == 1"
+							    v-perms="['system_store_storage.system_store_storage/edit']"
+							    type="danger"
+							    link
+							    @click="handleEdit(row)"
+							>
+							    回退
+							</el-button>
                         </template>
                     </el-table-column>
                 </el-table>