diff --git a/src/views/supermarketerp/report/delivery/index.vue b/src/views/supermarketerp/report/delivery/index.vue
new file mode 100644
index 0000000..4b95308
--- /dev/null
+++ b/src/views/supermarketerp/report/delivery/index.vue
@@ -0,0 +1,101 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" :inline="true" ref="queryRef" @keyup.enter="getDataList">
+					<el-form-item label="关键字" prop="key">
+						<el-input placeholder="请输入关键字" v-model.trim="state.queryForm.key" />
+					</el-form-item>
+					<el-form-item label="单据日期" prop="inventoryDate">
+						<el-date-picker
+							v-modeltrim="state.queryForm.inventoryDate"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							type="date"
+							placeholder="请输入单据日期"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="''"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					/>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+			>
+				<!-- <el-table-column type="selection" width="40" align="center" fixed="left" />
+				<el-table-column type="index" label="#" width="50" fixed="left" />
+				<el-table-column prop="productName" label="商品名" show-overflow-tooltip min-width="160" />
+				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
+				<el-table-column prop="spec" label="规格" show-overflow-tooltip />
+				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
+				<el-table-column prop="warnType" label="预警类型" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
+				<el-table-column prop="categoryId" label="分类" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip min-width="90" />
+				<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip min-width="90" />
+				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="90" />
+				<el-table-column prop="picUrl" label="商品图" show-overflow-tooltip>
+					<template #default="scope">
+						<preview-image :src="scope.row.picUrl" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="120" /> -->
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { getInventoryPage } from "/@/api/supermarketerp/report"
+
+const queryRef = ref()
+const showSearch = ref(true)
+const selectObjs = ref([]) as any
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {
+		orderType: 2,
+	},
+	pageList: getInventoryPage,
+})
+
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/supermarketerp/smErpInventoryWarning/export", Object.assign(state.queryForm, { ids: selectObjs }), "出库记录.xlsx")
+}
+</script>
diff --git a/src/views/supermarketerp/report/warehousing/index.vue b/src/views/supermarketerp/report/warehousing/index.vue
index d228de0..9c7523f 100644
--- a/src/views/supermarketerp/report/warehousing/index.vue
+++ b/src/views/supermarketerp/report/warehousing/index.vue
@@ -1,26 +1,26 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<!-- <el-row v-show="showSearch">
+			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" :inline="true" ref="queryRef" @keyup.enter="getDataList">
-					<el-form-item label="商品名" prop="productName">
-						<el-input placeholder="请输入商品名" v-model.trim="state.queryForm.productName" />
+					<el-form-item label="关键字" prop="key">
+						<el-input placeholder="请输入关键字" v-model.trim="state.queryForm.key" />
 					</el-form-item>
-					<el-form-item label="预警类型" prop="warnType">
-						<el-select v-model="state.queryForm.warnType" placeholder="请选择">
-							<el-option label="库存不足" :value="1" />
-							<el-option label="库存超额" :value="2" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="条码" prop="barcode">
-						<el-input placeholder="请输入条码" v-model.trim="state.queryForm.barcode" />
+					<el-form-item label="单据日期" prop="inventoryDate">
+						<el-date-picker
+							v-modeltrim="state.queryForm.inventoryDate"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							type="date"
+							placeholder="请输入单据日期"
+						/>
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 					</el-form-item>
 				</el-form>
-			</el-row> -->
+			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<right-toolbar
@@ -41,18 +41,13 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 			>
-				<el-table-column type="selection" width="40" align="center" fixed="left" />
+				<!-- <el-table-column type="selection" width="40" align="center" fixed="left" />
 				<el-table-column type="index" label="#" width="50" fixed="left" />
 				<el-table-column prop="productName" label="商品名" show-overflow-tooltip min-width="160" />
 				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
 				<el-table-column prop="spec" label="规格" show-overflow-tooltip />
 				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
-				<el-table-column prop="warnType" label="预警类型" show-overflow-tooltip min-width="100">
-					<template #default="scope">
-						<el-tag type="danger" v-if="scope.row.warnType == 1">库存不足</el-tag>
-						<el-tag type="danger" v-if="scope.row.warnType == 2">库存超额</el-tag>
-					</template>
-				</el-table-column>
+				<el-table-column prop="warnType" label="预警类型" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
 				<el-table-column prop="categoryId" label="分类" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip min-width="90" />
@@ -63,7 +58,7 @@
 						<preview-image :src="scope.row.picUrl" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="120" />
+				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="120" /> -->
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
@@ -88,11 +83,11 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
-// const resetQuery = () => {
-// 	// 清空搜索条件
-// 	queryRef.value?.resetFields()
-// 	getDataList()
-// }
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	getDataList()
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {