From 72a17635abc143c268aabb34fe504757d63e189e Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 15 Jul 2025 15:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=98=E5=88=B6=EF=BC=88=E8=B4=A7=E5=93=81?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=EF=BC=8C=E8=B4=A7=E5=93=81=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  44 +-
 src/views/canteen/dish/menu/detail.vue        |   8 +-
 src/views/canteen/dish/menu/edit.vue          |   3 +-
 .../stockManage/goodsTransfer/detail.vue      | 293 ++++++++
 .../stockManage/goodsTransfer/edit.vue        | 683 ++++++++++++++++++
 .../stockManage/goodsTransfer/index.vue       | 345 +++++++++
 .../stockManage/inventoryCount/edit.vue       |  30 +-
 .../stockManage/warehouseOut/edit.vue         |   2 +-
 .../supplierManage/goodsSupplier/index.vue    |  29 +-
 .../supplierManage/supplierList/index.vue     |   4 +-
 10 files changed, 1404 insertions(+), 37 deletions(-)
 create mode 100644 src/views/foodManage/stockManage/goodsTransfer/detail.vue
 create mode 100644 src/views/foodManage/stockManage/goodsTransfer/edit.vue
 create mode 100644 src/views/foodManage/stockManage/goodsTransfer/index.vue

diff --git a/src/router/index.js b/src/router/index.js
index 6d2edd98..51995136 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -142,6 +142,26 @@ export const constantRoutes = [
       },
     ]
   },
+  {//供应链-生产计划新增详情
+    path: '/foodManage/purchaseManage',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'productionPlanDetail',
+        component: () => import('@/views/foodManage/purchaseManage/productionPlan/detail'),
+        name: 'ProductionPlanDetail',
+        meta: { title: '生产计划详情', icon: '' }
+      },
+      {
+        path: 'productionPlanEdit',
+        component: () => import('@/views/foodManage/purchaseManage/productionPlan/edit'),
+        name: 'ProductionPlanEdit',
+        meta: { title: '生产计划新增/编辑', icon: '' }
+      },
+    ]
+  },
   {//供应链-采购计划新增详情
     path: '/foodManage/purchaseManage',
     component: Layout,
@@ -152,13 +172,13 @@ export const constantRoutes = [
         path: 'planDetail',
         component: () => import('@/views/foodManage/purchaseManage/purchasePlan/detail'),
         name: 'PlanDetail',
-        meta: { title: '计划详情', icon: '' }
+        meta: { title: '采购计划详情', icon: '' }
       },
       {
         path: 'planEdit',
         component: () => import('@/views/foodManage/purchaseManage/purchasePlan/edit'),
         name: 'PlanEdit',
-        meta: { title: '计划新增/编辑', icon: '' }
+        meta: { title: '采购计划新增/编辑', icon: '' }
       },
     ]
   },
@@ -291,6 +311,26 @@ export const constantRoutes = [
       },
     ]
   },
+  {//供应链-库存管理-货品调拨
+    path: '/foodManage/stockManage',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'goodsTransferDetail',
+        component: () => import('@/views/foodManage/stockManage/goodsTransfer/detail'),
+        name: 'GoodsTransferDetail',
+        meta: { title: '货品调拨详情', icon: '' }
+      },
+      {
+        path: 'goodsTransferEdit',
+        component: () => import('@/views/foodManage/stockManage/goodsTransfer/edit'),
+        name: 'GoodsTransferEdit',
+        meta: { title: '货品调拨新增/编辑', icon: '' }
+      },
+    ]
+  },
   {//供应链-领料管理-领料单新增详情
     path: '/foodManage/pickManage',
     component: Layout,
diff --git a/src/views/canteen/dish/menu/detail.vue b/src/views/canteen/dish/menu/detail.vue
index fd564166..4307b0ca 100644
--- a/src/views/canteen/dish/menu/detail.vue
+++ b/src/views/canteen/dish/menu/detail.vue
@@ -1409,11 +1409,11 @@ export default {
                     "recipeId": this.dialogQueryParams.recipeId
                 }
                 getMenuRecipeTemplateDetailApi(param).then((response) => {
-                    if(response.length>0){
-                        for (let i = 0; i < response.length; i++) {
+                    if(response.data.length>0){
+                        for (let i = 0;i < response.data.length;i++) { 
                             this.dialogDetailList.forEach(item=>{
-                                if(item.mealtimeType==response[i].mealtimeType){
-                                    item.dishesList = response[i].dishesList;
+                                if(item.mealtimeType==response.data[i].mealtimeType){
+                                    item.dishesList = response.data[i].dishesList;
                                 }
                             }) 
                         }  
diff --git a/src/views/canteen/dish/menu/edit.vue b/src/views/canteen/dish/menu/edit.vue
index dbc3970a..061898a2 100644
--- a/src/views/canteen/dish/menu/edit.vue
+++ b/src/views/canteen/dish/menu/edit.vue
@@ -1628,7 +1628,8 @@ export default {
                 }
                 getMenuRecipeTemplateDetailApi(param).then((response) => {
                     if(response.data.length>0){
-                        for (let i = 0; i < response.data.length; i++) {
+                        for (let i = 0;i < response.data.length;i++) {
+                            console.log(this.dialogDetailList)
                             this.dialogDetailList.forEach(item=>{
                                 if(item.mealtimeType==response.data[i].mealtimeType){
                                     item.dishesList = response.data[i].dishesList;
diff --git a/src/views/foodManage/stockManage/goodsTransfer/detail.vue b/src/views/foodManage/stockManage/goodsTransfer/detail.vue
new file mode 100644
index 00000000..eef83b38
--- /dev/null
+++ b/src/views/foodManage/stockManage/goodsTransfer/detail.vue
@@ -0,0 +1,293 @@
+<template>
+    <div style="padding: 10px;background: #E5EBF6;min-height: 830px;">
+        <div style="background: #FFF;padding: 10px;border-radius: 10px;margin-bottom: 20px;"> 
+            <el-descriptions style="margin-bottom: 20px;" title="基本信息" :column="4" size="medium" border>  
+                <el-descriptions-item>
+                    <template slot="label">调拨单号</template>
+                    {{baseInfo.transferCode}}
+                </el-descriptions-item>  
+                <el-descriptions-item>
+                    <template slot="label">调拨时间</template>
+                    {{ baseInfo.outDate }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                    <template slot="label">调拨状态</template>
+                    <span v-if="baseInfo.status==1">待调拨</span>
+                    <span v-if="baseInfo.status==2">已调拨</span>
+                </el-descriptions-item>   
+                <el-descriptions-item>
+                    <template slot="label">所属区域</template>
+                    {{ baseInfo.areaName }}
+                </el-descriptions-item> 
+                <el-descriptions-item>
+                    <template slot="label">调出仓库</template>
+                    {{ baseInfo.warehouseName }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                    <template slot="label">调入仓库</template>
+                    {{ baseInfo.warehouseName }}
+                </el-descriptions-item> 
+                <el-descriptions-item>
+                  <template slot="label">备注</template>
+                  {{ baseInfo.remark }}
+                </el-descriptions-item>
+            </el-descriptions> 
+        </div>
+
+        <div style="width: 100%;height: 450px;padding: 10px;border-radius: 10px;margin-bottom: 10px;background: #FFF;">
+            <div style="width: 100%;display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
+                <div>
+                    货品信息
+                </div> 
+            </div>
+            <div style="width: 100%;height: 400px;overflow-y: auto;">
+                <el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+                    <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
+                    <el-table-column label="序号" align="center" width="80" type="index" />
+                    <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
+                    <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="unitName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
+                            <span v-if="scope.row.salesMode==1">按份</span>
+                            <span v-if="scope.row.salesMode==2">称重</span>
+                        </template> -->
+                    </el-table-column>  
+                    <el-table-column label="当前可调库存" align="center" prop="inventoryNum" :show-overflow-tooltip="true"></el-table-column> 
+                    <el-table-column label="调货数量" align="center" prop="fetchNum" :show-overflow-tooltip="true"></el-table-column>  
+                </el-table>
+            </div>
+        </div>
+        <div style="width: 100%;height: 80px;padding: 10px;background: #FFF;border-radius: 10px;display: flex;align-items: center;justify-content: center;">
+            <!-- <el-button type="primary" @click="confirmSave" :loading="loadingBtn">保存草稿</el-button> -->
+            <el-button @click="jumpList">返回</el-button>
+        </div> 
+    </div>
+</template>
+  
+<script> 
+import { getWarehouseOutInfoApi } from "@/api/foodManage/stockManage";
+export default {
+    name: "warehouseOutDetail",
+    dicts: [],
+    data() {
+      return {
+        transferRowData:{},//页面传参
+        loading:false,
+        loadingBtn:false,
+        baseInfo: { 
+            orderTitle:undefined,
+            contractType:undefined,
+            areaId:undefined,
+            canteenId:undefined, 
+            dateRange:[], 
+        },
+        // 表单校验
+        baseRules: {
+            orderTitle: [
+                { required: true, message: "菜谱名称不能为空", trigger: "blur" }
+            ],
+            areaId: [
+                { required: true, message: "所属区域不能为空", trigger: "change" }
+            ],
+            canteenId: [
+                { required: true, message: "所属食堂不能为空", trigger: "change" }
+            ],
+            supplierId: [
+                { required: true, message: "供应商不能为空", trigger: "change" }
+            ],
+            contractSigningTime: [
+                { required: true, message: "签订日期不能为空", trigger: "change" }
+            ],
+            dateRange: [
+                { required: true, message: "合同生效周期不能为空", trigger: "change" }
+            ]
+        },
+        treeAreaOptions:[],
+        canteenOptions:[],
+        supplierOptions:[],
+        stallOptions:[],
+        
+        pickerOptions: { 
+            disabledDate(v) {
+                return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
+            }
+        },
+        materialLis:[],  
+        openDialog:false,
+        materialTreeOptions:[], 
+        // 查询参数
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10, 
+        },
+        // 总条数
+        total: 0,
+        //表格数据
+        tableListData: [],
+        batchChosenMaterial:[],
+        noMaterial:false,
+      };
+    },
+    created() { 
+        if(this.$route.query.transferRowData){ 
+            this.transferRowData = JSON.parse(this.$route.query.transferRowData)
+            this.getContractInfo()
+        }
+    },
+    watch:{
+        '$route.query.transferRowData':function(newId, oldId) {
+            if(newId){
+                this.transferRowData = JSON.parse(newId)
+                this.getContractInfo()
+            }else{
+                this.baseInfo={}
+                this.materialList=[]
+            }
+        },
+    },
+    methods: { 
+        // 返回列表页
+        jumpList() {
+            const obj = { path: "foodManage/stockManage/goodsTransferDetail" };
+            this.$tab.closeOpenPage(obj);
+            this.$router.replace({ path: "/foodManage/stockManage/goodsTransfer" }); // 要打开的页面 
+        },
+        getContractInfo(){
+            console.log(this.transferRowData) 
+            let param = {
+                outId:this.transferRowData.outId
+            }
+            //查询查询食堂下拉结构
+            getWarehouseOutInfoApi(param).then((response) => {
+                this.baseInfo = response.data;
+                this.materialLis = this.baseInfo.imsOutInventoryDetailVOList;  
+            }); 
+        },  
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            // this.batchIds1 = selection.map(item => item.tradeId)
+            // this.single = selection.length !== 1
+            // this.multiple = !selection.length
+        },
+        
+        //日期
+        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>
+<style scoped>
+    .dishes-card{
+        width: 20%;
+        height: 100%;
+        margin-right: 15px;
+        position: relative;
+    }
+    .body-card{
+        width: 96%;
+        margin: 10px auto;
+        display: flex;
+        flex-direction: column;
+        height: 300px;
+        overflow-y: auto;
+    }
+
+    .bottom-card{
+        width: 100%;
+        height: 60px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: absolute;
+        bottom: 0;
+    }
+
+
+    .dialog-left{
+        width: 20%;
+        height: 100%;
+    }
+    .dish-name{
+        width: 100%;
+        height: 32px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+    }
+    .dish-name:hover{ 
+        background-color:rgba(0, 0, 0, 0.1);
+        color: #4b80fd;
+    } 
+
+    .dialog-center{
+        width: 10%;
+        height: 100%;
+        /* background: #4b80fd; */
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        margin: 0 1%;
+    }
+    .dialog-center-header{
+        width: 100%;display: flex;align-items: center;justify-content: center;height: 60px;font-weight: bold;border-bottom: 1px solid #ccc;
+    }
+    .dialog-right{
+        width: 70%;
+        height: 100%;
+    }
+    .primary{
+        background: #1890ff!important;
+        color: #fff!important;
+    }
+    .dateTable{
+        width: 14%;
+        height: 40px;
+        color: #9a9da3;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #e6ebf5;
+    }
+    .dateTable2{
+        width: 14%;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #fff;
+        color:#000;
+        border: 1px solid #e6ebf5;
+        cursor: pointer;
+    }
+    .bgBlue{
+        width: 14%;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #0c6ccc;
+        color:#fff !important;
+        border: 1px solid #fff;
+        cursor: pointer;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/foodManage/stockManage/goodsTransfer/edit.vue b/src/views/foodManage/stockManage/goodsTransfer/edit.vue
new file mode 100644
index 00000000..280d25c7
--- /dev/null
+++ b/src/views/foodManage/stockManage/goodsTransfer/edit.vue
@@ -0,0 +1,683 @@
+<template>
+    <div style="padding: 10px;background: #E5EBF6;min-height: 830px;">
+        <div style="background: #FFF;padding: 10px;border-radius: 10px;margin-bottom: 20px;">
+            <el-form :model="baseInfo" ref="baseInfo" :rules="baseRules" size="medium" :inline="true" label-width="110px">
+                <el-form-item label="调拨单号" prop="transferCode">
+                    <el-input v-model="baseInfo.transferCode" placeholder="调拨单号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
+                </el-form-item> 
+                <el-form-item label="所属区域" prop="areaId">
+                    <el-cascader v-model="baseInfo.areaId"
+                        :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                        :props="{  
+                        emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
+                        checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
+                        value:'id',label:'label'
+                        }" @change="handleAreaChange">
+                    </el-cascader>
+                </el-form-item> 
+                <el-form-item label="调出仓库" prop="warehouseId">
+                    <el-select v-model="baseInfo.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="warehouseId">
+                    <el-select v-model="baseInfo.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="remark">
+                    <el-input v-model="baseInfo.remark" placeholder="请输入备注" maxlength="30" clearable style="width: 240px"/>
+                </el-form-item>
+            </el-form>
+        </div> 
+        <div style="width: 100%;height: 450px;padding: 10px;border-radius: 10px;margin-bottom: 10px;background: #FFF;">
+            <div style="width: 100%;display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
+                <div>
+                    货品调拨信息
+                </div>
+                <div style="display: flex;align-items: center;">
+                    <el-button type="primary" plain @click="addMaterial">添加货品</el-button> 
+                    <el-button type="danger" plain @click="delMaterial">删除</el-button>
+                </div>
+            </div>
+            <div style="width: 100%;height: 400px;overflow-y: auto;">
+                <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+                    <el-table-column label="序号" align="center" width="80" type="index" />
+                    <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
+                    <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="unitName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"> 
+                    </el-table-column>  
+                    <el-table-column label="当前可调库存" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
+                    <el-table-column label="调货数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <el-input  v-model.number="scope.row.fetchNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.fetchNum=v.replace(/[^\d]/g,''))"/>
+                        </template>
+                    </el-table-column>  
+                </el-table>
+            </div>
+        </div>
+        <div style="width: 100%;height: 80px;padding: 10px;background: #FFF;border-radius: 10px;display: flex;align-items: center;justify-content: center;">
+            <el-button type="primary" plain @click="confirmSave" :loading="loadingBtn">保存草稿</el-button>
+            <el-button type="success" plain @click="confirmSubmit" :loading="loadingBtn">提交</el-button>
+            <el-button @click="jumpList">返回</el-button>
+        </div>
+ 
+        <!-- 选择货品 -->
+        <el-dialog title="选择货品" :visible.sync="openDialog" width="65%" append-to-body >
+            <div style="width: 100%;height:620px;">
+                <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+                    <el-form-item label="货品类别" prop="materialTypeIds">
+                        <el-cascader v-model="queryParams.materialTypeIds"
+                            :options="materialTreeOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                            :props="{  
+                            multiple: true,
+                            emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
+                            checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
+                            value:'id',label:'categoryName' 
+                            }" collapse-tags>
+                        </el-cascader>
+                    </el-form-item>
+                    <el-form-item label="货品编码" prop="materialCode">
+                        <el-input v-model="queryParams.materialCode" placeholder="请输入货品编码" maxlength="20" clearable style="width: 240px"/>
+                    </el-form-item>
+                    <el-form-item label="货品名称" prop="materialName">
+                        <el-input v-model="queryParams.materialName" placeholder="请输入货品名称" maxlength="20" clearable 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-table v-loading="loading" :data="tableListData" ref="multipleTable1" height="520" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange2">
+                    <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+                    <el-table-column label="序号" align="center" width="80" type="index">
+                        <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="" :show-overflow-tooltip="true" />  -->
+                    <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="unitName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
+                            <span v-if="scope.row.salesMode==1">按份</span>
+                            <span v-if="scope.row.salesMode==2">称重</span>
+                        </template> -->
+                    </el-table-column> 
+                    <el-table-column label="货品库存" align="center" prop="materialNum" :show-overflow-tooltip="true" />  
+                    
+                </el-table>
+                <pagination
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+                /> 
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="confirmChosen">确 定</el-button>
+                <el-button @click="openDialog=false">取 消</el-button>
+            </div>
+        </el-dialog> 
+
+        <!-- 选择货品 -->
+        <el-dialog title="导入采购订单" :visible.sync="openImportDialog" width="70%" append-to-body >
+            <div style="width: 100%;height:620px;">
+                <el-form :model="queryParams2" ref="queryForm2" size="small" :inline="true" label-width="90px"> 
+                    <el-form-item label="领料单标题" prop="title">
+                        <el-input v-model="queryParams2.title" placeholder="请输入领料单标题" maxlength="20" clearable 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-table v-loading="loading2" :data="tableListData2" ref="multipleTable2" height="520" :row-key="(row)=>{return row.fetchMaterialId}" @selection-change="handleSelectionChange3">
+                    <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+                    <el-table-column label="序号" align="center" width="80" type="index">
+                        <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="" :show-overflow-tooltip="true" />  -->
+                    <el-table-column label="领料单号" align="center" prop="fetchMaterialCode" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="领料标题" align="center" prop="title" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" />
+                    <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" />   
+                    <el-table-column label="货品数量" align="center" prop="totalNum" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" />  
+                    <el-table-column label="领料日期" align="center" prop="fetchMaterialTime" :show-overflow-tooltip="true" width="150"/>
+                    
+                </el-table>
+                <pagination
+                    v-show="total2>0"
+                    :total="total2"
+                    :page.sync="queryParams2.pageNum"
+                    :limit.sync="queryParams2.pageSize"
+                    @pagination="getList2"
+                /> 
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="">确 定</el-button>
+                <el-button @click="openImportDialog=false">取 消</el-button>
+            </div>
+        </el-dialog> 
+    </div>
+</template>
+  
+<script>
+import { imgUpLoadTwo } from '@/api/system/upload'
+import { systemAreaTreeApi } from "@/api/base/stall"; 
+import { systemMaterialTreeApi,getStockMaterialListApi,drpWareHousePageApi } from "@/api/foodManage/stockManage";  
+import { getWarehouseOutInfoApi,addWarehouseOutApi,editWarehouseOutApi } from "@/api/foodManage/stockManage";
+//warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi
+import { fetchMaterialPageApi } from "@/api/foodManage/pickManage";
+export default {
+    name: "WarehouseOutEdit",
+    dicts: [],
+    data() {
+      return {
+        transferRowData:{},//页面传参
+        loading:false,
+        loadingBtn:false,
+        baseInfo: {  
+            contractType:undefined,
+            areaId:undefined,
+            canteenId:undefined,  
+        },
+        // 表单校验
+        baseRules: {
+            areaId: [
+                { required: true, message: "所属区域不能为空", trigger: "change" }
+            ],
+            canteenId: [
+                { required: true, message: "所属食堂不能为空", trigger: "change" }
+            ],
+            stallId: [
+                { required: true, message: "所属档口不能为空", trigger: "change" }
+            ],
+            supplierId: [
+                { required: true, message: "供应商不能为空", trigger: "change" }
+            ],
+            outDate: [
+                { required: true, message: "出库时间不能为空", trigger: "change" }
+            ],
+            warehouseId: [
+                { required: true, message: "货品仓库不能为空", trigger: "change" }
+            ],
+            outType: [
+                { required: true, message: "出库类型不能为空", trigger: "change" }
+            ]
+        },
+        treeAreaOptions:[],
+        canteenOptions:[],
+        stallOptions:[],
+        supplierOptions:[],
+        wareHouseOptions:[], 
+        pickerOptions: { 
+            disabledDate(v) {
+                return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
+            }
+        }, 
+        materialList:[],//货品信息-表格数据
+        batchIds:[],//货品信息-表格数据-多选
+        openDialog:false,
+        materialTreeOptions:[],  
+        queryParams: { // 货品弹窗-货品表格-查询参数
+            pageNum: 1,
+            pageSize: 10, 
+        }, 
+        total: 0, // 总条数
+        tableListData: [],//货品弹窗-货品表格数据
+        batchChosenMaterial:[],//货品弹窗-货品表格-选中的货品数组
+        noMaterial:false, 
+        openImportDialog:false,
+        queryParams2: { // 货品弹窗-货品表格-查询参数
+            pageNum: 1,
+            pageSize: 10, 
+        }, 
+        loading2:false,
+        total2: 0, // 总条数
+        tableListData2: [],//导入弹窗-表格数据
+      };
+    },
+    created() {
+        this.getAreaTreeData()  
+        this.getMaterialTree()   
+        if(this.$route.query.transferRowData){ 
+            this.transferRowData = JSON.parse(this.$route.query.transferRowData)
+            this.getContractInfo()
+        }
+    },
+    watch:{
+        '$route.query.transferRowData':function(newId, oldId) {
+            if(newId){
+                this.transferRowData = JSON.parse(newId)
+                this.getContractInfo()
+            }else{
+                this.baseInfo={}
+                this.materialList=[]
+            }
+        },
+    },
+    methods: { 
+        // 返回列表页
+        jumpList() {
+            const obj = { path: "foodManage/stockManage/goodsTransferEdit" };
+            this.$tab.closeOpenPage(obj);
+            this.$router.replace({ path: "/foodManage/stockManage/goodsTransfer" }); // 要打开的页面 
+        },
+        getContractInfo(){
+            console.log(this.transferRowData) 
+            let param = {
+                outId:this.transferRowData.outId
+            }
+            //查询查询食堂下拉结构
+            getWarehouseOutInfoApi(param).then((response) => {
+                this.baseInfo = response.data; 
+                this.materialList = this.baseInfo.imsOutInventoryDetailVOList; 
+                // this.materialList.forEach(item=>{ 
+                //     this.$set(item,"unitPrice",Number(item.unitPrice)/100) 
+                // }) 
+                drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
+                    this.wareHouseOptions = response.rows||[];
+                    this.$set(this.baseInfo,'warehouseId',this.baseInfo.warehouseId) 
+                });  
+            }); 
+        },
+        //区域树
+        getAreaTreeData() {
+            systemAreaTreeApi({}).then((response) => {
+                this.treeAreaOptions = response.data;
+            });
+        },
+        getFirstChild(node) {
+            if (!node.children || node.children.length === 0) {
+                return node; // 没有子节点或子节点为空，返回当前节点
+            } else {
+                return this.getFirstChild(node.children[0]); // 递归调用最后一个子节点
+            }
+        },
+        //选中区域-查询食堂
+        handleAreaChange(e){   
+            this.getWareHouseData()
+        },
+        /** 查询供应商下拉结构 */
+        getWareHouseData() { 
+            drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
+                this.wareHouseOptions = response.rows||[];
+                this.$set(this.baseInfo,'warehouseId',null) 
+            }); 
+        }, 
+        /** 查询货品类别下拉树结构 */
+        getMaterialTree() {
+           let param = {
+                // goodsType:1
+            }
+            systemMaterialTreeApi(param).then((response) => {
+                this.materialTreeOptions = response.data; 
+            });
+        }, 
+        //选择日期范围
+        changeDateRange(e){  
+            //this.formatDate(e[0]) 
+        },
+         // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.batchIds = selection.map(item => item.materialId)
+        },
+        //删除货品
+        delMaterial(){ 
+            this.batchIds.forEach(ID=>{
+                let index = this.materialList.findIndex(v=>v.materialId==ID)
+                if(index>-1){
+                    this.materialList.splice(index,1)
+                }
+            })
+        },
+        //添加货品
+        addMaterial(){
+            if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
+                this.openDialog=true
+                this.resetQuery()
+                setTimeout(()=>{
+                    this.$refs.multipleTable1.clearSelection() 
+                },300) 
+            }else{
+                this.$modal.msgError("请先选择区域，仓库");
+            } 
+        }, 
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() { 
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true;
+            let param = {
+                "pageSize": this.queryParams.pageSize,
+                "pageNum": this.queryParams.pageNum,
+                "areaId": this.baseInfo.areaId, 
+                "warehouseId": this.baseInfo.warehouseId,  
+                "materialName": this.queryParams.materialName,
+                "materialCode": this.queryParams.materialCode,  
+                "materialTypeIds": this.queryParams.materialTypeIds,
+            }
+            getStockMaterialListApi(param).then(response => {
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
+                this.loading = false;
+            });
+        },
+        handleSelectionChange2(selection) {
+            this.batchChosenMaterial = selection;
+            this.batchChosenMaterial.forEach(item=>{
+                this.$set(item,"fetchNum",0)  
+            })
+        },
+        confirmChosen(){
+            if(this.batchChosenMaterial.length>0){
+                this.loading = true
+                this.materialList = this.batchChosenMaterial; 
+                setTimeout(()=>{
+                    this.loading = false
+                    this.openDialog=false
+                },500) 
+            } 
+        },
+        //保存草稿
+        confirmSave(){
+            this.$refs["baseInfo"].validate(valid => {
+                if (valid) { 
+                    let param = Object.assign({},this.baseInfo); 
+                    param.outDate = this.formatDateTime(this.baseInfo.outDate) 
+                    param.totalAmount=0
+                    param.totalNum=0
+                    param.status=1
+                    param.imsOutInventoryDetailAddList = []   
+                    this.noMaterial = false;
+                    if(this.materialList.length>0){ 
+                        this.materialList.forEach(item=>{
+                            if(item.fetchNum==0){
+                                this.noMaterial = true
+                            }else{
+                                let obj = Object.assign({}, item)   
+                                param.totalNum = param.totalNum+Number(obj.fetchNum)
+                                param.imsOutInventoryDetailAddList.push(obj)
+                            } 
+                        }) 
+                    } 
+                    if(this.noMaterial){
+                        this.$modal.msgError("请输入单价和数量！");
+                    }else{
+                        this.noMaterial = true;
+                        if(this.materialList.length>0){
+                            this.noMaterial = false; 
+                        } 
+                        console.log(param)
+                        if(this.noMaterial){
+                            this.$modal.msgError("请添加货品！");
+                        }else{
+                            this.loadingBtn=true;
+                            if (this.baseInfo.outId != undefined) {
+                                editWarehouseOutApi(param).then((response) => {
+                                    this.$modal.msgSuccess("修改成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                }); 
+                            } else {
+                                addWarehouseOutApi(param).then((response) => {
+                                    this.$modal.msgSuccess("保存成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                });  
+                            }
+                            
+                        } 
+                    } 
+                }
+            });
+        },
+        // 提交按钮
+        confirmSubmit(){
+            this.$refs["baseInfo"].validate(valid => {
+                if (valid) { 
+                    let param = Object.assign({},this.baseInfo); 
+                    param.outDate = this.formatDateTime(this.baseInfo.outDate) 
+                    param.totalAmount=0
+                    param.totalNum=0
+                    param.status=2
+                    param.imsOutInventoryDetailAddList = []   
+                    this.noMaterial = false;
+                    if(this.materialList.length>0){ 
+                        this.materialList.forEach(item=>{
+                            if(item.fetchNum==0){
+                                this.noMaterial = true
+                            }else{
+                                let obj = Object.assign({}, item) 
+                                param.totalNum = param.totalNum+Number(obj.fetchNum)
+                                param.imsOutInventoryDetailAddList.push(obj) 
+                            } 
+                        }) 
+                    } 
+                    if(this.noMaterial){
+                        this.$modal.msgError("请输入数量！");
+                    }else{
+                        this.noMaterial = true;
+                        if(this.materialList.length>0){
+                            this.noMaterial = false; 
+                        } 
+                        console.log(param)
+                        if(this.noMaterial){
+                            this.$modal.msgError("请添加货品！");
+                        }else{
+                            this.loadingBtn=true;
+                            if (this.baseInfo.outId != undefined) {
+                                editWarehouseOutApi(param).then((response) => {
+                                    this.$modal.msgSuccess("修改成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                }); 
+                            } else {
+                                addWarehouseOutApi(param).then((response) => {
+                                    this.$modal.msgSuccess("保存成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                });  
+                            }
+                            
+                        } 
+                    } 
+                }
+            });
+        },
+
+
+        importMaterial(){
+            if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
+                this.openImportDialog=true 
+                this.resetQuery2()
+                setTimeout(()=>{
+                    this.$refs.multipleTable2.clearSelection() 
+                },300) 
+            }else{
+                this.$modal.msgError("请先选择区域，仓库");
+            }  
+        },
+          /** 搜索按钮操作 */
+        handleQuery2() {
+            this.queryParams2.pageNum = 1;
+            this.getList2();
+        },
+        /** 重置按钮操作 */
+        resetQuery2() { 
+            this.resetForm("queryForm2");
+            this.handleQuery2();
+        },
+        /** 查询列表 */
+        getList2() {
+            this.loading2 = true;
+            let param = {
+                "pageSize": this.queryParams2.pageSize,
+                "pageNum": this.queryParams2.pageNum,
+                "areaId": this.baseInfo.areaId, 
+                "warehouseId": this.baseInfo.warehouseId
+            }
+            fetchMaterialPageApi(param).then(response => {
+                this.tableListData2 = response.rows;
+                this.total2 = Number(response.total);
+                this.loading2 = false;
+            });
+        },
+        handleSelectionChange3(selection) {
+            
+        },
+
+        //日期
+        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>
+<style scoped>
+    .dishes-card{
+        width: 20%;
+        height: 100%;
+        margin-right: 15px;
+        position: relative;
+    }
+    .body-card{
+        width: 96%;
+        margin: 10px auto;
+        display: flex;
+        flex-direction: column;
+        height: 300px;
+        overflow-y: auto;
+    }
+
+    .bottom-card{
+        width: 100%;
+        height: 60px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: absolute;
+        bottom: 0;
+    }
+
+
+    .dialog-left{
+        width: 20%;
+        height: 100%;
+    }
+    .dish-name{
+        width: 100%;
+        height: 32px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+    }
+    .dish-name:hover{ 
+        background-color:rgba(0, 0, 0, 0.1);
+        color: #4b80fd;
+    } 
+
+    .dialog-center{
+        width: 10%;
+        height: 100%;
+        /* background: #4b80fd; */
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        margin: 0 1%;
+    }
+    .dialog-center-header{
+        width: 100%;display: flex;align-items: center;justify-content: center;height: 60px;font-weight: bold;border-bottom: 1px solid #ccc;
+    }
+    .dialog-right{
+        width: 70%;
+        height: 100%;
+    }
+    .primary{
+        background: #1890ff!important;
+        color: #fff!important;
+    }
+    .dateTable{
+        width: 14%;
+        height: 40px;
+        color: #9a9da3;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #e6ebf5;
+    }
+    .dateTable2{
+        width: 14%;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #fff;
+        color:#000;
+        border: 1px solid #e6ebf5;
+        cursor: pointer;
+    }
+    .bgBlue{
+        width: 14%;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #0c6ccc;
+        color:#fff !important;
+        border: 1px solid #fff;
+        cursor: pointer;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/foodManage/stockManage/goodsTransfer/index.vue b/src/views/foodManage/stockManage/goodsTransfer/index.vue
new file mode 100644
index 00000000..953cc882
--- /dev/null
+++ b/src/views/foodManage/stockManage/goodsTransfer/index.vue
@@ -0,0 +1,345 @@
+<template>
+  <div class="app-container">
+    <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="transferCode">
+            <el-input v-model="queryParams.transferCode" placeholder="请输入调拨单号" maxlength="20" clearable style="width: 240px"/>
+        </el-form-item> 
+         <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>
+            <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">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>  
+      <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">
+            <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="transferCode" :show-overflow-tooltip="true" /> 
+        <el-table-column label="调拨人" align="center" prop="createBy" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="调拨日期" align="center" prop="outDate" :show-overflow-tooltip="true" width="150"/> 
+        <el-table-column label="调拨区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="调出仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/> 
+        <el-table-column label="调入仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/>  
+        <el-table-column label="调拨商品种类数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="150"/>   
+        <el-table-column label="调拨商品总数" align="center" prop="totalNum" :show-overflow-tooltip="true" width="150"/>   
+        <el-table-column label="总金额(元)" align="center" prop="totalAmount" :show-overflow-tooltip="true" width="150">
+            <template slot-scope="scope">
+               <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
+            </template>  
+        </el-table-column> 
+        <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
+            <template slot-scope="scope"> 
+            <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit" v-if="scope.row.status==1"
+                @click="handleUpdate(scope.row)" 
+            >编辑</el-button>
+            <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit" v-if="scope.row.status==2"
+                @click="handleView(scope.row)" 
+            >详情</el-button> 
+            <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete" v-if="scope.row.status==1"
+                @click="handleDelete(scope.row)" 
+            >删除</el-button>
+            </template>
+        </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+
+
+
+         
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { systemAreaTreeApi } from "@/api/base/stall";  
+import { drpWareHousePageApi,systemMaterialTreeApi } from "@/api/foodManage/stockManage";
+import { warehouseOutPageApi,delWarehouseOutApi } from "@/api/foodManage/stockManage";
+//warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi
+
+export default {
+    name: "",
+    dicts: [],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            loadingBtn: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            //表格数据
+            tableListData: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false, 
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10, 
+            },
+            treeAreaOptions:[],//区域树
+            wareHouseOptions:[],//仓库下拉选
+            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]);
+                    }
+                }]
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            //   canteenName: [
+            //     { required: true, message: "字典名称不能为空", trigger: "blur" }
+            //   ],
+            //   dictType: [
+            //     { required: true, message: "字典类型不能为空", trigger: "blur" }
+            //   ]
+            }
+        };
+    },
+    created() { 
+      this.getAreaTreeData(); 
+      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)  
+            }); 
+        },
+        /** 搜索按钮操作 */
+        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,  
+                "transferCode": this.queryParams.transferCode,     
+                "areaId": this.queryParams.areaId,  
+                "warehouseId": this.queryParams.warehouseId,   
+                "status": this.queryParams.status,   
+                "outType": this.queryParams.outType
+            }
+            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;
+            } 
+            warehouseOutPageApi(param).then(response => {
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
+                this.loading = false;
+            });
+        },  
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.$router.push({ path: "/foodManage/stockManage/goodsTransferEdit" });
+        },
+        /** 修改按钮操作 */
+        handleView(row) { 
+            this.$router.push({ path: "/foodManage/stockManage/goodsTransferDetail",query: {transferRowData:JSON.stringify(row)} });
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) { 
+            this.$router.push({ path: "/foodManage/stockManage/goodsTransferEdit",query: {transferRowData:JSON.stringify(row)} });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {};
+            this.resetForm("form");
+        }, 
+        /** 提交按钮 */
+        submitForm: function() {
+            this.$refs["form"].validate(valid => {
+            if (valid) {
+                if (this.form.dictId != undefined) {
+                    // updateType(this.form).then(response => {
+                    //     this.$modal.msgSuccess("修改成功");
+                    //     this.open = false;
+                    //     this.getList();
+                    // });
+                } else {
+                    // addType(this.form).then(response => {
+                    //     this.$modal.msgSuccess("新增成功");
+                    //     this.open = false;
+                    //     this.getList();
+                    // });
+                }
+            }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) { 
+            this.$modal.confirm('是否确认删除数据项？').then(function() {
+                return delWarehouseOutApi({outIds:[row.outId]});
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        }, 
+        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>
diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue
index 686350ca..ff72f9c2 100644
--- a/src/views/foodManage/stockManage/inventoryCount/edit.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue
@@ -24,7 +24,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="盘点员" prop="countCode">
+                <el-form-item label="盘点员" prop="">
                     <el-input v-model="baseInfo.countCode" placeholder="盘点员" maxlength="20" clearable style="width: 240px"/>
                 </el-form-item>  
                 <el-form-item label="盘点开始时间" prop="countStartDate">
@@ -55,7 +55,7 @@
                 </div>
                 <div style="display: flex;align-items: center;">
                     <el-button type="primary" plain @click="addMaterial">添加货品</el-button>
-                    <el-button type="primary" plain @click="importMaterial">导入库存盘点</el-button>
+                    <!-- <el-button type="primary" plain @click="importMaterial">导入库存盘点</el-button> -->
                     <el-button type="danger" plain @click="delMaterial">删除</el-button>
                 </div>
             </div>
@@ -70,37 +70,43 @@
                     <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"> 
                     </el-table-column> 
+                    <el-table-column label="批次号" align="center" prop="intoCode" :show-overflow-tooltip="true" width="200"/> 
                     <el-table-column label="账面数" align="center" prop="inventoryNum" :show-overflow-tooltip="true" />  
                     <el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
                             <span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>
                         </template>
                     </el-table-column>   
-                    <el-table-column label="账面总额（元）" align="center" prop="totalPrice" :show-overflow-tooltip="true">
+                    <el-table-column label="账面总额（元）" align="center" prop="totalPrice" :show-overflow-tooltip="true"  width="120">
                         <template slot-scope="scope">
                             <span>{{ scope.row.inventoryNum*(scope.row.unitPrice/100) }}</span>
                         </template>
                     </el-table-column>   
-                    <el-table-column label="实盘总额（元）" align="center" prop="" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
-                            <!-- <span>{{ scope.row.countNum*scope.row.singlePrice }}</span> -->
+                    <el-table-column label="实盘总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
+                        <template slot-scope="scope"> 
+                             <span>{{ scope.row.countNum*(scope.row.unitPrice/100) }}</span>
                         </template>
                     </el-table-column> 
                     <el-table-column label="差异数" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <!-- <span>{{ scope.row.countNum*scope.row.singlePrice }}</span> -->
+                            <span>{{ scope.row.inventoryNum-scope.row.countNum }}</span>
                         </template>
                     </el-table-column> 
-                     <el-table-column label="差异总额（元）" align="center" prop="" :show-overflow-tooltip="true">
+                     <el-table-column label="差异总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
                         <template slot-scope="scope">
-                            <!-- <span>{{ scope.row.countNum*scope.row.singlePrice }}</span> -->
+                            <span>{{ (Number(scope.row.countNum)-Number(scope.row.inventoryNum))*scope.row.unitPrice/100 }}</span>
                         </template>
                     </el-table-column>  
-                    <el-table-column label="实盘数量" align="center" prop="countNum" :show-overflow-tooltip="true">
+                    <el-table-column label="实盘数量" align="center" prop="countNum" :show-overflow-tooltip="true" width="120">
                         <template slot-scope="scope">
                             <el-input  v-model.number="scope.row.countNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.countNum=v.replace(/[^\d]/g,''))"/>
                         </template>
                     </el-table-column>  
+                    <el-table-column label="差异原因" align="center" prop="refundReason" :show-overflow-tooltip="true" width="120">
+                        <template slot-scope="scope">
+                            <el-input  v-model="scope.row.refundReason" placeholder="请输入" maxlength="20" clearable/>
+                        </template>
+                    </el-table-column> 
                 </el-table>
             </div>
         </div>
@@ -148,7 +154,7 @@
                     <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="unitName" :show-overflow-tooltip="true" />  
-                    <el-table-column label="批次号" align="center" prop="intoCode" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="批次号" align="center" prop="intoCode" :show-overflow-tooltip="true" width="200"/> 
                     <el-table-column label="入库时间" align="center" prop="intoDate" :show-overflow-tooltip="true" /> 
                     <el-table-column label="入库数量" align="center" prop="purNum" :show-overflow-tooltip="true" /> 
                      <el-table-column label="单价" align="center" prop="unitPrice" :show-overflow-tooltip="true">
@@ -403,7 +409,7 @@ export default {
         handleSelectionChange2(selection) {
             this.batchChosenMaterial = selection;
             this.batchChosenMaterial.forEach(item=>{
-                this.$set(item,"countNum",0)  
+                this.$set(item,"countNum",item.inventoryNum)  
             })
         },
         confirmChosen(){
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index e425ca9e..9130b359 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -53,7 +53,7 @@
                 </div>
                 <div style="display: flex;align-items: center;">
                     <el-button type="primary" plain @click="addMaterial">添加货品</el-button>
-                    <el-button type="primary" plain @click="importMaterial">导入领料单</el-button>
+                    <!-- <el-button type="primary" plain @click="importMaterial">导入领料单</el-button> -->
                     <el-button type="danger" plain @click="delMaterial">删除</el-button>
                 </div>
             </div>
diff --git a/src/views/foodManage/supplierManage/goodsSupplier/index.vue b/src/views/foodManage/supplierManage/goodsSupplier/index.vue
index a16e7350..7e26106e 100644
--- a/src/views/foodManage/supplierManage/goodsSupplier/index.vue
+++ b/src/views/foodManage/supplierManage/goodsSupplier/index.vue
@@ -56,20 +56,20 @@
                         <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" width="120"/>
-                <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" width="120" />
-                <el-table-column label="货品类别" align="center" prop="categoryName" :show-overflow-tooltip="true" width="120" />
-                <el-table-column label="货品规格" align="center" prop="" :show-overflow-tooltip="true" width="120" /> 
-                <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/> 
-                <el-table-column label="是否供应" align="center" prop="ifSupply" :show-overflow-tooltip="true" width="120">
+                <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="categoryName" :show-overflow-tooltip="true" />
+                <el-table-column label="货品规格" align="center" prop="" :show-overflow-tooltip="true" /> 
+                <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" /> 
+                <!-- <el-table-column label="是否供应" align="center" prop="ifSupply" :show-overflow-tooltip="true" width="120">
                     <template slot-scope="scope">  
                         <el-select v-model="scope.row.ifSupply" placeholder="是否供应" style="width: 100%;">
                             <el-option label="是" :value="1"></el-option>
                             <el-option label="否" :value="2"></el-option>  
                         </el-select>    
                     </template>
-                </el-table-column>
-                <el-table-column label="首选供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120">
+                </el-table-column> -->
+                <el-table-column label="首选供应商" align="center" prop="supplierName" :show-overflow-tooltip="true">
                     <template slot-scope="scope">  
                         <el-select v-model="scope.row.supplierId" placeholder="首选供应商" style="width: 100%;">
                             <el-option label="是" :value="1"></el-option>
@@ -77,7 +77,7 @@
                         </el-select>    
                     </template>
                 </el-table-column>
-                <el-table-column label="备选供应商" align="center" prop="" :show-overflow-tooltip="true" width="150">
+                <el-table-column label="备选供应商" align="center" prop="" :show-overflow-tooltip="true">
                     <template slot-scope="scope"> 
                         <el-button
                             size="mini"
@@ -87,11 +87,11 @@
                         >选择</el-button> 
                     </template>
                 </el-table-column>
-                <el-table-column label="中标供应商" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
+                <el-table-column label="中标供应商" align="center" prop="" :show-overflow-tooltip="true"/>
                 <el-table-column label="最近一次供货" align="center">
-                    <el-table-column label="供应商名称" align="center" prop="lastOrderGoodsSupplierName" width="120" :show-overflow-tooltip="true" /> 
-                    <el-table-column label="时间" align="center" prop="lastOrderGoodsDate" width="120" :show-overflow-tooltip="true" /> 
-                    <el-table-column label="价格" align="center" prop="lastOrderGoodsPrice" width="130" :show-overflow-tooltip="true" >
+                    <!-- <el-table-column label="供应商名称" align="center" prop="lastOrderGoodsSupplierName" width="120" :show-overflow-tooltip="true" />  -->
+                    <el-table-column label="时间" align="center" prop="lastOrderGoodsDate" width="160" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="价格" align="center" prop="lastOrderGoodsPrice" width="120" :show-overflow-tooltip="true" >
                         <template slot-scope="scope">
                             <span>{{ (scope.row.lastOrderGoodsPrice/100).toFixed(2) }}</span>
                         </template>
@@ -263,8 +263,7 @@
 
 <script>
 import { systemAreaTreeApi,getCanteenByAreaApi } from "@/api/base/stall";
-import { systemMaterialTreeApi } from "@/api/dish/material";
-
+import { systemMaterialTreeApi } from "@/api/dish/material"; 
 import { getPageCanteenApi } from "@/api/base/canteen";
 
 export default {
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index 6dbc4f6f..3ec37a14 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -255,7 +255,7 @@
                             </el-col>
                             
                             <el-col :span="12">
-                                <el-form-item label="企业法人身份证复印件(正面)" prop="">
+                                <el-form-item label="企业法人/负责人身份证复印件(正面)" prop="">
                                      <el-upload
                                         :http-request="(obj) => imgUpLoad(obj, 'fileUrl')"
                                         action="#"
@@ -275,7 +275,7 @@
                                 </el-form-item> 
                             </el-col> 
                             <el-col :span="12">
-                                <el-form-item label="企业法人身份证复印件(反面)" prop="">
+                                <el-form-item label="企业法人/负责人身份证复印件(反面)" prop="">
                                       <el-upload
                                         :http-request="(obj) => imgUpLoad2(obj, 'fileUrl')"
                                         action="#"