diff --git a/src/api/inventory_warehouse.ts b/src/api/inventory_warehouse.ts
new file mode 100644
index 000000000..66ce582bf
--- /dev/null
+++ b/src/api/inventory_warehouse.ts
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+// 仓库盘存列表
+export function apiInventoryWarehouseLists(params: any) {
+    return request.get({ url: '/inventory_warehouse/inventorywarehouse/lists', params })
+}
+
+// 添加仓库盘存
+export function apiInventoryWarehouseAdd(params: any) {
+    return request.post({ url: '/inventory_warehouse/inventorywarehouse/add', params })
+}
+
+// 编辑仓库盘存
+export function apiInventoryWarehouseEdit(params: any) {
+    return request.post({ url: '/inventory_warehouse/inventorywarehouse/edit', params })
+}
+
+// 删除仓库盘存
+export function apiInventoryWarehouseDelete(params: any) {
+    return request.post({ url: '/inventory_warehouse/inventorywarehouse/delete', params })
+}
+
+// 仓库盘存详情
+export function apiInventoryWarehouseDetail(params: any) {
+    return request.get({ url: '/inventory_warehouse/inventorywarehouse/detail', params })
+}
+export function apiInventoryWarehouseEnterNums(params: any) {
+    return request.post({ url: '/inventory_warehouse/inventorywarehouse/enter_nums', params })
+}
diff --git a/src/views/inventory_store/edit.vue b/src/views/inventory_store/edit.vue
index d533901c3..024b725dc 100644
--- a/src/views/inventory_store/edit.vue
+++ b/src/views/inventory_store/edit.vue
@@ -9,9 +9,31 @@
             @close="handleClose"
         >
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="数量" prop="nums">
+                <el-form-item label="数量" prop="nums" v-if="mode == 'edit'">
                     <el-input v-model="formData.nums" clearable placeholder="请输入实际数量" />
                 </el-form-item>
+                <el-form-item label="门店名称" prop="store_id" v-else>
+                    <div class="flex items-center mr-4">
+                        <el-select
+                            v-model="formData.store_id"
+                            filterable
+                            remote
+                            reserve-keyword
+                            placeholder="输入门店名称搜索"
+                            remote-show-suffix
+                            :remote-method="remoteMethod"
+                            :loading="storeloading"
+                            style="width: 240px"
+                        >
+                            <el-option
+                                v-for="item in storeList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </div>
+                </el-form-item>
             </el-form>
         </popup>
     </div>
@@ -25,6 +47,8 @@ import {
     apiInventoryStoreEdit,
     apiInventoryStoreDetail
 } from '@/api/inventory_store'
+import { apiSystemStoreLists } from '@/api/system_store'
+
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -46,9 +70,29 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    store_id: '',
     nums: 0
 })
-
+const storeloading = ref(false)
+const storeList = ref([])
+const remoteMethod = (e = '') => {
+    storeloading.value = true
+    apiSystemStoreLists({
+        name: e,
+        page_size: 50
+    })
+        .then((res) => {
+            storeList.value = res.lists
+            setTimeout(() => {
+                storeloading.value = false
+            }, 300)
+        })
+        .catch((err) => {
+            setTimeout(() => {
+                storeloading.value = false
+            }, 300)
+        })
+}
 // 表单验证
 const formRules = reactive<any>({})
 
diff --git a/src/views/inventory_store/index.vue b/src/views/inventory_store/index.vue
index dfd6c0991..334225a1d 100644
--- a/src/views/inventory_store/index.vue
+++ b/src/views/inventory_store/index.vue
@@ -2,13 +2,27 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="门店" prop="store_id">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.store_id"
-                        clearable
-                        placeholder="请输入门店"
-                    />
+                <el-form-item label="门店名称" prop="store_id">
+                    <div class="flex items-center mr-4">
+                        <el-select
+                            v-model="queryParams.store_id"
+                            filterable
+                            remote
+                            reserve-keyword
+                            placeholder="输入门店名称搜索"
+                            remote-show-suffix
+                            :remote-method="remoteMethod"
+                            :loading="storeloading"
+                            style="width: 240px"
+                        >
+                            <el-option
+                                v-for="item in storeList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </div>
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
                     <el-input
@@ -55,10 +69,26 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="商品" prop="product_id" show-overflow-tooltip />
-                    <el-table-column label="后台人员" prop="admin_id" show-overflow-tooltip />
-                    <el-table-column label="门店人员" prop="staff_id" show-overflow-tooltip />
-                    <el-table-column label="门店" prop="store_id" show-overflow-tooltip />
+                    <el-table-column label="商品" prop="product_id" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.product_name }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="后台人员" prop="admin_id" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.admin_name }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="门店人员" prop="staff_id" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.staff_name }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="门店" prop="store_id" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.store_name }}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="盘库数量" prop="nums" show-overflow-tooltip />
                     <el-table-column label="确认数量" prop="enter_nums" show-overflow-tooltip />
                     <el-table-column label="时间" prop="create_time" show-overflow-tooltip />
diff --git a/src/views/inventory_warehouse/details.vue b/src/views/inventory_warehouse/details.vue
new file mode 100644
index 000000000..da93f017f
--- /dev/null
+++ b/src/views/inventory_warehouse/details.vue
@@ -0,0 +1,81 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            title="详情"
+            :async="true"
+            width="550px"
+            :cancelButtonText="false"
+            :confirmButtonText="false"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px">
+                
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="inventoryWarehouseDETAILS">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiInventoryWarehouseAdd, apiInventoryWarehouseEdit, apiInventoryWarehouseDetail } from '@/api/inventory_warehouse'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    
+})
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiInventoryWarehouseDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/inventory_warehouse/edit.vue b/src/views/inventory_warehouse/edit.vue
new file mode 100644
index 000000000..3926f2fcb
--- /dev/null
+++ b/src/views/inventory_warehouse/edit.vue
@@ -0,0 +1,99 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="数量" prop="nums" v-if="mode == 'edit'">
+                    <el-input v-model="formData.nums" clearable placeholder="请输入实际数量" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="inventoryWarehouseEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import {
+    apiInventoryWarehouseAdd,
+    apiInventoryWarehouseEdit,
+    apiInventoryWarehouseDetail
+} from '@/api/inventory_warehouse'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+console.log(mode.value)
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑仓库盘存' : '新增仓库盘存'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    nums: ''
+})
+
+// 表单验证
+const formRules = reactive<any>({})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiInventoryWarehouseDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData }
+    mode.value == 'edit'
+        ? await apiInventoryWarehouseEdit(data)
+        : await apiInventoryWarehouseAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/inventory_warehouse/index.vue b/src/views/inventory_warehouse/index.vue
new file mode 100644
index 000000000..dad7fde52
--- /dev/null
+++ b/src/views/inventory_warehouse/index.vue
@@ -0,0 +1,173 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="状态" prop="status">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.status"
+                        clearable
+                        placeholder="请输入状态"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button
+                v-perms="['inventory_warehouse.inventory_warehouse/add']"
+                type="primary"
+                @click="handleAdd"
+            >
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                生成今日盘库
+            </el-button>
+            <el-button
+                v-perms="['inventory_warehouse.inventory_warehouse/enter']"
+                type="primary"
+                @click="inventoryShow = true"
+            >
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                库存核准
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="商品" prop="product_id" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.product_name }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="后台人员" prop="admin_id" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.admin_name }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="盘库数量" prop="nums" show-overflow-tooltip />
+                    <el-table-column label="确认数量" prop="enter_nums" show-overflow-tooltip />
+                    <el-table-column label="时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.status_name }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button
+                                v-perms="['inventory_warehouse.inventory_warehouse/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup
+            v-if="showEdit"
+            ref="editRef"
+            :dict-data="dictData"
+            @success="getLists"
+            @close="showEdit = false"
+        />
+        <el-dialog v-model="inventoryShow" title="盘库核准" width="600">
+            <el-form :model="EnterNumsForm" label-width="90px">
+                <el-form-item label="日期" prop="create_time">
+                    <el-date-picker
+                        v-model="EnterNumsForm.create_time"
+                        type="date"
+                        placeholder="选择日期"
+                    />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="inventoryShow = false">取消</el-button>
+                    <el-button type="primary" @click="handleEnterNums"> 确认 </el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup name="inventoryStoreLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import {
+    apiInventoryWarehouseLists,
+    apiInventoryWarehouseEnterNums
+} from '@/api/inventory_warehouse'
+
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import moment from 'moment'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const inventoryShow = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    store_id: '',
+    nums: '',
+    enter_nums: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiInventoryWarehouseLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+const EnterNumsForm = reactive({
+    create_time: ''
+})
+const handleEnterNums = () => {
+    EnterNumsForm.create_time = moment(EnterNumsForm.create_time).format('YYYY-MM-DD')
+    apiInventoryWarehouseEnterNums({ ...EnterNumsForm }).then(() => {
+        getLists()
+    })
+}
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+getLists()
+</script>