diff --git a/src/views/foodManage/purchaseReport/procurePlanReport/index.vue b/src/views/foodManage/purchaseReport/procurePlanReport/index.vue
index a82dbebb..251e0954 100644
--- a/src/views/foodManage/purchaseReport/procurePlanReport/index.vue
+++ b/src/views/foodManage/purchaseReport/procurePlanReport/index.vue
@@ -15,8 +15,8 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="采购计划单号" prop="planCode">
-            <el-input v-model="queryParams.planCode" placeholder="请输入采购计划单号" maxlength="20" clearable style="width: 100%"/>
+        <el-form-item label="采购计划单号" prop="purchasePlanCode">
+            <el-input v-model="queryParams.purchasePlanCode" placeholder="请输入采购计划单号" maxlength="20" clearable style="width: 100%"/>
         </el-form-item>
         <el-form-item label="货品名称" prop="materialName">
             <el-input v-model="queryParams.materialName" placeholder="请输入货品名称" maxlength="20" clearable style="width: 100%"/>
@@ -146,7 +146,7 @@ export default {
             let param = {
                 "pageNum": this.queryParams.pageNum, 
                 "pageSize": this.queryParams.pageSize,  
-                "planCode": this.queryParams.planCode,      
+                "purchasePlanCode": this.queryParams.purchasePlanCode,      
                 "materialName": this.queryParams.materialName,   
             }
             if(this.dateRange&&this.dateRange.length>0){
diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue
index 1152ce74..1b590a62 100644
--- a/src/views/foodManage/stockManage/inventoryCount/edit.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue
@@ -72,11 +72,11 @@
                     </el-table-column> 
                     <!-- <el-table-column label="批次号" align="center" prop="intoCode" :show-overflow-tooltip="true" width="200"/>  -->
                     <el-table-column label="账面数" align="center" prop="bookNum" :show-overflow-tooltip="true" />  
-                    <el-table-column label="单价（元）" align="center" prop="price" :show-overflow-tooltip="true">
+                    <!-- <el-table-column label="单价（元）" align="center" prop="price" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
                             <span>{{ (scope.row.price/100).toFixed(2)||"" }}</span>
                         </template>
-                    </el-table-column>   
+                    </el-table-column>    -->
                     <el-table-column label="账面总额（元）" align="center" prop="totalPrice" :show-overflow-tooltip="true"  width="120">
                         <template slot-scope="scope">
                             <span>{{ scope.row.bookNum*(scope.row.price/100) }}</span>
@@ -92,11 +92,11 @@
                             <span>{{ scope.row.actualNum-scope.row.bookNum }}</span>
                         </template>
                     </el-table-column> 
-                     <el-table-column label="差异总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
+                     <!-- <el-table-column label="差异总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
                         <template slot-scope="scope">
                             <span>{{ (Number(scope.row.actualNum)-Number(scope.row.bookNum))*scope.row.price/100 }}</span>
                         </template>
-                    </el-table-column>  
+                    </el-table-column>   -->
                     <el-table-column label="实盘数量" align="center" prop="actualNum" :show-overflow-tooltip="true" width="120">
                         <template slot-scope="scope">
                             <el-input  v-model.number="scope.row.actualNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.actualNum=v.replace(/[^\d]/g,''))"/>
diff --git a/src/views/foodManage/stockReport/inoutDetails/index.vue b/src/views/foodManage/stockReport/inoutDetails/index.vue
new file mode 100644
index 00000000..9983dabd
--- /dev/null
+++ b/src/views/foodManage/stockReport/inoutDetails/index.vue
@@ -0,0 +1,359 @@
+<template>
+    <div class="app-container">
+        <el-tabs v-model="activeName" @tab-click="handleTabClick">
+            <el-tab-pane label="出入库流水" name="stream">
+                <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+                    <el-form-item label="日期范围">
+                        <el-date-picker
+                            v-model="dateRange"
+                            type="datetimerange"
+                            align="right"
+                            unlink-panels
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            format="yyyy-MM-dd HH:mm:ss" style="width: 400px"
+                            :default-time="['00:00:00', '23:59:59']"
+                            :picker-options="pickerOptions" >
+                        </el-date-picker>
+                    </el-form-item>  
+                    <el-form-item label="货品名称" prop="materialName">
+                        <el-input 
+                            v-model="queryParams.materialName"
+                            placeholder="请输入货品名称"
+                            clearable maxlength="30"
+                            style="width: 240px" 
+                        />
+                    </el-form-item> 
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                    </el-form-item>
+                </el-form> 
+                <el-row :gutter="10" class="mb8"> 
+                    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+                </el-row> 
+                <el-table v-loading="loading" :data="tableListData" height="800"> 
+                    <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
+                        <template slot-scope="scope">
+                        <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
+                    <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
+                    <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品仓库" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="发生时间" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="发生人员" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="数据来源" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="出入库类型" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="业务单据" align="center" prop="" :show-overflow-tooltip="true" width="180"/> 
+                    <el-table-column label="出入库数量" align="center" prop="" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="出入库金额（元）" align="center" prop="" width="130" :show-overflow-tooltip="true" >
+                        <template slot-scope="scope">
+                            <!-- <span>{{ (scope.row.lastOrderGoodsPrice/100).toFixed(2) }}</span> -->
+                        </template>
+                    </el-table-column> 
+                </el-table> 
+                <pagination
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+                />
+            </el-tab-pane>
+            <el-tab-pane label="出入库统计" name="statistics">
+                <el-form :model="queryParams2" ref="queryForm2" size="small" :inline="true" v-show="showSearch" label-width="90px"> 
+                   <el-form-item label="所属区域" prop="areaId">
+                        <el-cascader v-model="queryParams.areaId"
+                        :options="treeAreaOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
+                        :props="{  
+                            emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
+                            checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
+                            value:'id',label:'label'
+                        }" clearable @change="handleAreaChange">
+                        </el-cascader>
+                    </el-form-item>
+                    <el-form-item label="货品仓库" prop="warehouseId">
+                        <el-select v-model="queryParams.warehouseId" clearable placeholder="请选择货品仓库" style="width: 100%;">
+                            <el-option v-for="item in wareHouseOptions"
+                                :key="item.warehouseId"
+                                :label="item.warehouseName"
+                                :value="item.warehouseId"
+                            ></el-option>
+                        </el-select> 
+                    </el-form-item>  
+                    <el-form-item label="货品名称" prop="materialName">
+                        <el-input 
+                            v-model="queryParams.materialName"
+                            placeholder="请输入货品名称"
+                            clearable maxlength="30"
+                            style="width: 240px" 
+                        />
+                    </el-form-item> 
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
+                        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
+                    </el-form-item>
+                </el-form> 
+                <el-row :gutter="10" class="mb8"> 
+                    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList2"></right-toolbar>
+                </el-row> 
+                <el-table v-loading="loading" :data="tableListData2" height="800">
+                    <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
+                        <template slot-scope="scope">
+                        <span>{{(queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index + 1}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
+                    <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
+                    <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品仓库" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="当前库存数量" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="当前库存总额" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="总入库数量" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="入库总额" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="总出库数量" align="center" prop="" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="出库总额" align="center" prop="" :show-overflow-tooltip="true" /> 
+                </el-table> 
+                <pagination
+                v-show="total2>0"
+                :total="total2"
+                :page.sync="queryParams2.pageNum"
+                :limit.sync="queryParams2.pageSize"
+                @pagination="getList2"
+                />
+            </el-tab-pane> 
+        </el-tabs>  
+    </div>
+</template>
+
+<script>  
+import { systemAreaTreeApi } from "@/api/base/stall";  
+import { drpWareHousePageApi } from "@/api/foodManage/stockManage";
+// import { supplierBindMaterialListApi } from "@/api/foodManage/supplierManage";
+
+export default {
+    name: "",
+    dicts: [],
+    data() {
+        return {
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            treeAreaOptions:[],//类别树 
+            wareHouseOptions:[],//供应商下拉 
+            activeName:'stream',
+            //-----出入库流水------
+            // 总条数
+            total: 0,
+            //表格数据
+            tableListData: [], 
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,  
+                materialName: undefined,  
+            },
+            dateRange:this.defaultDateRange(),//区域树
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                    const start = new Date();
+                    const end = new Date();
+                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
+                    picker.$emit('pick', [start, end]);
+                    }
+                },{
+                    text: '最近一个月',
+                    onClick(picker) {
+                    const start = new Date();
+                    const end = new Date();
+                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                    picker.$emit('pick', [start, end]);
+                    }
+                },{
+                    text: '最近三个月',
+                    onClick(picker) {
+                    const start = new Date();
+                    const end = new Date();
+                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
+                    picker.$emit('pick', [start, end]);
+                    }
+                }]
+            }, 
+            //-----出入库统计------
+             // 总条数
+            total2: 0,
+            //表格数据
+            tableListData2: [],  
+            // 查询参数
+            queryParams2: {
+                pageNum: 1,
+                pageSize: 10,     
+                areaId: undefined, 
+                warehouseId: undefined, 
+                materialName: undefined,  
+            },
+        };
+    },
+    created() { 
+        this.getAreaTreeData(); 
+        this.getWareHouseData()
+        this.getList(); 
+    },
+    methods: { 
+        //区域树
+        getAreaTreeData() {
+            systemAreaTreeApi({}).then((response) => {
+            this.treeAreaOptions = response.data; 
+            });
+        },
+        handleAreaChange(e){
+           this.getWareHouseData()
+        }, 
+        /** 查询货品下拉结构 */
+        getWareHouseData() { 
+            drpWareHousePageApi({ areaId:this.queryParams.areaId }).then((response) => {
+                this.wareHouseOptions = response.rows||[];
+                this.$set(this.queryParams,'warehouseId',null)  
+            }); 
+        },
+        handleTabClick(){
+            if(this.activeName=='stream'){
+                this.queryParams={
+                    pageNum: 1,
+                    pageSize: 10,  
+                    materialName: undefined,  
+                }
+                this.dateRange = this.defaultDateRange()
+                this.resetForm("queryForm");
+                this.handleQuery()
+            }
+            if(this.activeName=='statistics'){
+                this.queryParams2={
+                    pageNum: 1,
+                    pageSize: 10,     
+                    areaId: undefined, 
+                    warehouseId: undefined, 
+                    materialName: undefined,  
+                }
+                this.resetForm("queryForm2");
+                this.handleQuery2()
+            }
+            
+        },
+        //-----出入库流水------
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() { 
+            this.dateRange = this.defaultDateRange()
+            this.resetForm("queryForm");
+            this.handleQuery();
+        }, 
+        /** 查询列表 */
+        getList() {
+            // this.loading = true;
+            // let param = {
+            //     "pageNum": this.queryParams.pageNum, 
+            //     "pageSize": this.queryParams.pageSize,
+            //     "supplierName": this.queryParams.supplierName, 
+            //     "materialTypeIds": this.queryParams.materialTypeIds, 
+            // }
+            // if(this.dateRange&&this.dateRange.length>0){
+            //     param.startDateTime=this.formatDateTime(this.dateRange[0])
+            //     param.endDateTime=this.formatDateTime(this.dateRange[1])
+            // }else{
+            //     param.startDateTime=undefined;
+            //     param.endDateTime=undefined;
+            // } 
+            // supplierBindMaterialListApi(param).then(response => {
+            //     this.tableListData = response.rows;
+            //     this.tableListData.forEach(item=>{
+            //         let arr=[]
+            //         if(item.alternativeSuppliers&&item.alternativeSuppliers.length>0){
+            //             item.alternativeSuppliers.forEach(sub=>{
+            //                 arr.push(sub.supplierId)
+            //             })
+            //         }
+            //         this.$set(item,"supplierIdList",arr)
+            //     }) 
+            //     this.total = Number(response.total);
+                this.loading = false;
+            // });
+        },  
+        //-----出入库统计------
+        /** 搜索按钮操作 */
+        handleQuery2() {
+            this.queryParams2.pageNum = 1;
+            this.getList2();
+        },
+        /** 重置按钮操作 */
+        resetQuery2() { 
+            this.resetForm("queryForm2");
+            this.handleQuery2();
+        },
+        /** 查询列表 */
+        getList2() {
+            this.loading = true;
+            let param = {
+                "pageNum": this.queryParams2.pageNum, 
+                "pageSize": this.queryParams2.pageSize, 
+                "materialTypeIds": this.queryParams2.materialTypeIds, 
+            }
+            // supplierBindMaterialListApi(param).then(response => {
+            //     this.tableListData2 = response.rows;
+            //     this.total2 = Number(response.total);
+                this.loading = false;
+            // });
+        }, 
+        defaultDateRange() {
+          const end = new Date(new Date().toLocaleDateString());
+          end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+          const start = new Date((new Date().toLocaleDateString()));
+          start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000); 
+          this.start = parseInt(start.getTime() / 1000)
+          this.end = parseInt(end.getTime() / 1000)
+          return [start, end]
+        }, 
+        //日期
+        formatDate(date) {
+            // 格式化为 YYYY-MM-DD
+            date = new Date(date)
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
+            const day = String(date.getDate()).padStart(2, '0');
+            return `${year}-${month}-${day}`;
+        },
+        //日期时间
+        formatDateTime(date) {
+            // 格式化为 YYYY-MM-DD
+            date = new Date(date)
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
+            const day = String(date.getDate()).padStart(2, '0');
+            const hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+            const minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+            const seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        } 
+    }
+};
+</script>