From 5fa12dd165b977cc928d3f5bfd71a47240ab50da Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Mon, 8 Sep 2025 16:46:34 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/dish/menu/detail.vue        |  72 ++---
 src/views/canteen/dish/menu/edit.vue          | 111 ++++----
 src/views/foodManage/index.vue                |  10 +-
 .../pickManage/materialPicking/edit.vue       | 155 +++++-----
 .../purchaseManage/contractList/edit.vue      | 145 +++++++++-
 .../purchaseManage/goodsInquiry/index.vue     |   4 +-
 .../purchaseManage/productionPlan/index.vue   |   4 +-
 .../purchaseInspection/edit.vue               | 266 +++++++++---------
 .../purchaseManage/purchasePlan/edit.vue      |  10 +-
 .../stockManage/warehouseIn/edit.vue          |  38 +--
 .../stockReport/expiredWarning/index.vue      |   2 +-
 .../supplierQuotation/detail.vue              |   7 +-
 .../supplierQuotation/edit.vue                |  13 +-
 .../supplierQuotation/index.vue               |  31 +-
 .../supplierManage/supplierList/index.vue     |   2 +
 15 files changed, 518 insertions(+), 352 deletions(-)

diff --git a/src/views/canteen/dish/menu/detail.vue b/src/views/canteen/dish/menu/detail.vue
index e90e3d30..c50c6ef0 100644
--- a/src/views/canteen/dish/menu/detail.vue
+++ b/src/views/canteen/dish/menu/detail.vue
@@ -964,42 +964,44 @@ export default {
         confirmSubmit(){
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) {
-                    let param = this.baseInfo
-                    if(this.baseInfo.recipeType==1){ 
-                        param.recipeDateList = this.dateRangeList;
-                    }
-                    if(this.baseInfo.recipeType==2){ 
-                        param.recipeDateList = [{
-                            anyone:"repeat",
-                            detailList:this.detailList
-                        }]
-                    }
-                    if(this.baseInfo.recipeType==3){
-                        param.recipeDateList = this.weekDateList
-                    }
-                    this.noDishes = true;
-                    param.recipeDateList.forEach(item=>{
-                        item.detailList.forEach(subItem=>{
-                            if(subItem.dishesList.length>0){ 
-                                this.noDishes=false
-                                subItem.dishesList.forEach(dishItem=>{
-                                    dishItem.price = Number(dishItem.price)
-                                    dishItem.salePrice =  Number(dishItem.salePrice)
-                                })
-                            }
+                    setTimeout(()=>{
+                        let param = this.baseInfo
+                        if(this.baseInfo.recipeType==1){ 
+                            param.recipeDateList = this.dateRangeList;
+                        }
+                        if(this.baseInfo.recipeType==2){ 
+                            param.recipeDateList = [{
+                                anyone:"repeat",
+                                detailList:this.detailList
+                            }]
+                        }
+                        if(this.baseInfo.recipeType==3){
+                            param.recipeDateList = this.weekDateList
+                        }
+                        this.noDishes = true;
+                        param.recipeDateList.forEach(item=>{
+                            item.detailList.forEach(subItem=>{
+                                if(subItem.dishesList.length>0){ 
+                                    this.noDishes=false
+                                    subItem.dishesList.forEach(dishItem=>{
+                                        dishItem.price = Number(dishItem.price)
+                                        dishItem.salePrice =  Number(dishItem.salePrice)
+                                    })
+                                }
+                            })
                         })
-                    })
-                    if(this.noDishes){
-                        this.$modal.msgError("请选中菜品！");
-                    }else{
-                        this.loading=true
-                        addMenuRecipeApi(param).then((response) => {
-                            this.loading=false
-                            this.jumpList() 
-                        }).catch(() => {
-                            this.loading=false
-                        }); 
-                    }
+                        if(this.noDishes){
+                            this.$modal.msgError("请选中菜品！");
+                        }else{
+                            this.loading=true
+                            addMenuRecipeApi(param).then((response) => {
+                                this.loading=false
+                                this.jumpList() 
+                            }).catch(() => {
+                                this.loading=false
+                            }); 
+                        }
+                    },500)
                 }
             });
         },
diff --git a/src/views/canteen/dish/menu/edit.vue b/src/views/canteen/dish/menu/edit.vue
index 517e60c6..f6b27832 100644
--- a/src/views/canteen/dish/menu/edit.vue
+++ b/src/views/canteen/dish/menu/edit.vue
@@ -1168,66 +1168,67 @@ export default {
         confirmSubmit(){
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) {  
-                    let param = this.baseInfo
-                    if(this.baseInfo.recipeType==1){
-                        param.recipeDateList = [] 
-                        this.dateRangeList.forEach(item=>{
-                            let index = item.detailList.findIndex(subItem=>subItem.dishesList.length>0)
-                            if(index>-1){
-                                param.recipeDateList.push(item)
-                            }else{
-                                if(item.editStatus){
+                    setTimeout(()=>{
+                        let param = this.baseInfo
+                        if(this.baseInfo.recipeType==1){
+                            param.recipeDateList = [] 
+                            this.dateRangeList.forEach(item=>{
+                                let index = item.detailList.findIndex(subItem=>subItem.dishesList.length>0)
+                                if(index>-1){
                                     param.recipeDateList.push(item)
+                                }else{
+                                    if(item.editStatus){
+                                        param.recipeDateList.push(item)
+                                    } 
                                 } 
-                            } 
-                         })
-                    }
-                    if(this.baseInfo.recipeType==2){ 
-                        param.recipeDateList = [{
-                            anyone:"repeat",
-                            detailList:this.detailList
-                        }]
-                    }
-                    if(this.baseInfo.recipeType==3){
-                        param.recipeDateList = []
-                        this.weekDateList.forEach(item=>{
-                            let index = item.detailList.findIndex(subItem=>subItem.dishesList.length>0)
-                            if(index>-1){
-                                param.recipeDateList.push(item)
-                            }else{
-                                if(item.editStatus){
+                            })
+                        }
+                        if(this.baseInfo.recipeType==2){ 
+                            param.recipeDateList = [{
+                                anyone:"repeat",
+                                detailList:this.detailList
+                            }]
+                        }
+                        if(this.baseInfo.recipeType==3){
+                            param.recipeDateList = []
+                            this.weekDateList.forEach(item=>{
+                                let index = item.detailList.findIndex(subItem=>subItem.dishesList.length>0)
+                                if(index>-1){
                                     param.recipeDateList.push(item)
-                                } 
-                            }
-                            
+                                }else{
+                                    if(item.editStatus){
+                                        param.recipeDateList.push(item)
+                                    } 
+                                }
+                                
+                            })
+                        }
+                        this.noDishes = true;
+                        param.recipeDateList.forEach(item=>{
+                            item.detailList.forEach(subItem=>{
+                                if(subItem.dishesList.length>0){
+                                    this.noDishes=false
+                                    subItem.dishesList.forEach(dishItem=>{
+                                        dishItem.price = Number(dishItem.price)
+                                        dishItem.salePrice =  Number(dishItem.salePrice)
+                                    })
+                                }
+                            })
                         })
-                    }
-                    this.noDishes = true;
-                    param.recipeDateList.forEach(item=>{
-                        item.detailList.forEach(subItem=>{
-                            if(subItem.dishesList.length>0){
-                                this.noDishes=false
-                                subItem.dishesList.forEach(dishItem=>{
-                                    dishItem.price = Number(dishItem.price)
-                                    dishItem.salePrice =  Number(dishItem.salePrice)
-                                })
-                            }
-                        })
-                    })
-                    console.log(param)
-                    if(this.noDishes){
-                        this.$modal.msgError("请选中菜品！");
-                    }else{
-                        this.loading=true
-                        editMenuRecipeApi(param).then((response) => {  
-                            this.loading=false
-                            this.jumpList() 
-                        }).catch(() => {
-                            this.loading=false;
+                        console.log(param)
+                        if(this.noDishes){
+                            this.$modal.msgError("请选中菜品！");
+                        }else{
+                            this.loading=true
+                            editMenuRecipeApi(param).then((response) => {  
+                                this.loading=false
+                                this.jumpList() 
+                            }).catch(() => {
+                                this.loading=false;
 
-                        }); 
-                    }
-                    
+                            }); 
+                        }
+                    },500)
                 }
             });
         },
diff --git a/src/views/foodManage/index.vue b/src/views/foodManage/index.vue
index 28aeb7af..73fe15a0 100644
--- a/src/views/foodManage/index.vue
+++ b/src/views/foodManage/index.vue
@@ -432,7 +432,7 @@ export default {
           {
             type: "category",
             inverse: true,
-            offset: 60, 
+            offset: 90, 
             axisLabel: {
               show: true,
               align: "left",
@@ -444,7 +444,7 @@ export default {
                 var str = "";
                 var no = "NO.";
                 num = index + 1;
-                value = value.length > 7 ? value.slice(0, 7) + '...' : value
+                value = value.length > 5 ? value.slice(0, 5) + '...' : value
                 if (index === 0) {
                   str = " {num1|" + num + "} {title1|" + value + "}";
                 } else if (index === 1) {
@@ -537,7 +537,7 @@ export default {
           {
             type: "category",
             inverse: true,
-            offset: -10,
+            offset: -40,
             axisTick: "none",
             axisLine: "none",
             show: true,
@@ -747,7 +747,7 @@ export default {
               {
                 type: "category",
                 inverse: true,
-                offset: 100, 
+                offset: 90, 
                 axisLabel: {
                   show: true,
                   align: "left", 
@@ -759,7 +759,7 @@ export default {
                     var str = "";
                     var no = "NO.";
                     num = index + 1;
-                    value = value.length > 7 ? value.slice(0, 7) + '...' : value
+                    value = value.length > 5 ? value.slice(0, 5) + '...' : value
                     if (index === 0) {
                       str = " {num1|" + num + "} {title1|" + value + "}";
                     } else if (index === 1) {
diff --git a/src/views/foodManage/pickManage/materialPicking/edit.vue b/src/views/foodManage/pickManage/materialPicking/edit.vue
index d18aa774..7f83ad74 100644
--- a/src/views/foodManage/pickManage/materialPicking/edit.vue
+++ b/src/views/foodManage/pickManage/materialPicking/edit.vue
@@ -549,46 +549,50 @@ export default {
         confirmSave(){
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) { 
-                    let param = Object.assign({},this.baseInfo); 
-                    param.fetchMaterialTime = this.formatDateTime(this.baseInfo.fetchMaterialTime)  
-                    param.totalNum=0 
-                    param.detailList = []   
-                    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)
-                                // obj.singlePrice = Number(obj.singlePrice)*100 
-                                // obj.totalPrice =  (Number(obj.singlePrice)*Number(obj.fetchNum)) 
-                                // param.orderAmount = param.orderAmount+obj.totalPrice; 
-                                param.totalNum = param.totalNum+Number(obj.fetchNum)
-                                param.detailList.push(obj)
-                            } 
-                        }) 
-                    } 
-                    if(this.noMaterial){
-                        this.$modal.msgError("请输入货品数量！");
-                    }else{
-                        this.noMaterial = true;
-                        if(this.materialList.length>0){
-                            this.noMaterial = false; 
+                    setTimeout(()=>{
+                        let param = Object.assign({},this.baseInfo); 
+                        param.fetchMaterialTime = this.formatDateTime(this.baseInfo.fetchMaterialTime)  
+                        param.totalNum=0 
+                        param.detailList = []   
+                        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)
+                                    // obj.singlePrice = Number(obj.singlePrice)*100 
+                                    // obj.totalPrice =  (Number(obj.singlePrice)*Number(obj.fetchNum)) 
+                                    // param.orderAmount = param.orderAmount+obj.totalPrice; 
+                                    param.totalNum = param.totalNum+Number(obj.fetchNum)
+                                    param.detailList.push(obj)
+                                } 
+                            }) 
                         } 
-                        console.log(param)
                         if(this.noMaterial){
-                            this.$modal.msgError("请添加货品！");
+                            this.$modal.msgError("请输入货品数量！");
                         }else{
-                            this.loadingBtn=true; 
-                            addFetchMaterialApi(param).then((response) => {
-                                this.$modal.msgSuccess("保存成功");
-                                this.loadingBtn=false
-                                this.jumpList() 
-                            }).catch(() => {
-                                this.loadingBtn=false
-                            });    
-                        } 
-                    } 
+                            this.noMaterial = true;
+                            if(this.materialList.length>0){
+                                this.noMaterial = false; 
+                            } 
+                            console.log(param)
+                            if(this.noMaterial){
+                                this.$modal.msgError("请添加货品！");
+                            }else{
+                                this.loadingBtn=true;
+                                setTimeout(()=>{
+                                    addFetchMaterialApi(param).then((response) => {
+                                        this.$modal.msgSuccess("保存成功");
+                                        this.loadingBtn=false
+                                        this.jumpList() 
+                                    }).catch(() => {
+                                        this.loadingBtn=false
+                                    });
+                                },500)    
+                            } 
+                        }
+                    },500) 
                 }
             });
         },
@@ -596,47 +600,48 @@ export default {
         confirmSubmit(){
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) { 
-                    let param = Object.assign({},this.baseInfo); 
-                    param.fetchMaterialTime = this.formatDateTime(this.baseInfo.fetchMaterialTime)  
-                    param.totalNum=0 
-                    param.detailList = []   
-                    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)
-                                // obj.singlePrice = Number(obj.singlePrice)*100 
-                                // obj.totalPrice =  (Number(obj.singlePrice)*Number(obj.fetchNum)) 
-                                // param.orderAmount = param.orderAmount+obj.totalPrice; 
-                                param.totalNum = param.totalNum+Number(obj.fetchNum)
-                                param.detailList.push(obj)
-                            } 
-                        }) 
-                    } 
-                    if(this.noMaterial){
-                        this.$modal.msgError("请输入货品数量！");
-                    }else{
-                        this.noMaterial = true;
-                        if(this.materialList.length>0){
-                            this.noMaterial = false; 
+                    setTimeout(()=>{
+                        let param = Object.assign({},this.baseInfo); 
+                        param.fetchMaterialTime = this.formatDateTime(this.baseInfo.fetchMaterialTime)  
+                        param.totalNum=0 
+                        param.detailList = []   
+                        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)
+                                    // obj.singlePrice = Number(obj.singlePrice)*100 
+                                    // obj.totalPrice =  (Number(obj.singlePrice)*Number(obj.fetchNum)) 
+                                    // param.orderAmount = param.orderAmount+obj.totalPrice; 
+                                    param.totalNum = param.totalNum+Number(obj.fetchNum)
+                                    param.detailList.push(obj)
+                                } 
+                            }) 
                         } 
-                        console.log(param)
                         if(this.noMaterial){
-                            this.$modal.msgError("请添加货品！");
+                            this.$modal.msgError("请输入货品数量！");
                         }else{
-                            this.loadingBtn=true; 
-                            editFetchMaterialApi(param).then((response) => {
-                                this.$modal.msgSuccess("提交成功");
-                                this.loadingBtn=false
-                                this.jumpList() 
-                            }).catch(() => {
-                                this.loadingBtn=false
-                            });    
+                            this.noMaterial = true;
+                            if(this.materialList.length>0){
+                                this.noMaterial = false; 
+                            } 
+                            console.log(param)
+                            if(this.noMaterial){
+                                this.$modal.msgError("请添加货品！");
+                            }else{
+                                this.loadingBtn=true;
+                                editFetchMaterialApi(param).then((response) => {
+                                    this.$modal.msgSuccess("提交成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                });  
+                            } 
                         } 
-                    } 
-                    
+                    },500)  
                 }
             });
         },
@@ -725,7 +730,7 @@ export default {
                 if(Number(row.fetchNum)>Number(row.materialNum)){ 
                     row.fetchNum = row.materialNum
                 }
-            },500) 
+            },200) 
         },
         defaultDateRange() {
           const end = new Date(new Date().toLocaleDateString());
diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue
index f8a821fd..e03a5b69 100644
--- a/src/views/foodManage/purchaseManage/contractList/edit.vue
+++ b/src/views/foodManage/purchaseManage/contractList/edit.vue
@@ -116,6 +116,7 @@
                 </div>
                 <div style="display: flex;align-items: center;">
                     <el-button type="primary" plain @click="addMaterial">添加货品</el-button>
+                    <el-button type="primary" plain @click="importPurchaseOrder">导入采购订单</el-button>
                     <el-button type="danger" plain @click="delMaterial">删除</el-button>
                 </div>
             </div>
@@ -226,6 +227,57 @@
                 <el-button @click="openDialog=false">取 消</el-button>
             </div>
         </el-dialog> 
+
+        <!-- 导入 -->
+        <el-dialog title="导入采购订单" :visible.sync="openImportDialog" width="60%" append-to-body >
+            <div style="width: 100%;height:600px;">
+                <el-form :model="queryParams2" ref="queryForm2" size="small" :inline="true" label-width="100px">   
+                    <el-form-item label="采购单号" prop="orderGoodsCode">
+                        <el-input v-model="queryParams2.orderGoodsCode" placeholder="请输入采购单号" maxlength="20" clearable 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>
+                <!--  :row-key="(row)=>{return row.fetchMaterialId}" @selection-change="handleSelectionChange3" -->
+                <el-table v-loading="loading2" :data="tableListData2" ref="multipleTable2" height="500">
+                    <!-- <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="orderGoodsCode" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="采购订单标题" align="center" prop="orderTitle" :show-overflow-tooltip="true"/>  
+                    <el-table-column label="采购总金额（元" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
+                        <template slot-scope="scope">
+                        <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
+                        </template>  
+                    </el-table-column>
+                    <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />  
+                    <el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true" />  
+                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                        <template slot-scope="scope"> 
+                            <el-button size="mini" type="text"
+                                @click="confirmImport(scope.row)"  v-if="scope.row.orderStatus==2" 
+                            >导入</el-button> 
+                        </template>
+                    </el-table-column>
+                </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="openImportDialog=false">确 定</el-button>
+                <el-button @click="openImportDialog=false">取 消</el-button>
+            </div>
+        </el-dialog> 
     </div>
 </template>
   
@@ -234,6 +286,7 @@ import { imgUpLoadTwo } from '@/api/system/upload'
 import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall"; 
 import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/purchaseManage"; 
 import { getPurchaseContractInfoApi,addPurchaseContractApi,editPurchaseContractApi,delPurchaseContractApi } from "@/api/foodManage/purchaseManage";
+import { purchaseOrderPageApi,getPurchaseOrderInfoApi } from "@/api/foodManage/purchaseManage";
 export default {
     name: "ContractEdit",
     dicts: [],
@@ -296,7 +349,18 @@ export default {
         tableListData: [],//货品弹窗-货品表格数据
         batchChosenMaterial:[],//货品弹窗-货品表格-选中的货品数组
         noMaterial:false, 
-        
+        //导入功能
+        openImportDialog:false,
+        queryParams2: { // 货品弹窗-货品表格-查询参数
+            pageNum: 1,
+            pageSize: 10, 
+            orderGoodsCode:null
+        }, 
+        loading2:false,
+        total2: 0, // 总条数
+        tableListData2: [],//导入弹窗-表格数据
+        importRow:{},//导入弹窗-表格数据-选中数据
+        materialDetailsData: [],//导入弹窗-明细数据
       };
     },
     created() {
@@ -626,7 +690,84 @@ export default {
                 }
             });
         },
-
+        //导入
+        importPurchaseOrder(){
+            if(this.baseInfo.areaId!=undefined||this.baseInfo.deliveryWarehouseId!=undefined||this.baseInfo.supplierId!=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.queryParams2 = {
+                pageNum: 1,
+                pageSize: 10, 
+            }
+            this.resetForm("queryForm2");
+            this.handleQuery2();
+        },
+        /** 查询列表 */
+        getList2() {
+            this.loading2 = true;
+            let param = {
+                "pageSize": this.queryParams2.pageSize,
+                "pageNum": this.queryParams2.pageNum,
+                "orderGoodsCode": this.queryParams2.orderGoodsCode,
+                "orderStatus":2,
+                // "isInspect":2,
+                "areaId": this.baseInfo.areaId,
+                // "warehouseId": this.baseInfo.deliveryWarehouseId, 
+                "supplierId": this.baseInfo.supplierId, 
+            } 
+            purchaseOrderPageApi(param).then(response => {
+                this.tableListData2 = response.rows;
+                this.total2 = Number(response.total);
+                this.loading2 = false;
+            });
+        }, 
+        confirmImport(row){ 
+            console.log(row)
+            this.importRow = row; 
+            let param = {
+                orderGoodsId:this.importRow.orderGoodsId
+            } 
+            getPurchaseOrderInfoApi(param).then((response) => { 
+                this.materialDetailsData = response.data.orderGoodsDetailList||[];  
+                this.$modal.confirm('是否确认导入采购订单?').then(()=>{ 
+                    if(this.materialDetailsData.length>0){
+                        this.contractMaterialList = this.materialDetailsData; 
+                        this.contractMaterialList.forEach(item=>{
+                            this.$set(item,"singlePrice",Number(item.singlePrice/100))
+                            this.$set(item,"orderNum",item.orderNum) 
+                            // if(item.totalQualifiedNum&&item.totalQualifiedNum>0){
+                            //     this.$set(item,"deliveryNum",Number(item.orderNum)-Number(item.totalQualifiedNum)) 
+                            //     this.$set(item,"qualifiedNum",Number(item.orderNum)-Number(item.totalQualifiedNum)) 
+                            // }else{
+                            //     this.$set(item,"deliveryNum",Number(item.orderNum)) 
+                            //     this.$set(item,"qualifiedNum",Number(item.orderNum)) 
+                            // }
+                        })
+                        // this.baseInfo.relateOrderGoodsId = this.importRow.orderGoodsCode; 
+                        this.$set(this.baseInfo,"remark","导入采购订单")
+                        setTimeout(()=>{ 
+                            this.openImportDialog=false
+                        },500)  
+                    }else{
+                        this.$modal.msgError("采购订单明细无货品！");
+                    } 
+                }).catch(() => {}); 
+            });
+        }, 
         //附件上传
         fileUpLoad(param){
             param.type = 'canteen'
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
index 48cc1ea4..acc426e9 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
@@ -97,12 +97,12 @@
         <el-table-column label="所属区域" align="center" prop="area" :show-overflow-tooltip="true"/>
         <el-table-column label="邀请供应商（家）" align="center" prop="inquirySupplierNum" :show-overflow-tooltip="true" />
         <el-table-column label="已报价供应商（家）" align="center" prop="supplierNum" :show-overflow-tooltip="true" />
-        <el-table-column label="中选状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
+        <!-- <el-table-column label="中选状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <span v-if="scope.row.status==2">已中选</span>
                 <span v-if="scope.row.status!=2">未中选</span>
             </template>
-        </el-table-column>
+        </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">
diff --git a/src/views/foodManage/purchaseManage/productionPlan/index.vue b/src/views/foodManage/purchaseManage/productionPlan/index.vue
index a186cfdf..79d5ada4 100644
--- a/src/views/foodManage/purchaseManage/productionPlan/index.vue
+++ b/src/views/foodManage/purchaseManage/productionPlan/index.vue
@@ -471,7 +471,7 @@ export default {
             this.dialogTableList.forEach(item=>{ 
                     let obj = Object.assign({}, item)
                     obj.productionPlanNum = Number(obj.purchaseNum)
-                    obj.unitPrice = 100
+                    obj.unitPrice = 0
                     obj.purchasingBudgetPrice =  (100*Number(obj.purchaseNum))
                     param.purchasePlanDetailList.push(obj)
                     param.totalNum = param.totalNum+Number(obj.purchaseNum)
@@ -492,7 +492,7 @@ export default {
             }).catch(() => {});
         },  
         inputRate(row){ 
-            this.$set(row,"rate",row.rate.replace(/[^\d]/g,''))
+            this.$set(row,"rate",row.rate.replace(/^(([1-9]{1}\d*)|(0{1}))(\.\d{2})$/,''))
             this.$set(row,"purchaseNum",(row.totalConvertWeight*((Number(row.rate)/100)+1)).toFixed(4))
         },
         defaultDateRange() {
diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
index 71110125..354382b9 100644
--- a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
@@ -3,7 +3,7 @@
         <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="inspectGoodsCode">
-                    <el-input v-model="baseInfo.inspectGoodsCode" placeholder="合同编号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
+                    <el-input v-model="baseInfo.inspectGoodsCode" placeholder="验货单编号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
                 </el-form-item> 
                  <el-form-item label="送货日期" prop="deliveryDate">
                     <el-date-picker
@@ -51,7 +51,7 @@
                 <el-form-item label="验货日期" prop="inspectDate">
                     <el-date-picker
                         v-model="baseInfo.inspectDate"
-                        type="datetime" align="right"  
+                        type="datetime" align="right"
                         format="yyyy-MM-dd HH:mm:ss" style="width: 240px;"
                         :picker-options="pickerOptions" @change="baseInfo.inspectDate=formatDateTime(baseInfo.inspectDate)">
                     </el-date-picker>
@@ -67,15 +67,15 @@
                         ref="upload"
                         :http-request="fileUpLoad"
                         action="#" :limit="5"
-                        accept=".xlsx, .xls, .png, .jpg, .jpeg, .docx, .doc" 
-                        :show-file-list="true" 
+                        accept=".xlsx, .xls, .png, .jpg, .jpeg, .docx, .doc"
+                        :show-file-list="true"
                         :file-list="attachmentList"
                         :on-remove="handleRemoveFile"
                     >
                         <el-button
                             :disabled="attachmentList.length==5"
                             type="primary"
-                            size="mini"  
+                            size="mini"
                             >上传附件
                         </el-button>
                     </el-upload>
@@ -95,21 +95,21 @@
             </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 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="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>
                     <el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
-                        <template slot-scope="scope"> 
+                        <template slot-scope="scope">
                             <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
                             <!-- <el-input  v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/> -->
                         </template>
@@ -169,7 +169,7 @@
                             multiple: true,
                             emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                             checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
-                            value:'id',label:'categoryName' 
+                            value:'id',label:'categoryName'
                             }" collapse-tags>
                         </el-cascader>
                     </el-form-item>
@@ -332,7 +332,7 @@ export default {
                 { required: true, message: "验货人不能为空", trigger: "blur" }
             ],
             inspectAttachmentList: [
-                { required: true, message: "合同附件不能为空", trigger: "change" }
+                { required: true, message: "查验附件不能为空", trigger: "change" }
             ],
         },
         treeAreaOptions:[],
@@ -564,66 +564,68 @@ export default {
         //保存草稿
         confirmSave(){
             this.$refs["baseInfo"].validate(valid => {
-                if (valid) { 
-                    let param = Object.assign({},this.baseInfo);
-                    param.deliveryDate = this.formatDate(this.baseInfo.deliveryDate) 
-                    param.deliveryTotalNum = 0;//送货总数量 
-                    param.inspectQualifiedNum = 0;//验货合格总数量 
-                    param.status=1
-                    param.inspectGoodsDetails = []  
-                    param.inspectAttachment = "" 
-                    if(this.attachmentList.length>0){
-                        let arr = this.attachmentList.map(item=>item.url)
-                        param.inspectAttachment = arr.join(',')
-                        console.log(param) 
-                    }
-                    this.noMaterial = false;
-                    if(this.materialList.length>0){ 
-                        this.materialList.forEach(item=>{ 
-                            if(item.orderNum>item.totalQualifiedNum){ 
-                                if(Number(item.deliveryNum)==0 || Number(item.qualifiedNum)==0){
-                                    this.noMaterial = true
-                                }else{ 
-                                    let obj = Object.assign({}, item)  
-                                    param.deliveryTotalNum = param.deliveryTotalNum+Number(obj.deliveryNum)//送货总数量 
-                                    param.inspectQualifiedNum = param.inspectQualifiedNum+Number(obj.qualifiedNum)//验货合格总数量  
-                                    param.inspectGoodsDetails.push(obj) 
-                                } 
-                            }
-                        }) 
-                    } 
-                    if(this.noMaterial){
-                        this.$modal.msgError("请输入单价和数量！");
-                    }else{
-                        this.noMaterial = true;
+                if (valid) {
+                    setTimeout(()=>{
+                        let param = Object.assign({},this.baseInfo);
+                        param.deliveryDate = this.formatDate(this.baseInfo.deliveryDate) 
+                        param.deliveryTotalNum = 0;//送货总数量 
+                        param.inspectQualifiedNum = 0;//验货合格总数量 
+                        param.status=1
+                        param.inspectGoodsDetails = []  
+                        param.inspectAttachment = "" 
+                        if(this.attachmentList.length>0){
+                            let arr = this.attachmentList.map(item=>item.url)
+                            param.inspectAttachment = arr.join(',')
+                            console.log(param) 
+                        }
+                        this.noMaterial = false;
                         if(this.materialList.length>0){
-                            this.noMaterial = false; 
-                        } 
-                        console.log(param)
+                            this.materialList.forEach(item=>{
+                                if(item.orderNum>item.totalQualifiedNum){
+                                    if(Number(item.deliveryNum)==0 || Number(item.qualifiedNum)==0){
+                                        this.noMaterial = true
+                                    }else{ 
+                                        let obj = Object.assign({}, item)  
+                                        param.deliveryTotalNum = param.deliveryTotalNum+Number(obj.deliveryNum)//送货总数量 
+                                        param.inspectQualifiedNum = param.inspectQualifiedNum+Number(obj.qualifiedNum)//验货合格总数量  
+                                        param.inspectGoodsDetails.push(obj) 
+                                    }
+                                }
+                            })
+                        }
                         if(this.noMaterial){
-                            this.$modal.msgError("请添加货品！");
+                            this.$modal.msgError("请输入单价和数量！");
                         }else{
-                            this.loadingBtn=true;
-                            if (this.baseInfo.inspectGoodsId != undefined) { 
-                                editPurchaseInspectApi(param).then((response) => {
-                                    this.$modal.msgSuccess("修改成功");
-                                    this.loadingBtn=false
-                                    this.jumpList() 
-                                }).catch(() => {
-                                    this.loadingBtn=false
-                                }); 
-                            } else { 
-                                addPurchaseInspectApi(param).then((response) => {
-                                    this.$modal.msgSuccess("保存成功");
-                                    this.loadingBtn=false
-                                    this.jumpList() 
-                                }).catch(() => {
-                                    this.loadingBtn=false
-                                });  
-                            }
-                            
+                            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.inspectGoodsId != undefined) { 
+                                    editPurchaseInspectApi(param).then((response) => {
+                                        this.$modal.msgSuccess("修改成功");
+                                        this.loadingBtn=false
+                                        this.jumpList() 
+                                    }).catch(() => {
+                                        this.loadingBtn=false
+                                    });  
+                                } else {  
+                                    addPurchaseInspectApi(param).then((response) => {
+                                        this.$modal.msgSuccess("保存成功");
+                                        this.loadingBtn=false
+                                        this.jumpList() 
+                                    }).catch(() => {
+                                        this.loadingBtn=false
+                                    });   
+                                }
+                                
+                            } 
                         } 
-                    } 
+                    },500)
                 }
             });
         },
@@ -631,65 +633,67 @@ export default {
         confirmSubmit(){
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) { 
-                    let param = Object.assign({},this.baseInfo);
-                    param.deliveryDate = this.formatDate(this.baseInfo.deliveryDate) 
-                    param.deliveryTotalNum = 0;//送货总数量 
-                    param.inspectQualifiedNum = 0;//验货合格总数量 
-                    param.status=2
-                    param.inspectGoodsDetails = []  
-                    param.inspectAttachment = "" 
-                    if(this.attachmentList.length>0){
-                        let arr = this.attachmentList.map(item=>item.url)
-                        param.inspectAttachment = arr.join(',')
-                        console.log(param) 
-                    }
-                    this.noMaterial = false;
-                    if(this.materialList.length>0){ 
-                        this.materialList.forEach(item=>{
-                            if(item.orderNum>item.totalQualifiedNum){ 
-                                if(Number(item.deliveryNum)==0 || Number(item.qualifiedNum)==0){
-                                    this.noMaterial = true
-                                }else{
-                                    let obj = Object.assign({}, item) 
-                                    param.deliveryTotalNum = param.deliveryTotalNum+Number(obj.deliveryNum)//送货总数量 
-                                    param.inspectQualifiedNum = param.inspectQualifiedNum+Number(obj.qualifiedNum)//验货合格总数量  
-                                    param.inspectGoodsDetails.push(obj) 
-                                } 
-                            }
-                        }) 
-                    } 
-                    if(this.noMaterial){
-                        this.$modal.msgError("请输入表格数据！");
-                    }else{
-                        this.noMaterial = true;
-                        if(this.materialList.length>0){
-                            this.noMaterial = false; 
+                    setTimeout(()=>{
+                        let param = Object.assign({},this.baseInfo);
+                        param.deliveryDate = this.formatDate(this.baseInfo.deliveryDate) 
+                        param.deliveryTotalNum = 0;//送货总数量 
+                        param.inspectQualifiedNum = 0;//验货合格总数量 
+                        param.status=2
+                        param.inspectGoodsDetails = []  
+                        param.inspectAttachment = "" 
+                        if(this.attachmentList.length>0){
+                            let arr = this.attachmentList.map(item=>item.url)
+                            param.inspectAttachment = arr.join(',')
+                            console.log(param) 
+                        }
+                        this.noMaterial = false;
+                        if(this.materialList.length>0){ 
+                            this.materialList.forEach(item=>{
+                                if(item.orderNum>item.totalQualifiedNum){ 
+                                    if(Number(item.deliveryNum)==0 || Number(item.qualifiedNum)==0){
+                                        this.noMaterial = true
+                                    }else{
+                                        let obj = Object.assign({}, item) 
+                                        param.deliveryTotalNum = param.deliveryTotalNum+Number(obj.deliveryNum)//送货总数量 
+                                        param.inspectQualifiedNum = param.inspectQualifiedNum+Number(obj.qualifiedNum)//验货合格总数量  
+                                        param.inspectGoodsDetails.push(obj) 
+                                    } 
+                                }
+                            }) 
                         } 
-                        console.log(param)
                         if(this.noMaterial){
-                            this.$modal.msgError("请添加货品！");
+                            this.$modal.msgError("请输入表格数据！");
                         }else{
-                            this.loadingBtn=true;
-                            if (this.baseInfo.inspectGoodsId != undefined) { 
-                                editPurchaseInspectApi(param).then((response) => {
-                                    this.$modal.msgSuccess("修改成功");
-                                    this.loadingBtn=false
-                                    this.jumpList() 
-                                }).catch(() => {
-                                    this.loadingBtn=false
-                                }); 
-                            } else { 
-                                addPurchaseInspectApi(param).then((response) => {
-                                    this.$modal.msgSuccess("保存成功");
-                                    this.loadingBtn=false
-                                    this.jumpList() 
-                                }).catch(() => {
-                                    this.loadingBtn=false
-                                });  
-                            }
-                            
+                            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.inspectGoodsId != undefined) {  
+                                    editPurchaseInspectApi(param).then((response) => {
+                                        this.$modal.msgSuccess("修改成功");
+                                        this.loadingBtn=false
+                                        this.jumpList() 
+                                    }).catch(() => {
+                                        this.loadingBtn=false
+                                    }); 
+                                } else {
+                                    addPurchaseInspectApi(param).then((response) => {
+                                        this.$modal.msgSuccess("保存成功");
+                                        this.loadingBtn=false
+                                        this.jumpList() 
+                                    }).catch(() => {
+                                        this.loadingBtn=false
+                                    });
+                                }
+                                
+                            } 
                         } 
-                    } 
+                    },500)
                 }
             });
         }, 
@@ -828,14 +832,16 @@ export default {
                 setTimeout(()=>{
                     if(Number(row.deliveryNum)>(Number(row.orderNum)-Number(row.totalQualifiedNum))){ 
                         row.deliveryNum = Number(row.orderNum)-Number(row.totalQualifiedNum)
+                        row.qualifiedNum = Number(row.orderNum)-Number(row.totalQualifiedNum)
                     }
-                },500)
+                },200)
             }else{ 
                 setTimeout(()=>{
-                    if(Number(row.deliveryNum)>Number(row.orderNum)){ 
+                    if(Number(row.deliveryNum)>Number(row.orderNum)){
                         row.deliveryNum = Number(row.orderNum)
+                        row.qualifiedNum = Number(row.orderNum)
                     }
-                },500)
+                },200)
             } 
         },
         patternValue2(row){
@@ -848,7 +854,7 @@ export default {
                 if(Number(row.qualifiedNum)>Number(row.deliveryNum)){ 
                     row.qualifiedNum = Number(row.deliveryNum)
                 }
-            },500)  
+            },200)  
         },
         //日期
         formatDate(date) {
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
index 694e2aee..6f30736b 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
@@ -421,9 +421,9 @@ export default {
         },
         //获取参考价
         async checkMaterialPrice(){
-            if(this.batchChosenMaterial.length>0){ 
-                console.log(this.batchChosenMaterial)
-                let arr = this.batchChosenMaterial.map(item=>item.materialId)
+            if(this.materialList.length>0){ 
+                console.log(this.materialList)
+                let arr = this.materialList.map(item=>item.materialId)
                 let param = {
                     materialIds:arr,
                     type:3
@@ -434,8 +434,8 @@ export default {
                     console.log(res)
                     this.$modal.msgSuccess("获取成功！");
                     res.data.forEach(item=>{
-                        let index = this.batchChosenMaterial.findIndex(v=>v.materialId==item.materialId)
-                        this.$set(this.batchChosenMaterial[index],"unitPrice",item.unitPrice/100) 
+                        let index = this.materialList.findIndex(v=>v.materialId==item.materialId)
+                        this.$set(this.materialList[index],"unitPrice",item.unitPrice/100) 
                     })  
                 }
             }else{
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index da55c9e8..5aaa1901 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -9,13 +9,13 @@
                     <el-cascader v-model="baseInfo.areaId"
                         :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                         :disabled="materialList.length>0"
-                        :props="{  
+                        :props="{
                         emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                         checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
                         value:'id',label:'label'
                         }" @change="handleAreaChange">
                     </el-cascader>
-                </el-form-item> 
+                </el-form-item>
                 <el-form-item label="货品仓库" prop="warehouseId">
                     <el-select v-model="baseInfo.warehouseId" clearable :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;">
                         <el-option v-for="item in wareHouseOptions"
@@ -66,7 +66,7 @@
                     <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>
                     <el-table-column label="供应商" align="center" prop="supplierId" :show-overflow-tooltip="true" width="150">
                         <template slot-scope="scope">
                              <el-select v-model="scope.row.supplierId" placeholder="请选择供应商" style="width: 100%;">
@@ -75,9 +75,9 @@
                                     :label="item.supplierName"
                                     :value="item.supplierId"
                                 ></el-option>
-                            </el-select> 
+                            </el-select>
                         </template>
-                    </el-table-column> 
+                    </el-table-column>
                     <el-table-column label="生产日期" align="center" prop="productDate" :show-overflow-tooltip="true" width="160">
                         <template slot-scope="scope">
                             <el-date-picker
@@ -88,7 +88,7 @@
                                 :picker-options="pickerOptions3" >
                             </el-date-picker>  
                         </template>
-                    </el-table-column> 
+                    </el-table-column>
                     <el-table-column label="保质期截止日期" align="center" prop="expireTime" :show-overflow-tooltip="true" width="180">
                         <template slot-scope="scope">
                             <el-date-picker
@@ -103,7 +103,7 @@
                     <el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
                             <span v-if="baseInfo.relateOrderGoodsId">{{ scope.row.unitPrice }}</span> 
-                            <el-input v-else v-model="scope.row.unitPrice" placeholder="请输入" maxlength="8" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
+                            <el-input v-else v-model="scope.row.unitPrice" placeholder="请输入" maxlength="3" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
                         </template>
                     </el-table-column> 
                     <el-table-column label="订货数量" align="center" prop="orderNum" :show-overflow-tooltip="true" v-if="baseInfo.relateOrderGoodsId">
@@ -116,9 +116,9 @@
                             <span>{{scope.row.intoNum}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="待入库数量" align="center" prop="purNum" :show-overflow-tooltip="true">
+                    <el-table-column label="本次入库数量" align="center" prop="purNum" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <el-input  v-model="scope.row.purNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/>
+                            <el-input  v-model="scope.row.purNum" placeholder="请输入" maxlength="3" clearable @change="patternValue(scope.row)"/>
                         </template>
                     </el-table-column>  
                 </el-table>
@@ -409,16 +409,16 @@ export default {
             this.getSupplierData()
         },
         /** 查询供应商下拉结构 */
-        getWareHouseData() { 
+        getWareHouseData() {
             drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
                 this.wareHouseOptions = response.rows||[];
                 if(this.wareHouseOptions.length>0){ 
                     this.$set(this.baseInfo,"warehouseId",this.wareHouseOptions[0].warehouseId)  
                 } 
             }); 
-        }, 
+        },
          /** 查询供应商下拉结构 */
-        getSupplierData() { 
+        getSupplierData() {
             supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {
                 this.supplierOptions = response.rows||[]; 
             }); 
@@ -448,7 +448,7 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
-            setTimeout(()=>{ 
+            setTimeout(()=>{
                 this.$refs.multipleTable.clearSelection() 
             },300) 
         },
@@ -498,7 +498,7 @@ export default {
         },
         handleSelectionChange2(selection) {
             this.batchChosenMaterial = []; 
-            selection.forEach(item=>{ 
+            selection.forEach(item=>{
                 let obj = Object.assign({}, item)
                 obj.unitPrice = item.unitPrice/100;
                 this.$set(obj,"purNum",0) 
@@ -526,7 +526,7 @@ export default {
                         this.loading = false
                         this.openDialog=false
                     },500) 
-                } 
+                }
             } 
         },
         //保存草稿
@@ -542,6 +542,7 @@ export default {
                     this.noMaterial = false;
                     if(this.materialList.length>0){ 
                         this.materialList.forEach(item=>{
+                            this.$set(item,"purNum",Number(item.purNum)) 
                             if(item.unitPrice==0 || item.purNum==0 || item.supplierId==null || !item.productDate|| !item.expireTime){
                                 this.noMaterial = true
                             }else{
@@ -602,6 +603,7 @@ export default {
                     this.noMaterial = false;
                     if(this.materialList.length>0){ 
                         this.materialList.forEach(item=>{
+                            this.$set(item,"purNum",Number(item.purNum)) 
                             if(item.unitPrice==0 || item.purNum==0 || item.supplierId==null || !item.productDate|| !item.expireTime){
                                 this.noMaterial = true
                             }else{
@@ -683,7 +685,7 @@ export default {
                 "pageNum": this.queryParams2.pageNum,
                 "orderGoodsCode": this.queryParams2.orderGoodsCode,
                 "orderStatus":2,
-                "ifAllInto":2,
+                "ifAllInto":2, 
                 "areaId": this.baseInfo.areaId,
                 "warehouseId": this.baseInfo.warehouseId, 
                 "supplierId": this.baseInfo.deliverySupplierId, 
@@ -727,13 +729,13 @@ export default {
         }, 
         patternValue(row){ 
             row.purNum = row.purNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1')
-            if(row.intoNum&&row.intoNum>0){ 
+            if(row.intoNum&&row.intoNum>0){
                 setTimeout(()=>{
                     if(Number(row.purNum)>(Number(row.totalQualifiedNum)-Number(row.intoNum))){ 
                         row.purNum = Number(row.totalQualifiedNum)-Number(row.intoNum)
                     }
                 },500)
-            }else{ 
+            }else{
                 setTimeout(()=>{
                     if(Number(row.purNum)>Number(row.totalQualifiedNum)){ 
                         row.purNum = Number(row.totalQualifiedNum)
diff --git a/src/views/foodManage/stockReport/expiredWarning/index.vue b/src/views/foodManage/stockReport/expiredWarning/index.vue
index 2aa1d6e1..acd5db51 100644
--- a/src/views/foodManage/stockReport/expiredWarning/index.vue
+++ b/src/views/foodManage/stockReport/expiredWarning/index.vue
@@ -28,7 +28,7 @@
         </el-form-item> 
         <el-form-item label="过期状态" prop="expireState"> 
             <el-select v-model="queryParams.expireState" placeholder="请选择过期状态" style="width: 240px;">
-                <el-option label="过期" :value="1"></el-option>
+                <el-option label="过期" :value="1"></el-option> 
                 <el-option label="保质期内" :value="2"></el-option> 
                 <el-option label="临期" :value="3"></el-option> 
             </el-select> 
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue b/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
index 8142e383..53ae0b3f 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
@@ -89,7 +89,7 @@
 </template>
   
 <script>  
-import { getGoodsInquiryInfoApi } from "@/api/foodManage/purchaseManage";
+import { getGoodsInquiryDetailInfoApi } from "@/api/foodManage/purchaseManage";
 export default {
     name: "SupplierQuotationDetail",
     dicts: [],
@@ -179,10 +179,11 @@ export default {
         getContractInfo(){
             console.log(this.goodsInquiryData) 
             let param = {
-                inquiryId:this.goodsInquiryData.inquiryId
+                inquiryId:this.goodsInquiryData.inquiryId, 
+                // supplierId:row.supplierId
             }
             //查询
-            getGoodsInquiryInfoApi(param).then((response) => {
+            getGoodsInquiryDetailInfoApi(param).then((response) => {
                 this.baseInfo = response.data; 
                 // this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime]) 
                 this.materialList = this.baseInfo.detailList; 
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
index 4c437fcc..0ad092db 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
@@ -41,7 +41,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">总金额</template>
-                    {{ baseInfo.bidTotalPrice }}
+                    {{ baseInfo.quoteAmount }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">备注</template>
@@ -89,7 +89,7 @@
                     <el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <el-input  v-model="scope.row.singlePrice" placeholder="请输入" maxlength="6" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
+                            <el-input  v-model="scope.row.singlePrice" placeholder="请输入" maxlength="6" clearable @change="sumAmount" @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
                         </template>
                     </el-table-column>
                     <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
@@ -427,6 +427,7 @@ export default {
             let param = Object.assign({},this.baseInfo);
             param.arrivalTime = this.formatDateTime(this.baseInfo.arrivalTime)
             param.detailList = []
+            param.quoteAmount=0
             console.log(param.arrivalTime)
             if(param.arrivalTime.includes('1970')){
                 this.$modal.msgError("请选择交货时间！");
@@ -442,6 +443,7 @@ export default {
                         obj.quoteNum = Number(obj.purNum)
                         obj.singlePrice = Number(obj.singlePrice)*100
                         obj.totalPrice =  (Number(obj.singlePrice)*Number(obj.purNum))
+                        param.quoteAmount = param.quoteAmount+obj.totalPrice;  
                         param.detailList.push(obj)
                     }
                 })
@@ -469,7 +471,12 @@ export default {
                 }
             }
         },
-
+        sumAmount(){
+            this.baseInfo.quoteAmount=0
+            this.materialList.forEach(item=>{
+                this.baseInfo.quoteAmount = this.baseInfo.quoteAmount + (Number(item.singlePrice)*Number(item.purNum))
+            })
+        },
         //日期
         formatDate(date) {
             // 格式化为 YYYY-MM-DD
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
index f2b32e04..7e3df1c0 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
@@ -7,12 +7,12 @@
         <el-form-item label="询价标题" prop="title">
             <el-input v-model="queryParams.title" placeholder="请输入询价标题" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
-        <el-form-item label="询价状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="请选择询价状态" style="width: 240px;">
-                <el-option label="已决价" :value="2"></el-option>
-                <el-option label="进行中" :value="3"></el-option>
-                <el-option label="未决标" :value="4"></el-option>
-                <el-option label="已取消" :value="5"></el-option> 
+        <el-form-item label="询价状态" prop="bidStatus">
+            <el-select v-model="queryParams.bidStatus" placeholder="请选择询价状态" style="width: 240px;">
+                <el-option label="已报价" :value="1"></el-option>
+                <el-option label="未报价" :value="2"></el-option>
+                <el-option label="已中标" :value="3"></el-option>
+                <el-option label="未中标" :value="4"></el-option>
             </el-select>
         </el-form-item>
 
@@ -35,21 +35,20 @@
         </el-table-column>
         <el-table-column label="询价单号" align="center" prop="inquiryCode" :show-overflow-tooltip="true" />
         <el-table-column label="询价标题" align="center" prop="title" :show-overflow-tooltip="true" />
-         <el-table-column label="询价状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
+         <el-table-column label="询价状态" align="center" prop="bidStatus" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
-                <span v-if="scope.row.status==1">待提交</span>
-                <span v-if="scope.row.status==2">已决价</span>
-                <span v-if="scope.row.status==3">进行中</span>
-                <span v-if="scope.row.status==4">未决标</span> 
-                <span v-if="scope.row.status==5">已取消</span>
+                <span v-if="scope.row.bidStatus==1">已报价</span>
+                <span v-if="scope.row.bidStatus==2">未报价</span>
+                <span v-if="scope.row.bidStatus==3">已中标</span>
+                <span v-if="scope.row.bidStatus==4">未中标</span>
             </template>
         </el-table-column>
         <el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
         <el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" />
         <el-table-column label="决标时间" align="center" prop="bidTime" :show-overflow-tooltip="true"/>
-        <el-table-column label="决标总价(元)" align="center" prop="bidTotalPrice" :show-overflow-tooltip="true" width="120">
+        <el-table-column label="决标总价(元)" align="center" prop="quoteAmount" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
-               <span>{{ (scope.row.bidTotalPrice/100).toFixed(2) }}</span>
+               <span>{{ (scope.row.quoteAmount/100).toFixed(2) }}</span>
             </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
@@ -57,13 +56,13 @@
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit" v-if="scope.row.status==3"
+                icon="el-icon-edit" v-if="scope.row.bidStatus==2"
                 @click="handleUpdate(scope.row)"
             >报价</el-button>
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit" v-if="scope.row.status!=1"
+                icon="el-icon-edit" v-if="scope.row.bidStatus!=2"
                 @click="handleView(scope.row)"
             >详情</el-button>
             </template>
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index f9b4962b..71cd6fe4 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -801,6 +801,8 @@ export default {
         },
         getSupplierUserList(){
             let param = {
+                pageNum:1,
+                pageSize:100,
                 deptId:225,
                 queryTyoe:2
             }

From 14b11e553855425755bd91accd63c83871e7ff30 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Mon, 8 Sep 2025 18:22:47 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierQuotation/index.vue               |  4 ++--
 .../supplierManage/goodsSupplier/index.vue    | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
index 7e3df1c0..7f2667ac 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
@@ -45,8 +45,8 @@
         </el-table-column>
         <el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
         <el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" />
-        <el-table-column label="决标时间" align="center" prop="bidTime" :show-overflow-tooltip="true"/>
-        <el-table-column label="决标总价(元)" align="center" prop="quoteAmount" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="决标时间" align="center" prop="bidTime" :show-overflow-tooltip="true"/> -->
+        <el-table-column label="报价总额(元)" align="center" prop="quoteAmount" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
                <span>{{ (scope.row.quoteAmount/100).toFixed(2) }}</span>
             </template>
diff --git a/src/views/foodManage/supplierManage/goodsSupplier/index.vue b/src/views/foodManage/supplierManage/goodsSupplier/index.vue
index 7d7d000a..42bd9ce1 100644
--- a/src/views/foodManage/supplierManage/goodsSupplier/index.vue
+++ b/src/views/foodManage/supplierManage/goodsSupplier/index.vue
@@ -493,12 +493,17 @@ export default {
             let flag = false;
             if(row.alternativeSuppliers&&row.alternativeSuppliers.length>0){
                 let index = row.alternativeSuppliers.findIndex(v=>v.supplierId==item.supplierId)
-                if(index==-1){
-                    flag=false
+                if(index==-1){ 
+                    if(item.status==1){
+                        flag=false
+                    }else{
+                        flag=true
+                    } 
                 }else{
                     flag=true
-                }
+                } 
             }
+           
             return flag;
         },
         //首选选过的供应商，不能在备选里选
@@ -507,9 +512,13 @@ export default {
             let flag = false;
             if(row.supplierId&&row.supplierId!=""){
                 if(item.supplierId==row.supplierId){
-                    flag=true
+                    if(item.status==1){
+                        flag=false
+                    }else{
+                        flag=true
+                    } 
                 }else{
-                    flag=false
+                    flag=true
                 } 
             }
             return flag;

From eb6c328d45a7afd7fb41076d46812756e1094386 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 10 Sep 2025 10:21:15 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/dish/menu/edit.vue                  |  4 ++--
 .../foodManage/purchaseManage/contractList/detail.vue |  2 +-
 .../purchaseManage/purchaseInspection/detail.vue      |  2 +-
 .../purchaseManage/purchaseOrder/detail.vue           |  2 +-
 .../foodManage/purchaseManage/purchasePlan/detail.vue |  2 +-
 src/views/system/user/index.vue                       | 11 +++++++++--
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/canteen/dish/menu/edit.vue b/src/views/canteen/dish/menu/edit.vue
index f6b27832..818cafd6 100644
--- a/src/views/canteen/dish/menu/edit.vue
+++ b/src/views/canteen/dish/menu/edit.vue
@@ -337,7 +337,7 @@
                 <el-button type="primary" @click="copyWeekMenu">确 定</el-button>
                 <el-button @click="openCopyWeek=false">取 消</el-button>
             </div>
-        </el-dialog> 
+        </el-dialog>
         
     </div>
 </template>
@@ -796,7 +796,7 @@ export default {
                         mealtimeName:"夜宵",
                     }
             ]
-        }, 
+        },
         // 返回列表页
         jumpList() {
             const obj = { path: "/canteen/dish/menuDetail" };
diff --git a/src/views/foodManage/purchaseManage/contractList/detail.vue b/src/views/foodManage/purchaseManage/contractList/detail.vue
index b969a5cb..f838f610 100644
--- a/src/views/foodManage/purchaseManage/contractList/detail.vue
+++ b/src/views/foodManage/purchaseManage/contractList/detail.vue
@@ -100,7 +100,7 @@
                     <el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true"></el-table-column> 
                     <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.orderNum*scope.row.singlePrice }}</span>
+                            <span>{{ (scope.row.orderNum*scope.row.singlePrice/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
                     <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/detail.vue b/src/views/foodManage/purchaseManage/purchaseInspection/detail.vue
index 9ac034e7..2aa0b8bb 100644
--- a/src/views/foodManage/purchaseManage/purchaseInspection/detail.vue
+++ b/src/views/foodManage/purchaseManage/purchaseInspection/detail.vue
@@ -80,7 +80,7 @@
                     <el-table-column label="订货数量" align="center" prop="orderNum" :show-overflow-tooltip="true"></el-table-column> 
                     <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.orderNum*scope.row.unitPrice }}</span>
+                            <span>{{ (scope.row.orderNum*scope.row.unitPrice/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
                     <el-table-column label="送货数量" align="center" prop="deliveryNum" :show-overflow-tooltip="true"></el-table-column> 
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/detail.vue b/src/views/foodManage/purchaseManage/purchaseOrder/detail.vue
index 029a6e71..6f563f37 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/detail.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/detail.vue
@@ -107,7 +107,7 @@
                     <el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true"></el-table-column> 
                     <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.orderNum*scope.row.singlePrice }}</span>
+                            <span>{{ (scope.row.orderNum*scope.row.singlePrice/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
                     <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/detail.vue b/src/views/foodManage/purchaseManage/purchasePlan/detail.vue
index 52277625..2c3f8b1a 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/detail.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/detail.vue
@@ -96,7 +96,7 @@
                     <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"></el-table-column> 
                     <el-table-column label="预计采购金额(元)" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.purchaseNum*scope.row.unitPrice }}</span>
+                            <span>{{ (scope.row.purchaseNum*scope.row.unitPrice/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
                     <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index fe7e351e..c499ae92 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -215,8 +215,15 @@
                         label="用户账号"
                         align="center"
                         key="userName"
-                        prop="userName"
-                        v-if="columns[1].visible"
+                        prop="userName" 
+                        :show-overflow-tooltip="true"
+                    />
+                    <el-table-column
+                        label="用户编码"
+                        align="center"
+                        key="userCode"
+                        prop="userCode"
+                        v-if="columns[2].visible"
                         :show-overflow-tooltip="true"
                     />
                     <el-table-column

From 854c120920137e58e06e1fe79879f4d7669bca3d Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 10 Sep 2025 18:09:05 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/foodManage/purchaseManage.js          | 12 +++++++++++-
 .../material/components/MaterialDialog.vue    |  1 +
 .../pickManage/materialPicking/edit.vue       |  8 ++++----
 .../purchaseManage/contractList/index.vue     | 19 +++++++++++++++++--
 .../purchaseManage/goodsInquiry/edit.vue      |  8 ++++----
 .../purchaseManage/purchaseOrder/edit.vue     |  8 ++++----
 .../purchaseManage/purchasePlan/index.vue     |  8 ++++----
 .../stockManage/warehouseIn/edit.vue          |  1 +
 vue.config.js                                 |  2 +-
 9 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/api/foodManage/purchaseManage.js b/src/api/foodManage/purchaseManage.js
index 824664f5..3f9202b9 100644
--- a/src/api/foodManage/purchaseManage.js
+++ b/src/api/foodManage/purchaseManage.js
@@ -124,6 +124,16 @@ export function delPurchaseContractApi(data) {
         }
     })
 }
+// 终止
+export function nullifyPurchaseContractApi(data) {
+    return request({
+        url: '/smart-canteen/ims_purchase_contract/nullify/'+data.contractIds,
+        method: 'post',
+        headers: {
+            //"merchant-id":"378915229716713472",
+        }
+    })
+}
 
 // -------------采购询价---------------
 //获取采购询价分页列表
@@ -319,7 +329,7 @@ export function purchasePlanPageApi(data) {
     headers: {
         //"merchant-id":"378915229716713472",
     },
-    data
+    params:data
   })
 }
 //获取采购计划分页详情
diff --git a/src/views/canteen/dish/material/components/MaterialDialog.vue b/src/views/canteen/dish/material/components/MaterialDialog.vue
index 9631b985..d7a18a5e 100644
--- a/src/views/canteen/dish/material/components/MaterialDialog.vue
+++ b/src/views/canteen/dish/material/components/MaterialDialog.vue
@@ -301,6 +301,7 @@ export default {
         materialName: [{ required: true, message: '请输入原料名称', trigger: 'blur' }],
         areaId: [{ required: true, message: '请选择所属区域', trigger: 'change' }],
         materialTypeId: [{ required: true, message: '请选择原料类别', trigger: 'change' }],
+        unitId: [{ required: true, message: '请选择单位', trigger: 'change' }],
         salesMode: [{ required: true, message: '请选择计量类型', trigger: 'change' }],
         shelfLifeDays: [{ required: true, message: '请输入临期天数', trigger: 'change' }],
         nutritionTypeId: [{ required: true, message: '请选择营养信息类别', trigger: 'change' }],
diff --git a/src/views/foodManage/pickManage/materialPicking/edit.vue b/src/views/foodManage/pickManage/materialPicking/edit.vue
index 7f83ad74..7c4676ad 100644
--- a/src/views/foodManage/pickManage/materialPicking/edit.vue
+++ b/src/views/foodManage/pickManage/materialPicking/edit.vue
@@ -685,11 +685,11 @@ export default {
                 "stallId": this.baseInfo.stallId
             }
             if(this.dateRange&&this.dateRange.length>0){
-                param.startDateTime=this.formatDateTime(this.dateRange[0])
-                param.endDateTime=this.formatDateTime(this.dateRange[1])
+                param.startTime=this.formatDateTime(this.dateRange[0])
+                param.endTime=this.formatDateTime(this.dateRange[1])
             }else{
-                param.startDateTime=undefined;
-                param.endDateTime=undefined;
+                param.startTime=undefined;
+                param.endTime=undefined;
             }  
             purchasePlanPageApi(param).then(response => {
                 this.tableListData2 = response.rows;
diff --git a/src/views/foodManage/purchaseManage/contractList/index.vue b/src/views/foodManage/purchaseManage/contractList/index.vue
index 1f7fb46d..db69f275 100644
--- a/src/views/foodManage/purchaseManage/contractList/index.vue
+++ b/src/views/foodManage/purchaseManage/contractList/index.vue
@@ -125,10 +125,16 @@
             >提交</el-button> -->
             <el-button
                 size="mini"
-                type="text"
+                type="text" style="color: red;"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)" 
             >删除</el-button>
+              <el-button
+                size="mini"
+                type="text" style="color: red;"
+                icon="el-icon-edit" v-if="scope.row.commitStatus==2&&scope.row.contractStatus==2"
+                @click="handleNullify(scope.row)" 
+            >终止</el-button>
             </template>
         </el-table-column>
     </el-table>
@@ -160,7 +166,7 @@
 
 <script>
 import { systemAreaTreeApi,getCanteenByAreaApi } from "@/api/base/stall"; 
-import { purchaseContractPageApi,getPurchaseContractInfoApi,addPurchaseContractApi,editPurchaseContractApi,delPurchaseContractApi } from "@/api/foodManage/purchaseManage";
+import { purchaseContractPageApi,getPurchaseContractInfoApi,addPurchaseContractApi,editPurchaseContractApi,delPurchaseContractApi,nullifyPurchaseContractApi } from "@/api/foodManage/purchaseManage";
 
 export default {
     name: "",
@@ -334,6 +340,15 @@ export default {
                 this.$modal.msgSuccess("删除成功");
             }).catch(() => {});
         },
+         /** 终止按钮操作 */
+        handleNullify(row) { 
+            this.$modal.confirm('是否确认终止数据项？').then(function() {
+                return nullifyPurchaseContractApi({contractIds:[row.contractId]});
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("终止成功");
+            }).catch(() => {});
+        }, 
         // 提交按钮 
         confirmSubmit(row){ 
             let param = Object.assign({},row);
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
index 01bc3821..c64f3c35 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
@@ -752,11 +752,11 @@ export default {
                 "areaId": this.baseInfo.areaId,
             }
             if(this.dateRange&&this.dateRange.length>0){
-                param.startDateTime=this.formatDateTime(this.dateRange[0])
-                param.endDateTime=this.formatDateTime(this.dateRange[1])
+                param.startTime=this.formatDateTime(this.dateRange[0])
+                param.endTime=this.formatDateTime(this.dateRange[1])
             }else{
-                param.startDateTime=undefined;
-                param.endDateTime=undefined;
+                param.startTime=undefined;
+                param.endTime=undefined;
             }  
             purchasePlanPageApi(param).then(response => {
                 this.tableListData2 = response.rows;
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
index b828111a..a70ceee8 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
@@ -821,11 +821,11 @@ export default {
                 "stallId": this.baseInfo.stallId
             }
             if(this.dateRange&&this.dateRange.length>0){
-                param.startDateTime=this.formatDateTime(this.dateRange[0])
-                param.endDateTime=this.formatDateTime(this.dateRange[1])
+                param.startTime=this.formatDateTime(this.dateRange[0])
+                param.endTime=this.formatDateTime(this.dateRange[1])
             }else{
-                param.startDateTime=undefined;
-                param.endDateTime=undefined;
+                param.startTime=undefined;
+                param.endTime=undefined;
             }  
             purchasePlanPageApi(param).then(response => {
                 this.tableListData2 = response.rows;
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/index.vue b/src/views/foodManage/purchaseManage/purchasePlan/index.vue
index 04eaefe1..d18b19bb 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/index.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/index.vue
@@ -322,11 +322,11 @@ export default {
                 "stallId": this.queryParams.stallId,   
             }
              if(this.dateRange&&this.dateRange.length>0){
-                param.startDateTime=this.formatDateTime(this.dateRange[0])
-                param.endDateTime=this.formatDateTime(this.dateRange[1])
+                param.startTime=this.formatDateTime(this.dateRange[0])
+                param.endTime=this.formatDateTime(this.dateRange[1])
             }else{
-                param.startDateTime=undefined;
-                param.endDateTime=undefined;
+                param.startTime=undefined;
+                param.endTime=undefined;
             }  
             purchasePlanPageApi(param).then(response => {
                 this.tableListData = response.rows;
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index 5aaa1901..82929b22 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -685,6 +685,7 @@ export default {
                 "pageNum": this.queryParams2.pageNum,
                 "orderGoodsCode": this.queryParams2.orderGoodsCode,
                 "orderStatus":2,
+                "isInspect":0, 
                 "ifAllInto":2, 
                 "areaId": this.baseInfo.areaId,
                 "warehouseId": this.baseInfo.warehouseId, 
diff --git a/vue.config.js b/vue.config.js
index 3b84d152..99209745 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@ module.exports = {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://192.168.2.75:48380`,//旭
-                target: `http://192.168.0.244:48380`,//测试
+                target: `http://192.168.0.34:48380`,//测试
                 // target: `http://192.168.2.108:48380`,//测试
                 // target: `http://192.168.0.34:48380`,//测试
                 // target: `http://192.168.0.176:48380`,//

From 36aef6744f21e53faf189da355950904aa5518b4 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 11 Sep 2025 14:48:13 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=B0=8F=E7=A5=A8=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/printer/Common.js                   |  192 ++
 src/utils/printer/WebSDK.js                   |    1 +
 .../canteen/order/reserveManagement/index.vue | 1688 +++++++++--------
 3 files changed, 1137 insertions(+), 744 deletions(-)
 create mode 100644 src/utils/printer/Common.js
 create mode 100644 src/utils/printer/WebSDK.js

diff --git a/src/utils/printer/Common.js b/src/utils/printer/Common.js
new file mode 100644
index 00000000..6e1013af
--- /dev/null
+++ b/src/utils/printer/Common.js
@@ -0,0 +1,192 @@
+var port = 18080;
+var connectionMode = "ws:";
+var wsPrint = null;
+let wsGetPrinterList = null;
+var CHUNK_SIZE = 1024 * 64;
+
+const WebSocketPrint = function (serverURL, strPrinterName, request, callback) {
+  var _websocket;
+  var _callback = callback;
+  var _request = request;
+  var _connectedsocket = false;
+
+  var onMessage = function (msg) {
+    if (_websocket.readyState == 1) {
+      var res = JSON.parse(msg.data);
+      var ret = res.statusMessage;
+      var printerStatus;
+      if (res.printerStatus !== undefined) {
+        printerStatus = res.printerStatus.message;
+        ret += ":" + printerStatus;
+      }
+      _callback(res);
+    } else {
+      _callback(msg.data);
+    }
+  };
+
+  var onClose = function (msg) {
+    if (!_connectedsocket) {
+      _callback("Cannot connect to server");
+    }
+    _websocket.close();
+    _connectedsocket = false;
+    wsPrint = null;
+  };
+
+  var webSocketInit = function (uri) {
+    _websocket = new WebSocket(uri);
+    _websocket.binaryType = "arraybuffer";
+    _websocket.onopen = function (event) {
+      console.log("open : " + uri);
+    };
+    _websocket.onerror = function (event) {
+      wsPrint = null;
+      if (_websocket.readyState == 3) {
+        _callback("Cannot connect to server");
+      }
+    };
+    _websocket.onmessage = function (msg) {
+      onMessage(msg);
+    };
+    _websocket.onclose = function (msg) {
+      onClose(msg);
+    };
+  };
+
+  webSocketInit(serverURL + strPrinterName + _request);
+
+  this.send = function (data) {
+    const sendData = () => {
+      for (let i = 0; i < data.length; i += CHUNK_SIZE) {
+        const chunk = data.slice(i, i + CHUNK_SIZE);
+        _websocket.send(chunk);
+      }
+    };
+
+    if (_websocket.readyState === WebSocket.OPEN) {
+      sendData();
+    } else if (_websocket.readyState === WebSocket.CONNECTING) {
+      const originalOnOpen = _websocket.onopen;
+      _websocket.onopen = function(event) {
+        if (originalOnOpen) originalOnOpen(event);
+        sendData();
+        _connectedsocket = true;
+      };
+    }
+  };
+
+  this.disconnect = function () {
+    if (_websocket && _websocket.readyState === WebSocket.OPEN) {
+      console.log("Closing WebSocket connection...");
+      _websocket.close();
+    }
+  };
+};
+
+const WebSocketGetPrinterList = function (serverURL, callback) {
+  var _websocket;
+  var _callback = callback;
+  var _connectedsocket = false;
+
+  var onMessage = function (msg) {
+    if (_websocket.readyState == 1) {
+      var res = JSON.parse(msg.data);
+      _callback(res);
+    } else {
+      a;
+      _callback(msg.data);
+    }
+  };
+
+  var onClose = function (msg) {
+    if (!_connectedsocket) {
+      _callback("Cannot connect to server");
+    }
+    _websocket.close();
+    _connectedsocket = false;
+    wsGetPrinterList = null;
+  };
+
+  var webSocketInit = function (uri) {
+    _websocket = new WebSocket(uri);
+    _websocket.onopen = function (event) {
+      console.log("open : " + uri);
+    };
+    _websocket.onerror = function (event) {
+      wsGetPrinterList = null;
+      if (_websocket.readyState == 3) {
+        _callback("Cannot connect to server");
+      }
+    };
+    _websocket.onmessage = function (msg) {
+      onMessage(msg);
+    };
+    _websocket.onclose = function (msg) {
+        console.log("WebSocket connection closed");
+      onClose(msg);
+    };
+  };
+
+  webSocketInit(serverURL);
+
+  this.send = function (strSubmit) {
+    if (_websocket.readyState == 1) {
+      _websocket.send(strSubmit);
+    } else {
+      _websocket.onopen = function () {
+        if (_websocket.readyState == 1) {
+          _websocket.send(strSubmit);
+          _connectedsocket = true;
+        }
+      };
+    }
+  };
+};
+
+function setPort(serverPort) {
+  port = serverPort;
+}
+
+function getServerURL() {
+  var localAddress = `//127.0.0.1:${port}/WebSDK/`;
+  var serverURL = connectionMode + localAddress;
+  return {
+    url: serverURL,
+  };
+}
+
+function setConnectionMode(mode) {
+  connectionMode = mode;
+}
+
+function requestPrint(strPrinterName, strSubmit, _callback) {
+  _callback("");
+  var serverURL = getServerURL().url;
+  console.log(serverURL);
+
+  if (wsPrint == null)
+    wsPrint = new WebSocketPrint(serverURL, strPrinterName, "", _callback);
+  const encoder = new TextEncoder();
+  const bytesSubmit = encoder.encode(strSubmit);
+  wsPrint.send(bytesSubmit);
+}
+
+function getPrinterList(category, _callback) {
+  var serverURL = getServerURL().url + "getPrinterList";
+  if (wsGetPrinterList == null) {
+    wsGetPrinterList = new WebSocketGetPrinterList(serverURL, _callback);
+  }
+  wsGetPrinterList.send(JSON.stringify(category));
+}
+
+export {
+  setPort,
+  getServerURL,
+  setConnectionMode,
+  requestPrint,
+  getPrinterList,
+  wsPrint,
+  WebSocketPrint,
+  WebSocketGetPrinterList
+}
diff --git a/src/utils/printer/WebSDK.js b/src/utils/printer/WebSDK.js
new file mode 100644
index 00000000..b3e0ea4a
--- /dev/null
+++ b/src/utils/printer/WebSDK.js
@@ -0,0 +1 @@
+export var WebSDK=function(t){"use strict";class e{constructor(t){this.functionData={id:0,commandType:t,hasReadFunc:!1,functions:{}},this.func={},this.num=0,this.hasReadFunc=!1}getData(){return this.functionData.functions=this.func,this.functionData.hasReadFunc=this.hasReadFunc,this.func={},this.num=0,this.hasReadFunc=!1,JSON.stringify(this.functionData)}setId(t){return this.functionData.id=t,this}_addFunction(t,e,i=!1){return this.func["func"+this.num]={[t]:e},this.num++,this.hasReadFunc||=i,this}directPrintText(t){return this._addFunction("directPrintText",[t]),this}directPrintHex(t){return this._addFunction("directPrintHex",[t]),this}setEncoding(t="gbk"){return this._addFunction("setEncoding",[t]),this}}const i=Object.freeze({CODE_128:"128",CODE_128M:"128M",CODE_EAN128:"EAN128",CODE_25:"25",CODE_25C:"25C",CODE_39:"39",CODE_39C:"39C",CODE_93:"93",CODE_EAN13:"EAN13",CODE_EAN13_2:"EAN13+2",CODE_EAN13_5:"EAN13+5",CODE_EAN8:"EAN8",CODE_EAN8_2:"EAN8+2",CODE_EAN8_5:"EAN8+5",CODE_CODA:"CODA",CODE_POST:"POST",CODE_UPCA:"UPCA",CODE_UPCA_2:"UPCA+2",CODE_UPCA_5:"UPCA+5",CODE_UPCE:"UPCE",CODE_UPCE_2:"UPCE+2",CODE_UPCE_5:"UPCE+5",CODE_CPOST:"CPOST",CODE_MSI:"MSI",CODE_MSIC:"MSIC",CODE_PLESSEY:"PLESSEY",CODE_ITF14:"ITF14",CODE_EAN14:"EAN14",CODE_11:"11",CODE_TELEPEN:"TELEPEN",CODE_TELEPENN:"TELEPENN",CODE_PLANET:"PLANET",CODE_CODE49:"CODE49",CODE_DPI:"DPI",CODE_DPL:"DPL"}),n=Object.freeze({L:"L",M:"M",Q:"Q",H:"H"}),r=Object.freeze({ROTATION_0:0,ROTATION_90:90,ROTATION_180:180,ROTATION_270:270}),a=Object.freeze({LEFT:1,CENTER:2,RIGHT:3}),d=Object.freeze({NONE:0,LEFT:1,CENTER:2,RIGHT:3}),s=Object.freeze({FNT_8_12:"1",FNT_12_20:"2",FNT_16_24:"3",FNT_24_32:"4",FNT_32_48:"5",FNT_14_19:"6",FNT_14_25:"7",FNT_21_27:"8",FNT_SIMPLIFIED_CHINESE:"TSS24.BF2",FNT_TRADITIONAL_CHINESE:"TST24.BF2",FNT_KOREAN:"K"}),o=Object.freeze({AUTO:"A",MANUAL:"M"}),h=Object.freeze({M1:"M1",M2:"M2"}),c=Object.freeze({URL:0,BASE64:1,LOCAL_PATH:2}),u=Object.freeze({OVERWRITE:0,OR:1,XOR:2}),_=Object.freeze({BOTTOM:0,TOP:1});var E=Object.freeze({__proto__:null,BarcodeType:i,EccLevel:n,Rotation:r,Alignment:a,Readable:d,FontSize:s,QrCodeMode:o,QrCodeModel:h,ImageSource:c,ImageMode:u,Orientation:_});const C=Object.freeze({LEFT:0,CENTER:1,RIGHT:2}),O=Object.freeze({DEFAULT:0,FONTB:1,BOLD:8,REVERSE:16,UNDERLINE:128,UNDERLINE2:256}),T=Object.freeze({_1WIDTH:0,_2WIDTH:16,_3WIDTH:32,_4WIDTH:48,_5WIDTH:64,_6WIDTH:80,_7WIDTH:96,_8WIDTH:112}),P=Object.freeze({NORMAL:0,WIDTH_DOUBLE:1,HEIGHT_DOUBLE:2,WIDTH_HEIGHT_DOUBLE:3}),l=Object.freeze({UPCA:65,UPCE:66,EAN8:68,EAN13:67,JAN8:68,JAN13:67,ITF:70,Codabar:71,Code39:69,Code93:72,Code128:73}),A=Object.freeze({NONE:0,ABOVE:1,BELOW:2,BOTH:3}),F=Object.freeze({L:48,M:49,Q:50,H:51}),N=Object.freeze({ALL:0,HALF:1}),R=Object.freeze({_58:1,_80:2,_76:3}),I=Object.freeze({TOW:0,FIVE:1}),f=Object.freeze({UNKNOWN:-1,NORMAL:0,COVEROPEN:16,PAPEREMPTY:32,CASH_OPEN:0,CASH_CLOSE:1}),m=Object.freeze({PRINT:1,OFFLINE:2,ERR:3,PAPER:4}),D=Object.freeze({LEFT_TOP:0,LEFT_BOTTOM:1,RIGHT_BOTTOM:2,RIGHT_TOP:3}),g=Object.freeze({URL:0,BASE64:1,LOCAL_PATH:2}),w=Object.freeze({PC437:0,KATAKANA:1,PC850:2,PC860:3,PC863:4,PC865:5,WEST_EUROPE:6,GREEK:7,HEBREW1:8,EAST_EUROPE:9,IRAN:10,WPC1252:16,PC866:17,PC852:18,PC858:19,IranII:20,LATVIAN:21,ARABIC:22,PT1511251:23,PC747:24,WPC1257:25,VIETNAM:27,PC864:28,PC1001:29,UIGUR:30,HEBREW2:31,WPC1255_ISRAEL:32,WPC1256:33,PC861_ICELANDIC:56,PC863_CANADIAN:57,PC865_NORDIC:58,PC866_RUSSIAN:59,PC855_BULGARIAN:60,PC857_TURKEY:61,PC862_HEBREW:62,PC864_ARABIC:63,PC737_GREEK:64,PC851_GREEK:65,PC869_GREEK:66,PC928_GREEK:67,PC772_LITHUANIAN:68,PC774_LITHUANIAN:69,PC874_THAI:70,WPC1252_LATIN_1:71,WPC1250_LATIN_2:72,WPC1251_CYRILLIC:73,PC3840_IBM_RUSSIAN:74,PC3841_GOST:75,PC3843_POLISH:76,PC3844_CS2:77,PC3845_HUNGARIAN:78,PC3846_TURKISH:79,PC3847_BRAZIL_ABNT:80,PC3848_BRAZIL:81,PC1001_ARABIC:82,SIMPLIFIED_CHINESE:256,TRADITIONAL_CHINESE:257,KOREAN:258,JAPANESE:259});var L=Object.freeze({__proto__:null,Alignment:C,FontStyle:O,TextWidth:T,BitmapMode:P,BarcodeType:l,HRILocation:A,QrEcLevel:F,CutMode:N,DeviceType:R,CashDrawerPin:I,PrinterStatus:f,StatusType:m,PrintDirection:D,ImageSource:g,CodePage:w});const y=Object.freeze({Nomal:"N",Invert:"I"}),x=Object.freeze({ROTATION_0:"N",ROTATION_90:"R",ROTATION_180:"I",ROTATION_270:"B"}),S=Object.freeze({URL:0,BASE64:1,LOCAL_PATH:2}),H=Object.freeze({HEX:"H",ASCII:"A"});var B=Object.freeze({__proto__:null,Direction:y,Rotation:x,ImageSource:S,DataFormat:H});return t.EscPosCommand=class extends e{constructor(){super("ESC_POS")}setCodePage(t){return this._addFunction("setCodePage",[t]),this}setDefaultCodePage(t){return this._addFunction("setDefaultCodePage",[t]),this}setDoubleByteMode(t=!0){this._addFunction("setDoubleByteMode",[t])}checkPrinterStatus(){return this._addFunction("checkPrinterStatus",[2]),this}printText(t){const e={data:null,textSize:1,alignment:C.CENTER},{data:i,textSize:n,alignment:r}={...e,...t};return this._addFunction("printText",[i,n,r,0]),this}printBarCode(t){const e={data:null,type:l.Code128,width:3,height:162,alignment:C.CENTER,textPosition:A.NONE},{data:i,type:n,width:r,height:a,alignment:d,textPosition:s}={...e,...t};return this._addFunction("printBarCode",[i,n,r,a,d,s]),this}printQrCode(t){const e={alignment:C.CENTER,size:3,ecLevel:F.L},{data:i,alignment:n,size:r,ecLevel:a}={...e,...t};return this._addFunction("printQrCode",[i,n,r,a]),this}printAndFeed(t=0){return this._addFunction("printAndFeed",[t]),this}printImage(t){const e={type:g.URL,data:"",alignment:C.CENTER,mode:P.NORMAL},{type:i,data:n,alignment:r,mode:a}={...e,...t};return this._addFunction("printImage",[i,n,a,r]),this}printTable(t){return this._addFunction("printTable",[t.titles,t.columnWidths,t.rows]),this}setAlignment(t=0){return this._addFunction("setAlignment",[t]),this}cutPaper(t=1){return this._addFunction("cutPaper",[t]),this}feedAndCut(t=0){return this._addFunction("feedAndCut",[t]),this}cleanBuffer(){return this._addFunction("cleanBuffer",[]),this}},t.PosConst=L,t.TsplCommand=class extends e{constructor(){super("TSPL")}setUnit(t="MM"){return this._addFunction("setUnit",[t]),this}checkPrinterStatus(){return this._addFunction("checkPrinterStatus",[]),this}setPaperSize(t){return this._addFunction("setPaperSize",[t.width,t.height]),this}printBuffer(t=1){return this._addFunction("printBuffer",[t]),this}clearBuffer(){return this._addFunction("clearBuffer",[]),this}setGap(t){const{height:e,offset:i}={height:0,offset:0,...t};return this._addFunction("setGap",[e,i]),this}setSpeed(t=4){return this._addFunction("setSpeed",[t]),this}setDensity(t=8){return this._addFunction("setDensity",[t]),this}setDirection(t){const{orientation:e,isMirror:i}={orientation:1,isMirror:!1,...t};return this._addFunction("setDirection",[e,i]),this}setOffset(t=0){return this._addFunction("setOffset",[t]),this}setReference(t){const{x:e,y:i}={x:0,y:0,...t};return this._addFunction("setReference",[e,i]),this}setFeed(t){return this._addFunction("setFeed",[t]),this}setBackFeed(t){return this._addFunction("setBackFeed",t),this}setFormFeed(){return this._addFunction("setFormFeed",[]),this}setLimitFeed(t=254){return this._addFunction("setLimitFeed",[t]),this}setHome(){return this._addFunction("setHome",[]),this}setCodePage(t){return this._addFunction("setCodePage",[t]),this}setSound(t){const{level:e,interval:i}={level:5,interval:200,...t};return this._addFunction("setSound",[e,i]),this}setCut(){return this._addFunction("setCut",[]),this}setPeel(t=!0){return this._addFunction("setPeel",[t]),this}setTear(t=!0){return this._addFunction("setTear",[t]),this}setBline(t){const{height:e,offset:i}={height:0,offset:0,...t};return this._addFunction("setBline",[e,i]),this}drawText(t){const e={x:8,y:8,font:s.FNT_8_12,rotation:r.ROTATION_0,xRatio:1,yRatio:1,alignment:null,data:null},{x:i,y:n,font:a,rotation:d,xRatio:o,yRatio:h,alignment:c,data:u}={...e,...t};if(!u)throw new Error("Text data is required");return null==c?this._addFunction("drawText",[i,n,a,d,o,h,u]):this._addFunction("drawText",[i,n,a,d,o,h,c,u]),this}drawBox(t){const{x:e,y:i,width:n,height:r,thickness:a,radius:d}={x:8,y:8,width:100,height:100,thickness:4,radius:0,...t};return this._addFunction("drawBox",[e,i,n,r,a,d]),this}drawBar(t){const{x:e,y:i,width:n,height:r}={x:8,y:8,width:100,height:16,...t};return this._addFunction("drawBar",[e,i,n,r]),this}drawBarCode(t){const e={x:8,y:8,codeType:i.CODE_128,height:100,readable:d.LEFT,rotation:r.ROTATION_0,narrow:2,wide:2,alignment:null,data:null},{x:n,y:a,codeType:s,height:o,readable:h,rotation:c,narrow:u,wide:_,alignment:E,data:C}={...e,...t};if(!C)throw new Error("Barcode data is required");return null==E?this._addFunction("drawBarCode",[n,a,s,o,h,c,u,_,C]):this._addFunction("drawBarCode",[n,a,s,o,h,c,u,_,E,C]),this}drawQrCode(t){const e={x:8,y:8,ecLevel:n.L,cellWidth:5,mode:o.AUTO,rotation:r.ROTATION_0,model:h.M1,mask:7,data:null},{x:i,y:a,ecLevel:d,cellWidth:s,mode:c,rotation:u,model:_,mask:E,data:C}={...e,...t};return this._addFunction("drawQrCode",[i,a,d,s,c,u,_,E,C]),this}drawImage(t){const e={x:8,y:8,mode:u.OVERWRITE,width:100,type:c.URL,data:null},{x:i,y:n,mode:r,width:a,type:d,data:s}={...e,...t};return this._addFunction("drawImage",[i,n,r,a,d,s]),this}drawErase(t){const{x:e,y:i,width:n,height:r}={x:8,y:8,width:100,height:100,...t};return this._addFunction("drawErase",[e,i,n,r]),this}drawReverse(t){const{x:e,y:i,width:n,height:r}={x:8,y:8,width:100,height:100,...t};return this._addFunction("drawReverse",[e,i,n,r]),this}},t.TsplConst=E,t.ZplCommand=class extends e{constructor(){super("ZPL")}commandStart(){return this._addFunction("commandStart",[]),this}commandEnd(){return this._addFunction("commandEnd",[]),this}setCustomFont(t){const{fontName:e,alias:i,codePage:n}={fontName:"",alias:"",codePage:28,...t};return this._addFunction("setCustomFont",[e,i,n]),this}setPrintWidth(t=0){return this._addFunction("setPrintWidth",[t]),this}setPrintCount(t=1){return this._addFunction("setPrintCount",[t]),this}setPaperSize(t=8,e=8){return this._addFunction("setPaperSize",[t,e]),this}setDirection(t=y.Nomal){return this._addFunction("setDirection",[t]),this}setBlackMakOffset(t=0){return this._addFunction("setBlackMakOffset",[t]),this}setReference(t=0,e=0){return this._addFunction("setReference",[t,e]),this}setBarcodeDefault(t){const{modWidth:e,ratio:i,height:n}={modWidth:2,ratio:3,height:10,...t};return this._addFunction("setBarcodeDefault",[e,i,n]),this}drawText(t){const e={x:8,y:8,font:"A",rotation:x.ROTATION_0,sizeW:10,sizeH:10,data:null},{x:i,y:n,font:r,rotation:a,sizeW:d,sizeH:s,data:o}={...e,...t};return this._addFunction("drawText",[i,n,r,a,d,s,o]),this}drawReverse(t){const{x:e,y:i,width:n,height:r,radius:a}={x:8,y:8,width:100,height:100,radius:0,...t};return this._addFunction("drawReverse",[e,i,n,r,a]),this}drawBox(t){const{x:e,y:i,width:n,height:r,thickness:a,radius:d}={x:8,y:8,width:100,height:100,thickness:1,radius:0,...t};return this._addFunction("drawBox",[e,i,n,r,d,a]),this}drawQrCode(t){const{x:e,y:i,size:n,data:r}={x:8,y:8,size:2,data:null,...t};return this._addFunction("drawQrCode",[e,i,n,r]),this}drawCode39(t){const e={x:8,y:8,rotation:x.ROTATION_0,checksum:!1,height:80,hri:!0,aboveHri:!1,data:null},{x:i,y:n,rotation:r,checksum:a,height:d,hri:s,aboveHri:o,data:h}={...e,...t};return this._addFunction("drawCode39",[i,n,r,a,d,s,o,h]),this}drawCode93(t){const e={x:8,y:8,rotation:x.ROTATION_0,checksum:!1,height:80,hri:!0,aboveHri:!1,data:null},{x:i,y:n,rotation:r,checksum:a,height:d,hri:s,aboveHri:o,data:h}={...e,...t};return this._addFunction("drawCode93",[i,n,r,d,s,o,a,h]),this}drawCode128(t){const e={x:8,y:8,rotation:x.ROTATION_0,checksum:!1,height:80,hri:!0,aboveHri:!1,mode:"N",data:null},{x:i,y:n,rotation:r,checksum:a,height:d,hri:s,aboveHri:o,mode:h,data:c}={...e,...t};return this._addFunction("drawCode128",[i,n,r,d,s,o,a,h,c]),this}drawEan8(t){const e={x:8,y:8,rotation:x.ROTATION_0,height:80,hri:!0,aboveHri:!1,data:null},{x:i,y:n,rotation:r,height:a,hri:d,aboveHri:s,data:o}={...e,...t};return this._addFunction("drawEan8",[i,n,r,a,d,s,o]),this}drawEan13(t){const e={x:8,y:8,rotation:x.ROTATION_0,height:80,hri:!0,aboveHri:!1,data:null},{x:i,y:n,rotation:r,height:a,hri:d,aboveHri:s,data:o}={...e,...t};return this._addFunction("drawEan13",[i,n,r,a,d,s,o]),this}drawUpcE(t){const e={x:8,y:8,rotation:x.ROTATION_0,height:80,hri:!0,aboveHri:!1,checksum:!1,data:null},{x:i,y:n,rotation:r,height:a,hri:d,aboveHri:s,checksum:o,data:h}={...e,...t};return this._addFunction("drawUpcE",[i,n,r,a,d,s,o,h]),this}drawUpcA(t){const e={x:8,y:8,rotation:x.ROTATION_0,height:80,hri:!0,aboveHri:!1,checksum:!1,data:null},{x:i,y:n,rotation:r,height:a,hri:d,aboveHri:s,checksum:o,data:h}={...e,...t};return this._addFunction("drawUpcA",[i,n,r,a,d,s,o,h]),this}drawPdf417(t){const e={x:8,y:8,rotation:x.ROTATION_0,height:80,secureLevel:0,col:1,row:1,showIndicator:!1,data:null},{x:i,y:n,rotation:r,height:a,secureLevel:d,col:s,row:o,showIndicator:h,data:c}={...e,...t};return this._addFunction("drawPdf417",[i,n,r,a,d,s,o,h,c]),this}drawMicroPdf417(t){const e={x:8,y:8,rotation:x.ROTATION_0,height:80,mode:0,data:null},{x:i,y:n,rotation:r,height:a,mode:d,data:s}={...e,...t};return this._addFunction("drawMicroPdf417",[i,n,r,a,d,s]),this}drawImage(t){const e={x:8,y:8,width:100,type:S.URL,data:null},{x:i,y:n,width:r,type:a,data:d}={...e,...t};return this._addFunction("drawImage",[i,n,r,a,d]),this}calibrateRfidTag(){return this._addFunction("calibrateRfidTag",[]),this}setRfid(t){const{writePower:e,readPower:i,tagType:n,position:r,errLength:a,errRepeat:d}={writePower:12,readPower:13,tagType:8,position:25,errLength:50,errRepeat:1,...t};return this._addFunction("setRfid",[e,i,n,r,a,d]),this}writeToRfid(t){const e={format:H.HEX,start:2,size:0,memoryBlock:"E",data:null},{format:i,start:n,size:r,memoryBlock:a,data:d}={...e,...t};return d.length%2!=0&&(d+="0"),this._addFunction("writeToRfid",[i,n,r,a,d]),this}readFromRfid(t){const{format:e,start:i,size:n,memoryBlock:r}={format:"H",start:2,size:8,memoryBlock:"1",...t};return this._addFunction("readFromRfid",[e,i,n,r],!0),this}},t.ZplConst=B,Object.defineProperty(t,"__esModule",{value:!0}),t}({});
diff --git a/src/views/canteen/order/reserveManagement/index.vue b/src/views/canteen/order/reserveManagement/index.vue
index 63dc09fa..0aa0f9e6 100644
--- a/src/views/canteen/order/reserveManagement/index.vue
+++ b/src/views/canteen/order/reserveManagement/index.vue
@@ -2,106 +2,131 @@
   <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="daterange"
-              align="right"
-              unlink-panels
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              format="yyyy-MM-dd" style="width: 220px"
-              :picker-options="pickerOptions" >
-          </el-date-picker>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          format="yyyy-MM-dd" style="width: 220px"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="关键字">
-          <el-input v-model="queryParams.custSearchInfo" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 220px"/>
+        <el-input v-model="queryParams.custSearchInfo" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable
+                  style="width: 220px"
+        />
       </el-form-item>
       <el-form-item label="订单号">
-          <el-input v-model.number="queryParams.orderId" placeholder="请输入订单号" maxlength="20" clearable style="width: 220px" @input="(v)=>(queryParams.orderId=v.replace(/[^\d]/g,''))"/>
+        <el-input v-model.number="queryParams.orderId" placeholder="请输入订单号" maxlength="20" clearable
+                  style="width: 220px" @input="(v)=>(queryParams.orderId=v.replace(/[^\d]/g,''))"
+        />
       </el-form-item>
       <el-form-item label="菜品名称">
-          <el-input v-model="queryParams.goodsSearchInfo" placeholder="请输入菜品名称" maxlength="20" clearable style="width: 220px"/>
+        <el-input v-model="queryParams.goodsSearchInfo" placeholder="请输入菜品名称" maxlength="20" clearable
+                  style="width: 220px"
+        />
       </el-form-item>
       <el-form-item label="餐次">
-          <el-select v-model="queryParams.mealtimeTypeList" multiple style="width: 220px" clearable collapse-tags>
-              <el-option label="早餐" value="1"></el-option>
-              <el-option label="午餐" value="2"></el-option>
-              <el-option label="下午茶" value="3"></el-option>
-              <el-option label="晚餐" value="4"></el-option>
-              <el-option label="夜宵" value="5"></el-option>
-          </el-select>  
+        <el-select v-model="queryParams.mealtimeTypeList" multiple style="width: 220px" clearable collapse-tags>
+          <el-option label="早餐" value="1"></el-option>
+          <el-option label="午餐" value="2"></el-option>
+          <el-option label="下午茶" value="3"></el-option>
+          <el-option label="晚餐" value="4"></el-option>
+          <el-option label="夜宵" value="5"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="所属区域" prop="areaId">
-          <el-cascader v-model="queryParams.areaId"
-          :options="treeAreaOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
-          :props="{  
+        <el-cascader v-model="queryParams.areaId"
+                     :options="treeAreaOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
+                     :props="{
               emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
               checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
-              value:'id',label:'label' 
-          }" clearable collapse-tags @change="handleAreaChange">
-          </el-cascader>
+              value:'id',label:'label'
+          }" clearable collapse-tags @change="handleAreaChange"
+        >
+        </el-cascader>
       </el-form-item>
       <el-form-item label="所属食堂" prop="canteenId">
-          <el-select v-model="queryParams.canteenId" clearable collapse-tags placeholder="请选择所属食堂" style="width: 220px" @change="handleCanteenChange">
-              <el-option v-for="item in canteenOptions"
-                  :key="item.canteenId"
-                  :label="item.canteenName"
-                  :value="item.canteenId"
-              ></el-option>
-          </el-select> 
+        <el-select v-model="queryParams.canteenId" clearable collapse-tags placeholder="请选择所属食堂"
+                   style="width: 220px" @change="handleCanteenChange"
+        >
+          <el-option v-for="item in canteenOptions"
+                     :key="item.canteenId"
+                     :label="item.canteenName"
+                     :value="item.canteenId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="所属档口" prop="stallId">
-          <el-select v-model="queryParams.stallId" clearable collapse-tags placeholder="请选择所属档口" style="width: 220px" >
-              <el-option v-for="item in stallOptions"
-                  :key="item.stallId"
-                  :label="item.stallName"
-                  :value="item.stallId"
-              ></el-option>
-          </el-select> 
-      </el-form-item> 
+        <el-select v-model="queryParams.stallId" clearable collapse-tags placeholder="请选择所属档口"
+                   style="width: 220px"
+        >
+          <el-option v-for="item in stallOptions"
+                     :key="item.stallId"
+                     :label="item.stallName"
+                     :value="item.stallId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="订单状态">
-          <el-select v-model="queryParams.orderStateList" clearable multiple collapse-tags style="width: 220px"> 
-            <el-option
-                v-for="dict in dict.type.sm_order_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="Number(dict.value)"
-                />
-          </el-select>  
+        <el-select v-model="queryParams.orderStateList" clearable multiple collapse-tags style="width: 220px"
+                   @change="changePrint"
+        >
+          <el-option
+            v-for="dict in dict.type.sm_order_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="Number(dict.value)"
+          />
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="支付方式">
-          <el-select v-model="queryParams.payStateList" clearable multiple collapse-tags style="width: 220px"> 
+          <el-select v-model="queryParams.payStateList" clearable multiple collapse-tags style="width: 220px">
             <el-option
                 v-for="dict in dict.type.sm_order_pay_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="Number(dict.value)"
                 />
-          </el-select>  
+          </el-select>
       </el-form-item> -->
       <!-- <el-form-item label="用户类别">
-          <el-select v-model="queryParams.psnType" style="width: 220px" clearable> 
+          <el-select v-model="queryParams.psnType" style="width: 220px" clearable>
                 <el-option
                 v-for="dict in dict.type.sys_user_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="Number(dict.value)"
                 />
-          </el-select>  
+          </el-select>
       </el-form-item>  -->
-      <el-form-item label="所属组织" prop="deptIdList">  
-            <el-cascader v-model="queryParams.deptIdList"
-            :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
-            :props="{ 
+      <el-form-item label="所属组织" prop="deptIdList">
+        <el-cascader v-model="queryParams.deptIdList"
+                     :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                     :props="{
                 multiple: true,
                 emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                 checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
-                value:'id',label:'label' 
-            }" clearable collapse-tags >
-            </el-cascader> 
-        </el-form-item> 
-      
+                value:'id',label:'label'
+            }" clearable collapse-tags
+        >
+        </el-cascader>
+      </el-form-item>
+<!--      <el-form-item label="小票打印机" prop="deptIdList">-->
+<!--        <el-select v-model="printerName" clearable collapse-tags style="width: 220px">-->
+<!--          <el-option-->
+<!--            v-for="item in printList"-->
+<!--            :key="item.value"-->
+<!--            :label="item.name"-->
+<!--            :value="item.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -110,25 +135,36 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-            <el-button 
-                type="primary" 
-                size="mini" :disabled="multiple"
-                @click="handleBatchWriteOff"
-            >批量核销</el-button>
-        </el-col>  
-        <el-col :span="1.5">
-            <el-button
-            type="primary" 
-            size="mini" :disabled="multiple"
-            @click="handleBatchRefund"
-            >批量退单</el-button>
-        </el-col>  
-      <!-- 
-    
       <el-col :span="1.5">
         <el-button
-          type="primary" 
+          type="primary"
+          size="mini" :disabled="multiple"
+          @click="handleBatchWriteOff"
+        >批量核销
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          size="mini" :disabled="multiple"
+          @click="handleBatchRefund"
+        >批量退单
+        </el-button>
+      </el-col>
+      <el-col :span="1.5" style="display: flex">
+        <el-button
+          type="primary"
+          size="mini" :disabled="multiple"
+          @click="handleBatchPrint"
+          style="margin-left: 5px;"
+        >批量打印小票
+        </el-button>
+      </el-col>
+      <!--
+
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
           size="mini" :disabled="multiple"
           @click="handleSyncPayState"
         >同步订单状态</el-button>
@@ -136,41 +172,45 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable" :row-key="(row)=>{return row.orderId}" @selection-change="handleOrderSelectionChange">
+    <el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable"
+              :row-key="(row)=>{return row.orderId}" @selection-change="handleOrderSelectionChange"
+    >
       <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
       <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>
+        <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="orderType" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
-            <dict-tag :options="dict.type.sm_order_type" :value="scope.row.orderType"/> 
+          <dict-tag :options="dict.type.sm_order_type" :value="scope.row.orderType"/>
         </template>
       </el-table-column>
-      <el-table-column label="就餐日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/> 
+      <el-table-column label="就餐日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="餐次" align="center" prop="mealtimeName" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="菜品明细" align="center" prop="orderDetailList" :show-overflow-tooltip="true" width="120">
-          <template slot-scope="scope">
-              <span v-for="item in scope.row.orderDetailList" :key="item.detailId">{{ item.goodsName }}*{{ item.quantity }};</span>
-          </template>
+        <template slot-scope="scope">
+          <span v-for="item in scope.row.orderDetailList" :key="item.detailId">{{ item.goodsName }}*{{
+              item.quantity
+            }};</span>
+        </template>
       </el-table-column>
       <el-table-column label="订单金额" align="center" prop="payableAmount" :show-overflow-tooltip="true" width="80">
-          <template slot-scope="scope">
-              <span>{{ (scope.row.payableAmount/100).toFixed(2) }}</span>
-          </template>
+        <template slot-scope="scope">
+          <span>{{ (scope.row.payableAmount / 100).toFixed(2) }}</span>
+        </template>
       </el-table-column>
       <el-table-column label="实付金额" align="center" :show-overflow-tooltip="true" width="80">
-          <template slot-scope="scope">
-              <span>{{ ((scope.row.payableAmount-scope.row.refundAmount)/100).toFixed(2) }}</span>
-          </template>
+        <template slot-scope="scope">
+          <span>{{ ((scope.row.payableAmount - scope.row.refundAmount) / 100).toFixed(2) }}</span>
+        </template>
       </el-table-column>
       <el-table-column label="支付方式" align="center" prop="payType" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
-            <dict-tag :options="dict.type.sm_order_pay_type" :value="scope.row.payType"/> 
+          <dict-tag :options="dict.type.sm_order_pay_type" :value="scope.row.payType"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="80"/> 
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
@@ -179,46 +219,51 @@
       <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="120"/>
       <!-- <el-table-column label="用户类别" align="center" prop="" :show-overflow-tooltip="true" width="100"/> -->
-      <el-table-column label="订单号" align="center" prop="orderId" :show-overflow-tooltip="true" width="180"/> 
-      <el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true" width="180"/> 
+      <el-table-column label="订单号" align="center" prop="orderId" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="订单状态" align="center" prop="orderState" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
-            <!-- <dict-tag :options="dict.type.sm_order_status" :value="scope.row.orderState"/>  -->
-            <span v-if="scope.row.orderState==1">已下单</span>
-            <span v-if="scope.row.orderState==2">已完成</span>
-            <span v-if="scope.row.orderState==3&&scope.row.payState==3">已退单</span>
-            <span v-if="scope.row.orderState==3&&scope.row.payState==4">已取消</span>
-            <span v-if="scope.row.orderState==4">待下单</span>
-            <span v-if="scope.row.orderState==5">部分退单</span> 
+          <!-- <dict-tag :options="dict.type.sm_order_status" :value="scope.row.orderState"/>  -->
+          <span v-if="scope.row.orderState==1">已下单</span>
+          <span v-if="scope.row.orderState==2">已完成</span>
+          <span v-if="scope.row.orderState==3&&scope.row.payState==3">已退单</span>
+          <span v-if="scope.row.orderState==3&&scope.row.payState==4">已取消</span>
+          <span v-if="scope.row.orderState==4">待下单</span>
+          <span v-if="scope.row.orderState==5">部分退单</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
-        <template slot-scope="scope"> 
+        <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text" 
-            @click="handleView(scope.row)" 
-          >详情</el-button>
+            type="text"
+            @click="handleView(scope.row)"
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==5"
-            @click="handleRefundPart(scope.row)" 
-          >部分退款</el-button>
+            @click="handleRefundPart(scope.row)"
+          >部分退款
+          </el-button>
           <el-button
-            size="mini" 
+            size="mini"
             type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==4"
-            @click="handleRefund(scope.row)" 
-          >退单</el-button>
+            @click="handleRefund(scope.row)"
+          >退单
+          </el-button>
           <el-button
-            size="mini" 
+            size="mini"
             type="text" v-if="scope.row.orderState==1"
-            @click="writeOffOrder(scope.row)" 
-          >核销</el-button>
+            @click="writeOffOrder(scope.row)"
+          >核销
+          </el-button>
           <el-button
-            size="mini" 
+            size="mini"
             type="text" v-if="scope.row.commentState==1"
-            @click="checkEvaluate(scope.row)" 
-          >评价</el-button>  
+            @click="checkEvaluate(scope.row)"
+          >评价
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -234,138 +279,138 @@
     <!-- 详情对话框 -->
     <el-dialog title="详情" :visible.sync="open" width="1000px" append-to-body>
       <div style="width: 100%;height: 600px;overflow-y: auto;">
-          <el-descriptions class="margin-top" title="订单信息" :column="3" size="small" border> 
-              <el-descriptions-item>
-                  <template slot="label">订单号</template>
-                  {{orderInfoData.orderId}}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                  <template slot="label">订单类型</template> 
-                  <dict-tag :options="dict.type.sm_order_type" :value="orderInfoData.orderType"/> 
-              </el-descriptions-item> 
-              <el-descriptions-item>
-                  <template slot="label">	所属区域</template>
-                  {{ orderInfoData.areaName }}
-              </el-descriptions-item>
+        <el-descriptions class="margin-top" title="订单信息" :column="3" size="small" border>
+          <el-descriptions-item>
+            <template slot="label">订单号</template>
+            {{ orderInfoData.orderId }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">订单类型</template>
+            <dict-tag :options="dict.type.sm_order_type" :value="orderInfoData.orderType"/>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 所属区域</template>
+            {{ orderInfoData.areaName }}
+          </el-descriptions-item>
 
-              <el-descriptions-item>
-                  <template slot="label">	所属食堂</template>
-                  {{ orderInfoData.canteenName }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                  <template slot="label">	所属档口</template>
-                  {{ orderInfoData.stallName }}
-              </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 所属食堂</template>
+            {{ orderInfoData.canteenName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 所属档口</template>
+            {{ orderInfoData.stallName }}
+          </el-descriptions-item>
 
-              <el-descriptions-item>
-                  <template slot="label">	用户姓名</template>
-                  {{ orderInfoData.nickName }}
-              </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 用户姓名</template>
+            {{ orderInfoData.nickName }}
+          </el-descriptions-item>
 
-              <el-descriptions-item>
-                  <template slot="label">	用户编号</template>
-                  {{ orderInfoData.userId }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                  <template slot="label">	用户手机号</template>
-                  {{ orderInfoData.phoneNumber }}
-              </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 用户编号</template>
+            {{ orderInfoData.userId }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 用户手机号</template>
+            {{ orderInfoData.phoneNumber }}
+          </el-descriptions-item>
 
-              <el-descriptions-item>
-                  <template slot="label">	所属组织</template>
-                  {{ orderInfoData.deptFullName }}
-              </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 所属组织</template>
+            {{ orderInfoData.deptFullName }}
+          </el-descriptions-item>
 
-              <!-- <el-descriptions-item>
-                  <template slot="label">	用户类别</template>
-                  {{ orderInfoData.psnTypeName }}
-              </el-descriptions-item> -->
-              <el-descriptions-item>
-                  <template slot="label">	就餐日期</template>
-                  {{ orderInfoData.orderDate }}
-              </el-descriptions-item>
+          <!-- <el-descriptions-item>
+              <template slot="label">	用户类别</template>
+              {{ orderInfoData.psnTypeName }}
+          </el-descriptions-item> -->
+          <el-descriptions-item>
+            <template slot="label"> 就餐日期</template>
+            {{ orderInfoData.orderDate }}
+          </el-descriptions-item>
 
-              <el-descriptions-item>
-                  <template slot="label">	餐次</template>
-                  {{ orderInfoData.mealtimeName }}
-              </el-descriptions-item>
- 
-              <el-descriptions-item>
-                  <template slot="label">	订单金额</template> 
-                  {{ (orderInfoData.payableAmount/100).toFixed(2) }}
-              </el-descriptions-item>  
-              <el-descriptions-item>
-                  <template slot="label">	实付金额</template>
-                  {{ ((orderInfoData.payableAmount-orderInfoData.refundAmount)/100).toFixed(2) }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                  <template slot="label">	退款金额</template>
-                  {{ (orderInfoData.refundAmount/100).toFixed(2) }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                  <template slot="label">	配送费</template>
-                  {{ (orderInfoData.deliveryAmount/100).toFixed(2) }}
-              </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 餐次</template>
+            {{ orderInfoData.mealtimeName }}
+          </el-descriptions-item>
 
-              <el-descriptions-item>
-                  <template slot="label">	包装费</template>
-                  {{ (orderInfoData.packingAmount/100).toFixed(2) }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                  <template slot="label">	支付方式</template>
-                  <dict-tag :options="dict.type.sm_order_pay_type" :value="orderInfoData.payType"/> 
-              </el-descriptions-item> 
-              <el-descriptions-item>
-                  <template slot="label">	下单时间</template>
-                  {{ orderInfoData.orderTime }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                  <template slot="label">	支付时间</template>
-                  {{ orderInfoData.payTime }}
-              </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 订单金额</template>
+            {{ (orderInfoData.payableAmount / 100).toFixed(2) }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 实付金额</template>
+            {{ ((orderInfoData.payableAmount - orderInfoData.refundAmount) / 100).toFixed(2) }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 退款金额</template>
+            {{ (orderInfoData.refundAmount / 100).toFixed(2) }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 配送费</template>
+            {{ (orderInfoData.deliveryAmount / 100).toFixed(2) }}
+          </el-descriptions-item>
 
-              <el-descriptions-item>
-                  <template slot="label">	订单状态</template> 
-                    <span v-if="orderInfoData.orderState==1">已下单</span>
-                    <span v-if="orderInfoData.orderState==2">已完成</span>
-                    <span v-if="orderInfoData.orderState==3&&orderInfoData.payState==3">已退单</span>
-                    <span v-if="orderInfoData.orderState==3&&orderInfoData.payState==4">已取消</span>
-                    <span v-if="orderInfoData.orderState==4">待下单</span>
-                    <span v-if="orderInfoData.orderState==5">部分退单</span> 
-                  <!-- <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/>  -->
-              </el-descriptions-item>
-              <el-descriptions-item>
-                  <template slot="label">	备注</template>
-                  {{ orderInfoData.remark }}
-              </el-descriptions-item> 
-          </el-descriptions>
-          <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;">菜品信息</div>
-          <el-table :data="orderInfoData.orderDetailList">
-              <el-table-column label="菜品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
-              <el-table-column label="单价(元)" align="center" prop="salePrice" :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                      <span>{{ (scope.row.salePrice/100).toFixed(2) }}</span>
-                  </template> 
-              </el-table-column>
-              <el-table-column label="数量" align="center" prop="quantity" :show-overflow-tooltip="true"/>
-              <el-table-column label="合计(元)" align="center" prop="totalAmount" :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                      <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
-                  </template> 
-              </el-table-column>
-              <el-table-column label="退款数量" align="center" prop="refundNum" :show-overflow-tooltip="true"/>
-              <el-table-column label="退款金额(元)" align="center" prop="refundAmount" :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                      <span>{{ (scope.row.refundAmount/100).toFixed(2) }}</span>
-                  </template> 
-              </el-table-column>
-          </el-table>
-          <!-- <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;">优惠明细</div>
-          <el-table :data="orderInfoData.discountList">
-              <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> -->
+          <el-descriptions-item>
+            <template slot="label"> 包装费</template>
+            {{ (orderInfoData.packingAmount / 100).toFixed(2) }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 支付方式</template>
+            <dict-tag :options="dict.type.sm_order_pay_type" :value="orderInfoData.payType"/>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 下单时间</template>
+            {{ orderInfoData.orderTime }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 支付时间</template>
+            {{ orderInfoData.payTime }}
+          </el-descriptions-item>
+
+          <el-descriptions-item>
+            <template slot="label"> 订单状态</template>
+            <span v-if="orderInfoData.orderState==1">已下单</span>
+            <span v-if="orderInfoData.orderState==2">已完成</span>
+            <span v-if="orderInfoData.orderState==3&&orderInfoData.payState==3">已退单</span>
+            <span v-if="orderInfoData.orderState==3&&orderInfoData.payState==4">已取消</span>
+            <span v-if="orderInfoData.orderState==4">待下单</span>
+            <span v-if="orderInfoData.orderState==5">部分退单</span>
+            <!-- <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/>  -->
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 备注</template>
+            {{ orderInfoData.remark }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;">菜品信息</div>
+        <el-table :data="orderInfoData.orderDetailList">
+          <el-table-column label="菜品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
+          <el-table-column label="单价(元)" align="center" prop="salePrice" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.salePrice / 100).toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center" prop="quantity" :show-overflow-tooltip="true"/>
+          <el-table-column label="合计(元)" align="center" prop="totalAmount" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.totalAmount / 100).toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="退款数量" align="center" prop="refundNum" :show-overflow-tooltip="true"/>
+          <el-table-column label="退款金额(元)" align="center" prop="refundAmount" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.refundAmount / 100).toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;">优惠明细</div>
+        <el-table :data="orderInfoData.discountList">
+            <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> -->
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="open=false">确 定</el-button>
@@ -376,96 +421,113 @@
 
     <!-- 部分退款对话框 -->
     <el-dialog title="部分退款" :visible.sync="openPart" width="80%" append-to-body>
-          <!-- <el-row>
-              <el-col :span="2">退款方式:</el-col>
-              <el-col :span="22">
-                  <el-radio-group v-model="refundType" @change="choseRefundTypeRadio">
-                      <el-radio label="1" style="font-size: 14px;margin-bottom: 10px;">按数量退款</el-radio>
-                      <el-radio label="2" style="font-size: 14px;margin-bottom: 10px;">按金额退款</el-radio>
-                  </el-radio-group>
-              </el-col>
-          </el-row> -->
+      <!-- <el-row>
+          <el-col :span="2">退款方式:</el-col>
+          <el-col :span="22">
+              <el-radio-group v-model="refundType" @change="choseRefundTypeRadio">
+                  <el-radio label="1" style="font-size: 14px;margin-bottom: 10px;">按数量退款</el-radio>
+                  <el-radio label="2" style="font-size: 14px;margin-bottom: 10px;">按金额退款</el-radio>
+              </el-radio-group>
+          </el-col>
+      </el-row> -->
 
-          <el-table :data="orderDetailList" ref="multiplePartTable" @selection-change="handleSelectionChange" :row-key="(row)=>{return row.detailId}" v-if="refundType==1">
-              <el-table-column type="selection" width="50" align="center" :selectable="selectable"/>
-              <el-table-column label="菜品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
-              <el-table-column label="菜品单价" align="center" prop="salePrice" :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                      <span>{{ (scope.row.salePrice/100).toFixed(2) }}</span>
-                  </template> 
-              </el-table-column>
-              <el-table-column label="菜品数量" align="center" prop="quantity" :show-overflow-tooltip="true"/>
-              <el-table-column label="菜品金额" align="center" prop="totalAmount" :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                      <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
-                  </template> 
-              </el-table-column>
-              <el-table-column label="可退款数量" align="center" prop="unRefundNum" :show-overflow-tooltip="true"/>
-              <el-table-column label="已退款数量" align="center" prop="refundNum" :show-overflow-tooltip="true"/>
-              <el-table-column label="已退款金额" align="center" prop="refundAmount" :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                      <span>{{ (scope.row.refundAmount/100).toFixed(2) }}</span>
-                  </template> 
-              </el-table-column>
+      <el-table :data="orderDetailList" ref="multiplePartTable" @selection-change="handleSelectionChange"
+                :row-key="(row)=>{return row.detailId}" v-if="refundType==1"
+      >
+        <el-table-column type="selection" width="50" align="center" :selectable="selectable"/>
+        <el-table-column label="菜品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
+        <el-table-column label="菜品单价" align="center" prop="salePrice" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ (scope.row.salePrice / 100).toFixed(2) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="菜品数量" align="center" prop="quantity" :show-overflow-tooltip="true"/>
+        <el-table-column label="菜品金额" align="center" prop="totalAmount" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ (scope.row.totalAmount / 100).toFixed(2) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="可退款数量" align="center" prop="unRefundNum" :show-overflow-tooltip="true"/>
+        <el-table-column label="已退款数量" align="center" prop="refundNum" :show-overflow-tooltip="true"/>
+        <el-table-column label="已退款金额" align="center" prop="refundAmount" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ (scope.row.refundAmount / 100).toFixed(2) }}</span>
+          </template>
+        </el-table-column>
 
-              <el-table-column label="退款数量" align="center" prop="goRefundNum" :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                      <el-input v-model="scope.row.goRefundNum" placeholder="退款数量" maxlength="20" clearable style="width: 100%" @change="inputNum(scope.row)"  @input="(v)=>(scope.row.goRefundNum=v.replace(/[^\d]/g,''))"/> 
-                  </template> 
-              </el-table-column>
-              <el-table-column label="退款金额" align="center" prop="refundMoney" :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                      <span>{{ (scope.row.refundMoney/100).toFixed(2) }}</span>
-                  </template> 
-              </el-table-column>
-          </el-table>  
-          <div v-if="refundType==2">
-              <el-form :model="rowData" ref="rowData" :rules="refundRules" size="small" label-width="120px">
-                  <el-form-item label="订单金额：">
-                      <span>{{ (rowData.payableAmount/100).toFixed(2) }}</span>
-                  </el-form-item>
-                  <el-form-item label="实付金额：">
-                      <span>{{ (rowData.realAmount/100).toFixed(2) }}</span>
-                  </el-form-item>
-                  <el-form-item label="可退金额：">
-                      <span>{{ (rowData.payableAmount/100).toFixed(2) }}</span>
-                  </el-form-item>
-                  <el-form-item label="已退金额：">
-                      <span>{{ (rowData.refundAmount/100).toFixed(2) }}</span>
-                  </el-form-item>
-                  <el-form-item label="本次退款金额：" prop="refundMoney">
-                      <el-input v-model="rowData.refundMoney" placeholder="请输入本次退款金额" maxlength="20" clearable @input="(v)=>(rowData.refundMoney=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))" style="width: 200px;"/>
-                  </el-form-item>
-              </el-form>
-          </div> 
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="confirmRefund">确 定</el-button>
-              <el-button @click="openPart=false">取 消</el-button>
-          </div>
+        <el-table-column label="退款数量" align="center" prop="goRefundNum" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.goRefundNum" placeholder="退款数量" maxlength="20" clearable
+                      style="width: 100%" @change="inputNum(scope.row)"
+                      @input="(v)=>(scope.row.goRefundNum=v.replace(/[^\d]/g,''))"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="退款金额" align="center" prop="refundMoney" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ (scope.row.refundMoney / 100).toFixed(2) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="refundType==2">
+        <el-form :model="rowData" ref="rowData" :rules="refundRules" size="small" label-width="120px">
+          <el-form-item label="订单金额：">
+            <span>{{ (rowData.payableAmount / 100).toFixed(2) }}</span>
+          </el-form-item>
+          <el-form-item label="实付金额：">
+            <span>{{ (rowData.realAmount / 100).toFixed(2) }}</span>
+          </el-form-item>
+          <el-form-item label="可退金额：">
+            <span>{{ (rowData.payableAmount / 100).toFixed(2) }}</span>
+          </el-form-item>
+          <el-form-item label="已退金额：">
+            <span>{{ (rowData.refundAmount / 100).toFixed(2) }}</span>
+          </el-form-item>
+          <el-form-item label="本次退款金额：" prop="refundMoney">
+            <el-input v-model="rowData.refundMoney" placeholder="请输入本次退款金额" maxlength="20" clearable
+                      @input="(v)=>(rowData.refundMoney=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"
+                      style="width: 200px;"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmRefund">确 定</el-button>
+        <el-button @click="openPart=false">取 消</el-button>
+      </div>
     </el-dialog>
     <!-- 评价弹窗 -->
     <el-dialog title="订单评价" :visible.sync="openEva" width="500px" append-to-body>
       <div style="width: 100%;height: auto;padding-left: 30px;margin-bottom: 20px;">
-        <div style="margin-bottom: 10px;"><span style="font-weight: 600;">用户姓名：</span>{{evaluateData.createBy}}</div>
-        <div style="margin-bottom: 10px;"><span style="font-weight: 600;">评价内容：</span>{{evaluateData.description}}</div>
-        <div style="margin-bottom: 10px;"><span style="font-weight: 600;" v-if="evaluateData.pictureList&&evaluateData.pictureList.length>0">评价图片：</span></div> 
-        <div style="margin-bottom: 10px;width: 96%;padding: 5px;display: flex;flex-wrap: wrap;" v-if="evaluateData.pictureList&&evaluateData.pictureList.length>0">
+        <div style="margin-bottom: 10px;"><span style="font-weight: 600;">用户姓名：</span>{{ evaluateData.createBy }}
+        </div>
+        <div style="margin-bottom: 10px;"><span style="font-weight: 600;">评价内容：</span>{{ evaluateData.description }}
+        </div>
+        <div style="margin-bottom: 10px;"><span style="font-weight: 600;"
+                                                v-if="evaluateData.pictureList&&evaluateData.pictureList.length>0"
+        >评价图片：</span></div>
+        <div style="margin-bottom: 10px;width: 96%;padding: 5px;display: flex;flex-wrap: wrap;"
+             v-if="evaluateData.pictureList&&evaluateData.pictureList.length>0"
+        >
           <div v-for="(item,index) in evaluateData.pictureList" :key="index">
             <img :src="item" style="width: 80px;height: 80px;" alt="">
           </div>
-        </div>  
-        <div style="margin-bottom: 10px;"><span style="font-weight: 600;">评价时间：</span>{{evaluateData.createTime}}</div>
+        </div>
+        <div style="margin-bottom: 10px;"><span style="font-weight: 600;">评价时间：</span>{{ evaluateData.createTime }}
+        </div>
         <div style="margin-bottom: 10px;"><span style="font-weight: 600;">菜品评分：</span></div>
       </div>
       <div style="width: 100%;height: 200px;overflow-y: auto;">
-        <div v-for="(item,index) in evaluateData.detailList" :key="index" style="display: flex;width: 100%;margin-bottom: 15px;align-items: center;">
-            <div style="width: 35%;word-break: break-all;font-size: 16px;text-align: center;">
-                {{ item.dishesName }}
-            </div>
-            <div style="width: 65%;">
-                <el-rate v-model="item.starLevel" size="large" disabled text-color="#ff9900"></el-rate>
-            </div>
-        </div> 
+        <div v-for="(item,index) in evaluateData.detailList" :key="index"
+             style="display: flex;width: 100%;margin-bottom: 15px;align-items: center;"
+        >
+          <div style="width: 35%;word-break: break-all;font-size: 16px;text-align: center;">
+            {{ item.dishesName }}
+          </div>
+          <div style="width: 65%;">
+            <el-rate v-model="item.starLevel" size="large" disabled text-color="#ff9900"></el-rate>
+          </div>
+        </div>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="openEva=false">确 定</el-button>
@@ -475,30 +537,58 @@
 
     <!-- 提醒对话框 -->
     <el-dialog :title="handleType+'提醒'" :visible.sync="openRemind" width="40%" append-to-body>
-      <div class="remind-question">请问是否对以下可{{handleType}}订单进行{{handleType}}操作？</div>
-      <div class="remind-title">可{{handleType}}订单 {{ableList.length}} 笔</div>
-      <div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
+      <div>
+        <el-select v-model="printerName" clearable collapse-tags style="width: 220px">
+          <el-option
+            v-for="item in printList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
+      <div class="remind-question">请问是否对以下可{{ handleType }}订单进行{{ handleType }}操作？</div>
+      <div class="remind-title">可{{ handleType }}订单 {{ ableList.length }} 笔</div>
+      <div v-for="(item,index) in ableList" :key="item.orderId">{{ (index + 1) }}.
+        订单编号:{{ item.orderId }}，用户姓名:{{ item.nickName }}，用户编号:{{
+          item.userId
+        }}，订单金额:{{ (item.payableAmount / 100).toFixed(2) }}
+      </div>
 
-      <div class="remind-title">不可{{handleType}}订单 {{unableList.length}}  笔</div>
-      <div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
+      <div class="remind-title">不可{{ handleType }}订单 {{ unableList.length }} 笔</div>
+      <div v-for="(item,index) in unableList" :key="item.orderId">{{ (index + 1) }}.
+        订单编号:{{ item.orderId }}，用户姓名:{{ item.nickName }}，用户编号:{{
+          item.userId
+        }}，订单金额:{{ (item.payableAmount / 100).toFixed(2) }}
+      </div>
 
       <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>
-          <el-button @click="openRemind=false">取 消</el-button>
+        <el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>
+        <el-button @click="openRemind=false">取 消</el-button>
       </div>
     </el-dialog>
 
   </div>
 </template>
 
-<script> 
+<script>
 import { deptTreeSelect } from '@/api/system/user'
-import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall";
-import { orderPageListApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi,getEvaluaOrderDetailApi } from "@/api/order/reserve";
-import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
+import { systemAreaTreeApi, getCanteenByAreaApi, getStallByCanteenApi } from '@/api/base/stall'
+import {
+  orderPageListApi,
+  refundOrderPartApi,
+  refundOrderApi,
+  writeOffOrderApi,
+  syncOrderPayStateApi,
+  getEvaluaOrderDetailApi
+} from '@/api/order/reserve'
+import { decryptWithSM4, encryptWithSM4 } from '@/utils/sm'
+import { WebSDK } from '@/utils/printer/WebSDK'
+import { setPort, getPrinterList, requestPrint, wsPrint, WebSocketPrint } from '@/utils/printer/Common'
+
 export default {
-  name: "",
-  dicts: ['sys_user_type','sm_order_type','sm_order_status','sm_order_pay_type'],
+  name: '',
+  dicts: ['sys_user_type', 'sm_order_type', 'sm_order_status', 'sm_order_pay_type'],
   data() {
     return {
       // 遮罩层
@@ -514,447 +604,557 @@ export default {
       // 总条数
       total: 0,
       //表格数据
-      tableListData: [], 
+      tableListData: [],
       // 是否显示弹出层
-      open: false, 
-      dateRange:[new Date(),new Date()],
+      open: false,
+      dateRange: [new Date(), new Date()],
       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]);
-              }
-          }]
+        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])
+          }
+        }]
       },
-      treeAreaOptions:[],//区域树
-      canteenOptions:[],//查询-食堂下拉选
-      stallOptions:[],//查询-档口下拉选
+      treeAreaOptions: [],//区域树
+      canteenOptions: [],//查询-食堂下拉选
+      stallOptions: [],//查询-档口下拉选
       //下拉选数据
-    //   orderStateOptions:[],
-    //   orderPayOptions:[],
-    //   deliveryTypeOptions:[],
-    //   orderTypeOptions:[],
-      deptOptions:[], //组织树 
+      //   orderStateOptions:[],
+      //   orderPayOptions:[],
+      //   deliveryTypeOptions:[],
+      //   orderTypeOptions:[],
+      deptOptions: [], //组织树
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         custSearchInfo: undefined,//关键字
-        orderId: undefined, //订单号  
+        orderId: undefined, //订单号
         goodsSearchInfo: undefined, //菜品名称
-        mealtimeTypeList:[],//餐次
-        areaId:null,//区域-单选
-        canteenId:null,//食堂-单选
-        stallId:null,//档口-单选
-        orderStateList:[],//订单状态
-        payStateList:[], //支付方式 
-        deptIdList:[],  //所属组织
+        mealtimeTypeList: [],//餐次
+        areaId: null,//区域-单选
+        canteenId: null,//食堂-单选
+        stallId: null,//档口-单选
+        orderStateList: [],//订单状态
+        payStateList: [], //支付方式
+        deptIdList: []  //所属组织
       },
       //订单详情
       orderInfoData: {},
       //部分退款
-      openPart:false,
-      orderDetailList:[],
-      refundType:'1',
-      refundList:[],
-      rowData:{},
-      refundRules:{
-          refundMoney: [
-              {
-                  required: true,
-                  message: "本次退款金额不能为空",
-                  trigger: "blur",
-              }
-          ]
+      openPart: false,
+      orderDetailList: [],
+      refundType: '1',
+      refundList: [],
+      rowData: {},
+      refundRules: {
+        refundMoney: [
+          {
+            required: true,
+            message: '本次退款金额不能为空',
+            trigger: 'blur'
+          }
+        ]
       },
       //批量操作
-      batchIds:[],//批量id
-      batchList:[],//批量数据数组
+      batchIds: [],//批量id
+      batchList: [],//批量数据数组
       //批量核销批量退单提醒对话框
-      handleType:"退单",
-      ableList:[],
-      unableList:[], 
-      openRemind:false,
-      openEva:false,
-      evaluateData:{} 
-    };
+      handleType: '退单',
+      ableList: [],
+      unableList: [],
+      openRemind: false,
+      openEva: false,
+      evaluateData: {},
+      PosPrinter: null,
+      printList: [],
+      printerName: ''
+    }
   },
-  created() { 
-      this.getAreaTreeData();  
-      this.getDeptTree(); 
-      this.getList()
+  created() {
+    // this.printerName = ''
+    // this.printList = []
+    this.PosPrinter = new WebSDK.EscPosCommand()
+    this.refreshPrinterList()
+    this.getAreaTreeData()
+    this.getDeptTree()
+    this.getList()
+  },
+  mounted() {
+
   },
   methods: {
-      //区域树
-      getAreaTreeData() {
-          systemAreaTreeApi({}).then((response) => {
-          this.treeAreaOptions = response.data; 
-          });
-      },
-      handleAreaChange(e){ 
-          let param= {
-            areaId:this.queryParams.areaId,"canteenType": 1
+    refreshPrinterList() {
+      setPort(18080)
+      const category = { 'category': 1 }
+      getPrinterList(category, this.updatePrinterList)
+    },
+    updatePrinterList(printers) {
+      // this.printList = printers
+      // console.log(this.printList)
+      // if (!Array.isArray(printers)) {
+      //   console.error('Expected an array of printers, but got:', typeof printers)
+      //   return
+      // }
+      // console.log('Available printers:', this.printList)
+      this.printList = printers.map(item => ({
+        name: item.logicalName,
+        value: item.logicalName
+      }))
+      console.log('Available printers:', this.printList)
+      if (this.printList.length > 0) {
+        this.printerName = this.printList[0].name
+      }
+
+    },
+//区域树
+    getAreaTreeData() {
+      systemAreaTreeApi({}).then((response) => {
+        this.treeAreaOptions = response.data
+      })
+    },
+    handleAreaChange(e) {
+      let param = {
+        areaId: this.queryParams.areaId, 'canteenType': 1
+      }
+      getCanteenByAreaApi(param).then((response) => {
+        this.canteenOptions = response.rows || []
+        this.queryParams.canteenId = null
+        this.stallOptions = []
+        this.queryParams.stallId = null
+      })
+    },
+    handleCanteenChange(e) {
+      let param = {
+        canteenId: this.queryParams.canteenId
+      }
+      getStallByCanteenApi(param).then((response) => {
+        this.stallOptions = response.rows || []
+        this.queryParams.stallId = null
+      })
+    },
+
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = this.filterTree(response.data)
+      })
+    },
+    filterTree(nodes) {
+      return nodes
+        .map((node) => {
+          if (node.children) {
+            node.children = this.filterTree(node.children)
           }
-          getCanteenByAreaApi(param).then((response) => {
-            this.canteenOptions=response.rows||[]
-            this.queryParams.canteenId=null
-            this.stallOptions=[]
-            this.queryParams.stallId=null
-          });
-      },
-      handleCanteenChange(e){ 
-          let param= {
-            canteenId:this.queryParams.canteenId
-          }
-          getStallByCanteenApi(param).then((response) => {
-            this.stallOptions=response.rows||[]
-            this.queryParams.stallId=null
-          });
-      },
-      
-      /** 查询部门下拉树结构 */
-      getDeptTree() {
-        deptTreeSelect().then((response) => {
-            this.deptOptions = this.filterTree(response.data)
+          return node
         })
-      },
-      filterTree(nodes) {
-        return nodes
-            .map((node) => {
-                if (node.children) {
-                    node.children = this.filterTree(node.children)
-                }
-                return node
-            })
-            .filter((node) => node.status !== '1')
-      },
-       
-      /** 搜索按钮操作 */
-      handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [new Date(),new Date()]
-        this.queryParams = {
-            pageNum: 1,
-            pageSize: 10,
-            custSearchInfo: undefined,//关键字
-            orderId: undefined, //订单号  
-            goodsSearchInfo: undefined, //菜品名称
-            mealtimeTypeList:[],//餐次
-            areaId:null,//区域-单选
-            canteenId:null,//食堂-单选
-            stallId:null,//档口-单选
-            orderStateList:[],//订单状态
-            payStateList:[], //支付方式 
-            deptIdList:[],  //所属组织
-        }
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      /** 查询列表 */
-      getList() {
-          this.loading = true; 
-          let param = { 
-              ...this.queryParams,
-              "orderTypeList":[2],
-          }
-          if(this.dateRange&&this.dateRange.length>0){
-            param.startDate=this.formatDate(this.dateRange[0])
-            param.endDate=this.formatDate(this.dateRange[1])
-          }else{
-            param.startDate=undefined;
-            param.endDate=undefined;
-          }
-          if(this.queryParams.canteenId){
-            param.canteenIdList = [this.queryParams.canteenId]
-          }
-          if(this.queryParams.stallId){
-            param.stallIdList = [this.queryParams.stallId]
-          }
-          orderPageListApi(param).then(response => {
-              this.tableListData = response.rows;
-              this.tableListData.forEach(item=>{
-                  if(item.phoneNumber&&item.phoneNumber!=""){
-                    this.$set(item,"phoneNumber",decryptWithSM4(item.phoneNumber))
-                  }
-              }) 
-              this.total = Number(response.total);
-              this.loading = false;
-          });
-      },
-      /** 修改按钮操作 */
-      handleView(row) {
-          this.orderInfoData = Object.assign({}, row) 
-          this.open = true; 
-      },
-      /** 部分退款按钮操作 */
-      handleRefundPart(row) {
-          this.orderDetailList = row.orderDetailList;
-          this.rowData = row;
-          this.$set(this.rowData,"refundMoney","")  
-          console.log(this.rowData)
-          this.orderDetailList.forEach((item,index)=>{
-              this.$set(this.orderDetailList[index],"unRefundNum",item.quantity-item.refundNum)
-              this.$set(this.orderDetailList[index],"goRefundNum",item.unRefundNum)
-              this.$set(this.orderDetailList[index],"refundMoney",Number(item.goRefundNum)*(item.salePrice).toFixed(2))
-          })
-          this.refundList=[]  
-          this.openPart = true; 
-          this.$refs.multiplePartTable.clearSelection()
-      },
-      inputNum(row){
-          if(Number(row.goRefundNum)>row.unRefundNum){
-              this.$modal.msgError("退款数量不能大于可退款数量!");
-              row.goRefundNum=row.unRefundNum
-          }
-          row.refundMoney = Number(row.goRefundNum)*(row.salePrice).toFixed(2)
-          this.refundList.forEach((item) => {
-            if(item.detailId==row.detailId){
-                this.$set(item,"quantity",row.goRefundNum)
-            }
-          }) 
-      },
-      //数量退款/金额退款
-      choseRefundTypeRadio(e){},
-      //部分退款多选
-      handleSelectionChange(selection){
-          console.log(selection)
-          this.refundList = selection.map((item) => {
-              let obj = {'detailId':item.detailId,'quantity':item.goRefundNum}
-              return obj
-          }) 
-      },
-      selectable(row){
-          return row.unRefundNum>0
-      },
-      //部分退款提交
-      confirmRefund(){
-        if(this.refundType==1){
-            if(this.refundList.length==0){
-                this.$modal.msgError("请先勾选退款菜品!");
-            }else{
-                console.log(this.refundList)
-                let param = {
-                    orderPartRefundDetailList:this.refundList,
-                    orderId:this.rowData.orderId
-                }
-                refundOrderPartApi(param).then(response => {
-                    if(response.code==200){
-                        this.$modal.msgSuccess("退款成功");
-                    }
-                    this.getList()
-                    this.openPart = false; 
-                }).catch(err => {
-                    this.refundList = []
-                    this.$refs.multiplePartTable.clearSelection() 
-                })
-            }
-        }
-        if(this.refundType==2){
-            this.$refs["rowData"].validate(valid => {
-                if (valid) {
-                    let param = {
-                        refundAmount:Number(this.rowData.refundMoney*100),
-                        orderId:this.rowData.orderId
-                    }
-                    refundOrderPartApi(param).then(response => {
-                        if(response.code==200){
-                            this.$modal.msgSuccess("退款成功");
-                        }
-                        this.getList()
-                        this.openPart = false; 
-                    }); 
-                }
-            });
-            
-        }
-         
+        .filter((node) => node.status !== '1')
+    },
 
-
-      },
-      /** 退单按钮操作 */
-      handleRefund(row) {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [new Date(), new Date()]
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        custSearchInfo: undefined,//关键字
+        orderId: undefined, //订单号
+        goodsSearchInfo: undefined, //菜品名称
+        mealtimeTypeList: [],//餐次
+        areaId: null,//区域-单选
+        canteenId: null,//食堂-单选
+        stallId: null,//档口-单选
+        orderStateList: [],//订单状态
+        payStateList: [], //支付方式
+        deptIdList: []  //所属组织
+      }
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true
+      let param = {
+        ...this.queryParams,
+        'orderTypeList': [2]
+      }
+      if (this.dateRange && this.dateRange.length > 0) {
+        param.startDate = this.formatDate(this.dateRange[0])
+        param.endDate = this.formatDate(this.dateRange[1])
+      } else {
+        param.startDate = undefined
+        param.endDate = undefined
+      }
+      if (this.queryParams.canteenId) {
+        param.canteenIdList = [this.queryParams.canteenId]
+      }
+      if (this.queryParams.stallId) {
+        param.stallIdList = [this.queryParams.stallId]
+      }
+      orderPageListApi(param).then(response => {
+        this.tableListData = response.rows
+        this.tableListData.forEach(item => {
+          if (item.phoneNumber && item.phoneNumber != '') {
+            this.$set(item, 'phoneNumber', decryptWithSM4(item.phoneNumber))
+          }
+        })
+        this.total = Number(response.total)
+        this.loading = false
+      })
+    },
+    /** 修改按钮操作 */
+    handleView(row) {
+      this.orderInfoData = Object.assign({}, row)
+      this.open = true
+    },
+    /** 部分退款按钮操作 */
+    handleRefundPart(row) {
+      this.orderDetailList = row.orderDetailList
+      this.rowData = row
+      this.$set(this.rowData, 'refundMoney', '')
+      console.log(this.rowData)
+      this.orderDetailList.forEach((item, index) => {
+        this.$set(this.orderDetailList[index], 'unRefundNum', item.quantity - item.refundNum)
+        this.$set(this.orderDetailList[index], 'goRefundNum', item.unRefundNum)
+        this.$set(this.orderDetailList[index], 'refundMoney', Number(item.goRefundNum) * (item.salePrice).toFixed(2))
+      })
+      this.refundList = []
+      this.openPart = true
+      this.$refs.multiplePartTable.clearSelection()
+    },
+    inputNum(row) {
+      if (Number(row.goRefundNum) > row.unRefundNum) {
+        this.$modal.msgError('退款数量不能大于可退款数量!')
+        row.goRefundNum = row.unRefundNum
+      }
+      row.refundMoney = Number(row.goRefundNum) * (row.salePrice).toFixed(2)
+      this.refundList.forEach((item) => {
+        if (item.detailId == row.detailId) {
+          this.$set(item, 'quantity', row.goRefundNum)
+        }
+      })
+    },
+    //数量退款/金额退款
+    choseRefundTypeRadio(e) {
+    },
+    //部分退款多选
+    handleSelectionChange(selection) {
+      console.log(selection)
+      this.refundList = selection.map((item) => {
+        let obj = { 'detailId': item.detailId, 'quantity': item.goRefundNum }
+        return obj
+      })
+    },
+    selectable(row) {
+      return row.unRefundNum > 0
+    },
+    //部分退款提交
+    confirmRefund() {
+      if (this.refundType == 1) {
+        if (this.refundList.length == 0) {
+          this.$modal.msgError('请先勾选退款菜品!')
+        } else {
+          console.log(this.refundList)
           let param = {
-            //   backType: 1,
-            //   macOrderId:row.macOrderId,
-              orderId:row.orderId
+            orderPartRefundDetailList: this.refundList,
+            orderId: this.rowData.orderId
           }
-          this.$modal.confirm('是否确认退单？').then(function() {
-              return refundOrderApi(param);
-          }).then(() => {
-              this.getList();
-              this.$modal.msgSuccess("退单成功");
-          }).catch(() => {});
-      },
-      /** 核销按钮操作 */
-      writeOffOrder(row) {
-          let param = { 
-            orderIdList:[row.orderId]
-          }
-          this.$modal.confirm('是否确认核销？').then(function() {
-              return writeOffOrderApi(param);
-          }).then(() => {
-              this.getList();
-              this.$modal.msgSuccess("核销成功");
-          }).catch(() => {});
-      },
-      /** 评价按钮操作 */
-      checkEvaluate(row) {
-        this.evaluateData = {}
-        getEvaluaOrderDetailApi(row.orderId).then(response => {
-            console.log(response)
-            this.evaluateData = response.data 
-            this.openEva = true
-        }).catch(err => {
-            
-        })
-      }, 
-      // ----订单批量操作------
-      handleOrderSelectionChange(selection){
-        this.batchIds = selection.map((item) => item.orderId) 
-        this.batchList = selection;
-        this.single = selection.length !== 1
-        this.multiple = !selection.length 
-      },
-      //批量退单
-      handleBatchRefund(){
-        this.handleType="退单"
-        this.ableList = []
-        this.unableList = [] 
-        this.batchList.forEach(item=>{
-          if(item.orderState==1||item.orderState==2){
-            this.ableList.push(item)
-          }else{
-            this.unableList.push(item)
-          }
-        })
-        this.openRemind = true
-      },
-      //批量核销
-      handleBatchWriteOff(){
-        this.handleType="核销"
-        this.ableList = []
-        this.unableList = [] 
-        this.batchList.forEach(item=>{
-          if(item.orderState==1||item.orderState==5){
-            this.ableList.push(item)
-          }else{
-            this.unableList.push(item)
-          }
-        })
-        this.openRemind = true
-      },
-      confirmRemind(){
-        console.log(this.ableList.length)
-        if(this.ableList.length>0){
-          if(this.handleType=="退单"){
-            this.ableList.forEach(item=>{
-              let param = {
-                  orderId:item.orderId
-              } 
-              refundOrderApi(param).then(response => {
-                //   if(response.code!=200){
-                //     this.$modal.msgError(response.msg);
-                //   }
-              });
-            })
-            this.$modal.msgSuccess("批量退单完成");  
-          }
-          if(this.handleType=="核销"){
-            this.ableList.forEach(item=>{
-              let param = { 
-                  orderIdList:[item.orderId ]
-              }
-              writeOffOrderApi(param).then(response => {
-                //   if(response.code!=200){
-                //     this.$modal.msgError(response.msg);
-                //   }
-              });
-            })
-            this.$modal.msgSuccess("批量核销完成");  
-          }
-          this.$refs.multipleTable.clearSelection() 
-          setTimeout(()=>{
-            this.openRemind = false
-            this.getList() 
-          },500)
-        }
-      },
-      //同步订单状态
-      handleSyncPayState(){
-        if(this.batchIds.length>0){
-          this.batchIds.forEach(item=>{
-            syncOrderPayStateApi({orderId:item}).then(response => {
-                if(response.code!=200){
-                  this.$modal.msgError(response.msg);
-                }
-            });
+          refundOrderPartApi(param).then(response => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess('退款成功')
+            }
+            this.getList()
+            this.openPart = false
+          }).catch(err => {
+            this.refundList = []
+            this.$refs.multiplePartTable.clearSelection()
           })
-          this.$modal.msgSuccess("同步已完成");
-          this.getList()
-          this.$refs.multipleTable.clearSelection()
-        }else{
-          this.$modal.msgError("请先勾选订单数据！");
         }
-      },
+      }
+      if (this.refundType == 2) {
+        this.$refs['rowData'].validate(valid => {
+          if (valid) {
+            let param = {
+              refundAmount: Number(this.rowData.refundMoney * 100),
+              orderId: this.rowData.orderId
+            }
+            refundOrderPartApi(param).then(response => {
+              if (response.code == 200) {
+                this.$modal.msgSuccess('退款成功')
+              }
+              this.getList()
+              this.openPart = false
+            })
+          }
+        })
 
+      }
 
+    },
+    /** 退单按钮操作 */
+    handleRefund(row) {
+      let param = {
+        //   backType: 1,
+        //   macOrderId:row.macOrderId,
+        orderId: row.orderId
+      }
+      this.$modal.confirm('是否确认退单？').then(function() {
+        return refundOrderApi(param)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('退单成功')
+      }).catch(() => {
+      })
+    },
+    /** 核销按钮操作 */
+    writeOffOrder(row) {
+      let param = {
+        orderIdList: [row.orderId]
+      }
+      this.$modal.confirm('是否确认核销？').then(function() {
+        return writeOffOrderApi(param)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('核销成功')
+      }).catch(() => {
+      })
+    },
+    /** 评价按钮操作 */
+    checkEvaluate(row) {
+      this.evaluateData = {}
+      getEvaluaOrderDetailApi(row.orderId).then(response => {
+        console.log(response)
+        this.evaluateData = response.data
+        this.openEva = true
+      }).catch(err => {
 
+      })
+    },
+    // ----订单批量操作------
+    handleOrderSelectionChange(selection) {
+      this.batchIds = selection.map((item) => item.orderId)
+      this.batchList = selection
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    //批量退单
+    handleBatchRefund() {
+      this.handleType = '退单'
+      this.ableList = []
+      this.unableList = []
+      this.batchList.forEach(item => {
+        if (item.orderState == 1 || item.orderState == 2) {
+          this.ableList.push(item)
+        } else {
+          this.unableList.push(item)
+        }
+      })
+      this.openRemind = true
+    },
+    changePrint(e) {
+      this.printerName = e
+      if (wsPrint) {
+        wsPrint.disconnect()
+        console.log('WebSocket connection closed.')
+      }
+    },
+    handleBatchPrint() {
+      console.log(this.printList)
+      this.handleType = '打印小票'
+      this.ableList = []
+      this.unableList = []
+      this.batchList.forEach(item => {
+        if (item.orderState == 1 || item.orderState == 5) {
+          this.ableList.push(item)
+        } else {
+          this.unableList.push(item)
+        }
+      })
+      this.openRemind = true
+    },
+    handleBatchPrintRefresh() {
+      setPort(18080)
+      const category = { 'category': 1 }
+      getPrinterList(category, this.updatePrinterList)
+    },
+    //批量核销
+    handleBatchWriteOff() {
+      this.handleType = '核销'
+      this.ableList = []
+      this.unableList = []
+      this.batchList.forEach(item => {
+        if (item.orderState == 1 || item.orderState == 5) {
+          this.ableList.push(item)
+        } else {
+          this.unableList.push(item)
+        }
+      })
+      this.openRemind = true
+    },
+    confirmRemind() {
+      console.log(this.ableList.length)
+      if (this.ableList.length > 0) {
+        if (this.handleType == '退单') {
+          this.ableList.forEach(item => {
+            let param = {
+              orderId: item.orderId
+            }
+            refundOrderApi(param).then(response => {
+              //   if(response.code!=200){
+              //     this.$modal.msgError(response.msg);
+              //   }
+            })
+          })
+          this.$modal.msgSuccess('批量退单完成')
+        }
+        if (this.handleType == '核销') {
+          this.ableList.forEach(item => {
+            let param = {
+              orderIdList: [item.orderId]
+            }
+            writeOffOrderApi(param).then(response => {
+              //   if(response.code!=200){
+              //     this.$modal.msgError(response.msg);
+              //   }
+            })
+          })
+          this.$modal.msgSuccess('批量核销完成')
+        }
+        if (this.handleType == '打印小票') {
+          if (this.printList.length === 0) {
+            this.$modal.msgWarning('请先开启小票打印机服务！')
+            return
+          }
+          if (this.printerName === '') {
+            this.$modal.msgWarning('请先选择小票打印机！')
+            return
+          }
+          const _titles = ['菜品名称', '数量', '单价', '总价']
+          const _columnWidths = [20, 10, 10, 8]
+          console.log(this.ableList)
+          this.ableList.forEach(item => {
+            let _rows = []
+            item.orderDetailList.forEach((it) => {
+              let row = []
+              row.push(it.goodsName)
+              row.push(it.quantity)
+              row.push((it.salePrice / 100).toFixed(2))
+              row.push((it.totalAmount / 100).toFixed(2))
+              _rows.push(row)
+            })
+            this.PosPrinter.cleanBuffer()
+              .setCodePage(256)
+              .setEncoding('gbk')
+              .printText({ data: item.nickName + '(' + item.phoneNumber + ')\n' + item.orderId, textSize: 2 })
+              .printText({ data: item.orderTime + '\n', textSize: 1 })
+              .printAndFeed(1)
+              .printTable({ titles: _titles, columnWidths: _columnWidths, rows: _rows })
+              .printAndFeed(1)
+              .printText({
+                data: '\n\n订单金额：' + item.payableAmount / 100 + '\n实付金额：' + (item.payableAmount - item.refundAmount) / 100 + '\n\nThank you for your order!\nWelcome again next time!',
+                textSize: 1,
+                alignment: 0
+              })  // 合计: 277 -> Total: 277; 应收: 277 -> Amount Due: 277; 水流单号: 1234567891011 -> Flow Number: 1234567891011; 谢谢光临！欢迎下次光临！ -> Thank you for your visit! Welcome again next time!
+              .printAndFeed(2)
+              .feedAndCut(50)
+            this.prepareAndPrint(this.printerName)
+          })
 
+          this.$modal.msgSuccess('打印小票完成')
+        }
+        this.$refs.multipleTable.clearSelection()
+        setTimeout(() => {
+          this.openRemind = false
+          this.getList()
+        }, 500)
+      }
+    },
+    prepareAndPrint(printerName) {
+      setPort(18080)
+      const data = this.PosPrinter.cleanBuffer()
+        .checkPrinterStatus()
+        .getData()
+      requestPrint(printerName, data, this.updatePrinterCallback)
+    },
+    updatePrinterCallback(res) {
+      this.$modal.msgSuccess('打印小票完成')
+    },
+    //同步订单状态
+    handleSyncPayState() {
+      if (this.batchIds.length > 0) {
+        this.batchIds.forEach(item => {
+          syncOrderPayStateApi({ orderId: item }).then(response => {
+            if (response.code != 200) {
+              this.$modal.msgError(response.msg)
+            }
+          })
+        })
+        this.$modal.msgSuccess('同步已完成')
+        this.getList()
+        this.$refs.multipleTable.clearSelection()
+      } else {
+        this.$modal.msgError('请先勾选订单数据！')
+      }
+    },
 
-      //日期
-      formatDate(date) {
-          // 格式化为 YYYY-MM-DD
-          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}`;
-      } 
+    //日期
+    formatDate(date) {
+      // 格式化为 YYYY-MM-DD
+      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}`
+    }
   }
-};
+}
 </script>
 <style scoped>
-  .remind-question{
-    width: 100%;
-    height: 50px;
-    font-size: 22px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .remind-title{
-    width: 100%;
-    height: 40px;
-    font-size: 16px;
-    font-weight: bold;
-    color: #000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  ::v-deep .el-rate__icon{
-    font-size: 30px;
-  }
+.remind-question {
+  width: 100%;
+  height: 50px;
+  font-size: 22px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.remind-title {
+  width: 100%;
+  height: 40px;
+  font-size: 16px;
+  font-weight: bold;
+  color: #000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+::v-deep .el-rate__icon {
+  font-size: 30px;
+}
 </style>

From cdfa2ec3da00abf7d0450e13509eab1bdbdcdb7b Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Thu, 11 Sep 2025 15:13:02 +0800
Subject: [PATCH 06/12] JSK

---
 src/api/healthCenter/index.js                 |  11 ++
 .../healthCenter/examinationReport/index.vue  | 120 +++++++++---------
 2 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/src/api/healthCenter/index.js b/src/api/healthCenter/index.js
index e4946d57..9be5acab 100644
--- a/src/api/healthCenter/index.js
+++ b/src/api/healthCenter/index.js
@@ -157,6 +157,17 @@ export function delHealthInfoApi(data) {
         data: data
     })
 }
+
+export function getHealthReportPageApi(data) {
+  return request({
+    url: '/smart-canteen/health_person_medical_report/list',
+    method: 'get',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    params:data
+  })
+}
 // 模板-列表
 export function getModelListApi() {
   return request({
diff --git a/src/views/canteen/healthCenter/examinationReport/index.vue b/src/views/canteen/healthCenter/examinationReport/index.vue
index 71550f5b..2bc4b2e1 100644
--- a/src/views/canteen/healthCenter/examinationReport/index.vue
+++ b/src/views/canteen/healthCenter/examinationReport/index.vue
@@ -42,8 +42,6 @@
             </el-table-column>
             <el-table-column label="住院日期" align="center" prop="inpatientDate" :show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column label="慢性病" align="center" prop="chronicNames" :show-overflow-tooltip="true">
-            </el-table-column>
             <el-table-column label="劳动强度" align="center" prop="labourIntensity" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                   <span v-if="scope.row.labourIntensity==1">轻劳动</span>
@@ -70,7 +68,7 @@
         @pagination="getList"
         />
         <!-- 体检报告对话框 -->
-        <el-dialog :title="titleAddReport" :visible.sync="openAddReport" custom-class="dialog-right"  append-to-body> 
+        <el-dialog :title="titleAddReport" :visible.sync="openAddReport" custom-class="dialog-right"  append-to-body>
           <div style="margin: 10px;">
               <el-button
                 type="primary"
@@ -99,7 +97,7 @@
                       >删除</el-button>
                   </template>
               </el-table-column>
-          </el-table> 
+          </el-table>
         </el-dialog>
         <!-- 新增-体检报告对话框 -->
         <el-dialog :title="titleAddReportModel" :visible.sync="openAddReportModel" append-to-body>
@@ -302,7 +300,7 @@
 
 <script>
   import { deptTreeSelect } from '@/api/system/user'
-  import { dictHealthChronicApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi
+  import { dictHealthChronicApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi,getHealthReportPageApi
     ,getModelListApi,getHealthInfoDetailApi,getModelByIdApi,addReportApi,getReportApi,delReportListApi,getReportByIdApi  } from "@/api/healthCenter/index";
   import { imgUpLoadTwo } from '@/api/system/upload'
   import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
@@ -351,6 +349,7 @@ export default {
             dateRange:[new Date(),new Date()],
             chronicOptions:[],
             personData:{
+              'nickName':''
             },
             reportDatas:[
               {"medicalProjectName":"身体","medicalProjectDetailNames":[
@@ -470,7 +469,7 @@ export default {
             // }else{
             //     this.queryParams.chronicIds = ""
             // }
-            getHealthInfoPageApi(param).then(response => {
+            getHealthReportPageApi(param).then(response => {
                 this.tableListData = response.rows;
                 this.tableListData.forEach(item=>{
                   if(item.mobile&&item.mobile!=""){
@@ -542,6 +541,7 @@ export default {
             this.title = "新增";
         },
         handleReport(row) {
+          console.log("体检报告",)
             this.form = Object.assign({}, row);
             this.selectUser=this.form.userId;
             this.openAddReport = true;
@@ -552,60 +552,64 @@ export default {
                 this.loading = false;
             });
             getHealthInfoDetailApi(this.form).then(response => {
+              if(response.data){
               this.personData=response.data;
-              console.log("this.personData",this.personData)
-              if(this.personData.bloodType==1){
-                this.personData.bloodType="A型";
-              }else if(this.personData.bloodType==2){
-                this.personData.bloodType="B型";
-              }else if(this.personData.bloodType==3){
-                this.personData.bloodType="AB型";
-              }else if(this.personData.bloodType==4){
-                this.personData.bloodType="O型";
-              }else if(this.personData.bloodType==5){
-                this.personData.bloodType="Rh阳型";
-              }else if(this.personData.bloodType==6){
-                this.personData.bloodType="Rh阴型";
-              }
-              if(this.personData.doctorAdvice==1){
-                this.personData.doctorAdvice="禁食";
-              }else if(this.personData.doctorAdvice==2){
-                this.personData.doctorAdvice="流食";
-              }else if(this.personData.doctorAdvice==3){
-                this.personData.doctorAdvice="半流食";
-              }else if(this.personData.doctorAdvice==4){
-                this.personData.doctorAdvice="治疗饮食";
-              }
-              if(this.personData.weightControl==1){
-                this.personData.weightControl="减重";
-              }else if(this.personData.weightControl==2){
-                this.personData.weightControl="增重";
-              }
-              if(this.personData.ifHospitalized==1){
-                this.personData.ifHospitalized="是";
-              }else if(this.personData.ifHospitalized==2){
-                this.personData.ifHospitalized="否";
-              }
-              if(this.personData.pregnantStatus==0){
-                this.personData.pregnantStatus="保密";
-              }else if(this.personData.pregnantStatus==1){
-                this.personData.pregnantStatus="未怀孕";
-              }else if(this.personData.pregnantStatus==2){
-                this.personData.pregnantStatus="孕妇(早期)";
-              }else if(this.personData.pregnantStatus==3){
-                this.personData.pregnantStatus="孕妇(中期)";
-              }else if(this.personData.pregnantStatus==4){
-                this.personData.pregnantStatus="孕妇(晚期)";
-              }else if(this.personData.pregnantStatus==5){
-                this.personData.pregnantStatus="乳母";
-              }
-              if(this.personData.labourIntensity==1){
-                this.personData.labourIntensity="轻劳动";
-              }else if(this.personData.labourIntensity==2){
-                this.personData.labourIntensity="中等强度劳动";
-              }else if(this.personData.labourIntensity==3){
-                this.personData.labourIntensity="重强度劳动";
+
+                console.log("this.personData",this.personData)
+                if(this.personData.bloodType==1){
+                  this.personData.bloodType="A型";
+                }else if(this.personData.bloodType==2){
+                  this.personData.bloodType="B型";
+                }else if(this.personData.bloodType==3){
+                  this.personData.bloodType="AB型";
+                }else if(this.personData.bloodType==4){
+                  this.personData.bloodType="O型";
+                }else if(this.personData.bloodType==5){
+                  this.personData.bloodType="Rh阳型";
+                }else if(this.personData.bloodType==6){
+                  this.personData.bloodType="Rh阴型";
+                }
+                if(this.personData.doctorAdvice==1){
+                  this.personData.doctorAdvice="禁食";
+                }else if(this.personData.doctorAdvice==2){
+                  this.personData.doctorAdvice="流食";
+                }else if(this.personData.doctorAdvice==3){
+                  this.personData.doctorAdvice="半流食";
+                }else if(this.personData.doctorAdvice==4){
+                  this.personData.doctorAdvice="治疗饮食";
+                }
+                if(this.personData.weightControl==1){
+                  this.personData.weightControl="减重";
+                }else if(this.personData.weightControl==2){
+                  this.personData.weightControl="增重";
+                }
+                if(this.personData.ifHospitalized==1){
+                  this.personData.ifHospitalized="是";
+                }else if(this.personData.ifHospitalized==2){
+                  this.personData.ifHospitalized="否";
+                }
+                if(this.personData.pregnantStatus==0){
+                  this.personData.pregnantStatus="保密";
+                }else if(this.personData.pregnantStatus==1){
+                  this.personData.pregnantStatus="未怀孕";
+                }else if(this.personData.pregnantStatus==2){
+                  this.personData.pregnantStatus="孕妇(早期)";
+                }else if(this.personData.pregnantStatus==3){
+                  this.personData.pregnantStatus="孕妇(中期)";
+                }else if(this.personData.pregnantStatus==4){
+                  this.personData.pregnantStatus="孕妇(晚期)";
+                }else if(this.personData.pregnantStatus==5){
+                  this.personData.pregnantStatus="乳母";
+                }
+                if(this.personData.labourIntensity==1){
+                  this.personData.labourIntensity="轻劳动";
+                }else if(this.personData.labourIntensity==2){
+                  this.personData.labourIntensity="中等强度劳动";
+                }else if(this.personData.labourIntensity==3){
+                  this.personData.labourIntensity="重强度劳动";
+                }
               }
+
             });
         },
         getReportList(){

From 85d1909fd79cf4525a3c9fa6609fdcc3af7ade53 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 11 Sep 2025 15:54:17 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E5=B0=8F=E7=A5=A8=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/printer/Common.js                   |   3 +-
 .../canteen/order/reserveManagement/index.vue | 105 ++++++++++--------
 2 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/src/utils/printer/Common.js b/src/utils/printer/Common.js
index 6e1013af..73b0f4a6 100644
--- a/src/utils/printer/Common.js
+++ b/src/utils/printer/Common.js
@@ -1,7 +1,7 @@
 var port = 18080;
 var connectionMode = "ws:";
 var wsPrint = null;
-let wsGetPrinterList = null;
+var wsGetPrinterList = null;
 var CHUNK_SIZE = 1024 * 64;
 
 const WebSocketPrint = function (serverURL, strPrinterName, request, callback) {
@@ -187,6 +187,7 @@ export {
   requestPrint,
   getPrinterList,
   wsPrint,
+  wsGetPrinterList,
   WebSocketPrint,
   WebSocketGetPrinterList
 }
diff --git a/src/views/canteen/order/reserveManagement/index.vue b/src/views/canteen/order/reserveManagement/index.vue
index 0aa0f9e6..9bf197f7 100644
--- a/src/views/canteen/order/reserveManagement/index.vue
+++ b/src/views/canteen/order/reserveManagement/index.vue
@@ -117,14 +117,16 @@
         </el-cascader>
       </el-form-item>
 <!--      <el-form-item label="小票打印机" prop="deptIdList">-->
-<!--        <el-select v-model="printerName" clearable collapse-tags style="width: 220px">-->
-<!--          <el-option-->
-<!--            v-for="item in printList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
+<!--        <el-input v-model="printerName" placeholder="请输入订单号" maxlength="20" clearable-->
+<!--                  style="width: 220px"/>-->
+<!--&lt;!&ndash;        <el-select v-model="printerName" placeholder="请选择小票打印机" clearable collapse-tags style="width: 220px">&ndash;&gt;-->
+<!--&lt;!&ndash;          <el-option&ndash;&gt;-->
+<!--&lt;!&ndash;            v-for="item in printList"&ndash;&gt;-->
+<!--&lt;!&ndash;            :key="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;            :label="item.name"&ndash;&gt;-->
+<!--&lt;!&ndash;            :value="item.value">&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-option>&ndash;&gt;-->
+<!--&lt;!&ndash;        </el-select>&ndash;&gt;-->
 <!--      </el-form-item>-->
 
 
@@ -537,16 +539,16 @@
 
     <!-- 提醒对话框 -->
     <el-dialog :title="handleType+'提醒'" :visible.sync="openRemind" width="40%" append-to-body>
-      <div>
-        <el-select v-model="printerName" clearable collapse-tags style="width: 220px">
-          <el-option
-            v-for="item in printList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </div>
+<!--      <div>-->
+<!--        <el-select v-model="printerName" clearable collapse-tags style="width: 220px">-->
+<!--          <el-option-->
+<!--            v-for="item in printList"-->
+<!--            :key="item.value"-->
+<!--            :label="item.name"-->
+<!--            :value="item.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </div>-->
       <div class="remind-question">请问是否对以下可{{ handleType }}订单进行{{ handleType }}操作？</div>
       <div class="remind-title">可{{ handleType }}订单 {{ ableList.length }} 笔</div>
       <div v-for="(item,index) in ableList" :key="item.orderId">{{ (index + 1) }}.
@@ -694,38 +696,46 @@ export default {
   created() {
     // this.printerName = ''
     // this.printList = []
-    this.PosPrinter = new WebSDK.EscPosCommand()
-    this.refreshPrinterList()
+
     this.getAreaTreeData()
     this.getDeptTree()
     this.getList()
   },
   mounted() {
-
+    this.PosPrinter = new WebSDK.EscPosCommand()
+    this.refreshPrinterList()
   },
   methods: {
     refreshPrinterList() {
       setPort(18080)
-      const category = { 'category': 1 }
-      getPrinterList(category, this.updatePrinterList)
+      getPrinterList({ 'category': 1 },(printer) =>{
+        this.updatePrinterList(printer)
+      })
     },
     updatePrinterList(printers) {
-      // this.printList = printers
-      // console.log(this.printList)
-      // if (!Array.isArray(printers)) {
-      //   console.error('Expected an array of printers, but got:', typeof printers)
-      //   return
-      // }
-      // console.log('Available printers:', this.printList)
-      this.printList = printers.map(item => ({
-        name: item.logicalName,
-        value: item.logicalName
-      }))
-      console.log('Available printers:', this.printList)
-      if (this.printList.length > 0) {
-        this.printerName = this.printList[0].name
+      console.log("Printers from getPrinterList:", printers)
+      if (!Array.isArray(printers)) {
+        console.error('Expected an array of printers, but got:', typeof printers)
+        return
       }
-
+     this.printList = Array.isArray(printers)
+       ? printers.map((item, index) => ({
+           name: item.logicalName,
+           value: index,
+         }))
+       : []
+      console.log('Available printers:', this.printList)
+      console.log('Available printers size:', this.printList.length)
+      if (this.printList.length > 0) {
+        console.log('Setting default printer to:', this.printList[0].value)
+        this.printerName = this.printList[0].value
+      }
+      console.log('this.printerName:', this.printerName)
+      console.log('this.printList:', this.printList)
+      this.$nextTick(() => {
+        // 强制更新视图
+        this.$forceUpdate()
+      })
     },
 //区域树
     getAreaTreeData() {
@@ -1046,14 +1056,14 @@ export default {
           this.$modal.msgSuccess('批量核销完成')
         }
         if (this.handleType == '打印小票') {
-          if (this.printList.length === 0) {
-            this.$modal.msgWarning('请先开启小票打印机服务！')
-            return
-          }
-          if (this.printerName === '') {
-            this.$modal.msgWarning('请先选择小票打印机！')
-            return
-          }
+          // if (this.printList.length === 0) {
+          //   this.$modal.msgWarning('请先开启小票打印机服务,获取打印机列表,可尝试强制刷新浏览器！')
+          //   return
+          // }
+          // if (this.printerName === '') {
+          //   this.$modal.msgWarning('请先选择小票打印机！')
+          //   return
+          // }
           const _titles = ['菜品名称', '数量', '单价', '总价']
           const _columnWidths = [20, 10, 10, 8]
           console.log(this.ableList)
@@ -1082,7 +1092,8 @@ export default {
               })  // 合计: 277 -> Total: 277; 应收: 277 -> Amount Due: 277; 水流单号: 1234567891011 -> Flow Number: 1234567891011; 谢谢光临！欢迎下次光临！ -> Thank you for your visit! Welcome again next time!
               .printAndFeed(2)
               .feedAndCut(50)
-            this.prepareAndPrint(this.printerName)
+            //TODO 当前打印机名称是写死的，后续需要改成动态选择   目前动态页面赋值有问题
+            this.prepareAndPrint('Printer1')
           })
 
           this.$modal.msgSuccess('打印小票完成')

From b8328b804700cd91547f480670fd50e50b4396dc Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 11 Sep 2025 16:40:38 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foodManage/stockManage/inventoryCount/edit.vue |  2 +-
 .../stockManage/inventoryCount/index.vue           | 12 ++++++------
 .../foodManage/stockManage/warehouseIn/edit.vue    |  1 +
 .../foodManage/stockManage/warehouseOut/edit.vue   | 14 +++++++-------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue
index e2e31a32..b3f715e0 100644
--- a/src/views/foodManage/stockManage/inventoryCount/edit.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue
@@ -90,7 +90,7 @@
                     </el-table-column> 
                     <el-table-column label="差异数" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.actualNum-scope.row.bookNum }}</span>
+                            <span>{{ (scope.row.actualNum-scope.row.bookNum).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
                      <!-- <el-table-column label="差异总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
diff --git a/src/views/foodManage/stockManage/inventoryCount/index.vue b/src/views/foodManage/stockManage/inventoryCount/index.vue
index 9dc3e5dc..352ddd85 100644
--- a/src/views/foodManage/stockManage/inventoryCount/index.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/index.vue
@@ -65,14 +65,14 @@
         <el-table-column label="盘点单号" align="center" prop="checkCode" :show-overflow-tooltip="true" /> 
         <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
         <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" /> 
-        <el-table-column label="盘点员" align="center" prop="firstCheckUser" :show-overflow-tooltip="true" />
+        <el-table-column label="盘点员" align="center" prop="firstCheckUserName" :show-overflow-tooltip="true" />
         <el-table-column label="盘点开始时间" align="center" prop="firstCheckDate" :show-overflow-tooltip="true" width="150"/>  
         <el-table-column label="盘点结束时间" align="center" prop="secondCheckDate" :show-overflow-tooltip="true" width="150"/>  
-        <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>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
-            </template>   -->
+        <el-table-column label="差异总数" align="center" prop="differNum" :show-overflow-tooltip="true" width="120"/>   
+        <el-table-column label="差异总额（元）" align="center" prop="totalProfitLoss" :show-overflow-tooltip="true" width="120">
+            <template slot-scope="scope">
+               <span>{{ (scope.row.totalProfitLoss/100).toFixed(2) }}</span>
+            </template>  
         </el-table-column>
         <!-- <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/>   -->
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index 82929b22..820f3710 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -265,6 +265,7 @@ export default {
             contractType:undefined,
             areaId:undefined,
             canteenId:undefined,  
+            intoDate:new Date()
         },
         // 表单校验
         baseRules: {
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index a6c802df..60ca41f1 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -69,11 +69,11 @@
                     <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="unitPrice" :show-overflow-tooltip="true">
-                           <template slot-scope="scope"> 
+                    <!-- <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>    -->
                     <el-table-column label="入库时间" align="center" prop="createTime" :show-overflow-tooltip="true"/> 
                     <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
                     <el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
@@ -81,7 +81,7 @@
                             <el-input v-if="!baseInfo.fetchMaterialId" v-model="scope.row.fetchNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/>
                             <span v-else>{{ scope.row.fetchNum }}</span>
                         </template>
-                    </el-table-column>  
+                    </el-table-column>
                 </el-table>
             </div>
         </div>
@@ -135,11 +135,11 @@
                             <span v-if="scope.row.salesMode==2">称重</span>
                         </template> -->
                     </el-table-column> 
-                    <el-table-column label="单价" align="center" prop="unitPrice" :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>   -->
                     <el-table-column label="货品库存" align="center" prop="materialNum" :show-overflow-tooltip="true" />  
                     
                 </el-table>
@@ -265,7 +265,7 @@ export default {
             disabledDate(v) {
                 return v.getTime() > (new Date().getTime() + 86400000);//  - 86400000是否包括当天
             }
-        }, 
+        },
         materialList:[],//货品信息-表格数据
         batchIds:[],//货品信息-表格数据-多选
         openDialog:false,

From 525d80c384167dbbe38e51907cf92a847b449939 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 11 Sep 2025 16:41:41 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/foodManage/stockManage/warehouseIn/edit.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index 820f3710..35f2111b 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -487,6 +487,7 @@ export default {
                 "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,

From 72e36d90c2cc1976bf97a6824c5b4838519e17e5 Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Fri, 12 Sep 2025 14:27:50 +0800
Subject: [PATCH 10/12] jsk

---
 .../stockManage/inventoryCount/index.vue      | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/views/foodManage/stockManage/inventoryCount/index.vue b/src/views/foodManage/stockManage/inventoryCount/index.vue
index 352ddd85..2f313019 100644
--- a/src/views/foodManage/stockManage/inventoryCount/index.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/index.vue
@@ -17,11 +17,11 @@
         </el-form-item>
         <el-form-item label="盘点单号" prop="checkCode">
             <el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" maxlength="20" clearable style="width: 240px"/>
-        </el-form-item> 
+        </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="{  
+            :props="{
                 emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                 checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
                 value:'id',label:'label'
@@ -35,7 +35,7 @@
                     :label="item.warehouseName"
                     :value="item.warehouseId"
                 ></el-option>
-            </el-select> 
+            </el-select>
         </el-form-item>   -->
         <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -52,7 +52,7 @@
           size="mini"
           @click="handleAdd"
         >新增</el-button>
-      </el-col>  
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -62,39 +62,39 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="盘点单号" align="center" prop="checkCode" :show-overflow-tooltip="true" /> 
+        <el-table-column label="盘点单号" align="center" prop="checkCode" :show-overflow-tooltip="true" />
         <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
-        <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" /> 
+        <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" />
         <el-table-column label="盘点员" align="center" prop="firstCheckUserName" :show-overflow-tooltip="true" />
-        <el-table-column label="盘点开始时间" align="center" prop="firstCheckDate" :show-overflow-tooltip="true" width="150"/>  
-        <el-table-column label="盘点结束时间" align="center" prop="secondCheckDate" :show-overflow-tooltip="true" width="150"/>  
-        <el-table-column label="差异总数" align="center" prop="differNum" :show-overflow-tooltip="true" width="120"/>   
-        <el-table-column label="差异总额（元）" align="center" prop="totalProfitLoss" :show-overflow-tooltip="true" width="120">
+        <el-table-column label="盘点开始时间" align="center" prop="firstCheckDate" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column label="盘点结束时间" align="center" prop="secondCheckDate" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column label="差异总数" align="center" prop="differNum" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="差异总额（元）" align="center" prop="differAmount" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
-               <span>{{ (scope.row.totalProfitLoss/100).toFixed(2) }}</span>
-            </template>  
+               <span>{{ (scope.row.differAmount/100).toFixed(2) }}</span>
+            </template>
         </el-table-column>
         <!-- <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/>   -->
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
-            <template slot-scope="scope"> 
+            <template slot-scope="scope">
             <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-edit" v-if="scope.row.status==1"
-                @click="handleUpdate(scope.row)" 
+                @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> 
+                @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)" 
+                @click="handleDelete(scope.row)"
             >删除</el-button>
             </template>
         </el-table-column>
@@ -115,7 +115,7 @@
 
 
 
-         
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -126,9 +126,9 @@
 </template>
 
 <script>
-import { systemAreaTreeApi } from "@/api/base/stall";  
+import { systemAreaTreeApi } from "@/api/base/stall";
 import { drpWareHousePageApi } from "@/api/foodManage/stockManage";
-import { checkInventoryPageApi,delCheckInventoryApi } from "@/api/foodManage/stockManage"; 
+import { checkInventoryPageApi,delCheckInventoryApi } from "@/api/foodManage/stockManage";
 
 export default {
     name: "",
@@ -153,11 +153,11 @@ export default {
             // 弹出层标题
             title: "",
             // 是否显示弹出层
-            open: false, 
+            open: false,
             // 查询参数
             queryParams: {
                 pageNum: 1,
-                pageSize: 10, 
+                pageSize: 10,
             },
             treeAreaOptions:[],//区域树
             wareHouseOptions:[],//仓库下拉选
@@ -202,8 +202,8 @@ export default {
             }
         };
     },
-    created() { 
-      this.getAreaTreeData(); 
+    created() {
+      this.getAreaTreeData();
       this.getWareHouseData()
       this.getList();
     },
@@ -211,18 +211,18 @@ export default {
         //区域树
         getAreaTreeData() {
             systemAreaTreeApi({}).then((response) => {
-            this.treeAreaOptions = response.data; 
+            this.treeAreaOptions = response.data;
             });
         },
         handleAreaChange(e){
            this.getWareHouseData()
-        }, 
+        },
         /** 查询货品下拉结构 */
-        getWareHouseData() { 
+        getWareHouseData() {
             drpWareHousePageApi({ areaId:this.queryParams.areaId }).then((response) => {
                 this.wareHouseOptions = response.rows||[];
-                this.$set(this.queryParams,'warehouseId',null)  
-            }); 
+                this.$set(this.queryParams,'warehouseId',null)
+            });
         },
         /** 搜索按钮操作 */
         handleQuery() {
@@ -230,7 +230,7 @@ export default {
             this.getList();
         },
         /** 重置按钮操作 */
-        resetQuery() { 
+        resetQuery() {
             this.dateRange = this.defaultDateRange()
             this.queryParams = {
                 pageNum: 1,
@@ -243,12 +243,12 @@ export default {
         getList() {
             this.loading = true;
             let param = {
-                "pageNum": this.queryParams.pageNum, 
-                "pageSize": this.queryParams.pageSize,  
-                "checkCode": this.queryParams.checkCode,     
-                "areaId": this.queryParams.areaId,  
-                // "warehouseId": this.queryParams.warehouseId,   
-                // "status": this.queryParams.status,  
+                "pageNum": this.queryParams.pageNum,
+                "pageSize": this.queryParams.pageSize,
+                "checkCode": this.queryParams.checkCode,
+                "areaId": this.queryParams.areaId,
+                // "warehouseId": this.queryParams.warehouseId,
+                // "status": this.queryParams.status,
                 // "intoType": this.queryParams.intoType
             }
             if(this.dateRange&&this.dateRange.length>0){
@@ -257,23 +257,23 @@ export default {
             }else{
                 param.startTime=undefined;
                 param.endTime=undefined;
-            } 
+            }
             checkInventoryPageApi(param).then(response => {
                 this.tableListData = response.rows;
                 this.total = Number(response.total);
                 this.loading = false;
             });
-        },  
+        },
         /** 新增按钮操作 */
         handleAdd() {
             this.$router.push({ path: "/foodManage/stockManage/inventoryCountEdit" });
         },
         /** 修改按钮操作 */
-        handleView(row) { 
+        handleView(row) {
             this.$router.push({ path: "/foodManage/stockManage/inventoryCountDetail",query: {countRowData:JSON.stringify(row)} });
         },
         /** 修改按钮操作 */
-        handleUpdate(row) { 
+        handleUpdate(row) {
             this.$router.push({ path: "/foodManage/stockManage/inventoryCountEdit",query: {countRowData:JSON.stringify(row)} });
         },
         // 取消按钮
@@ -285,7 +285,7 @@ export default {
         reset() {
             this.form = {};
             this.resetForm("form");
-        }, 
+        },
         /** 提交按钮 */
         submitForm: function() {
             this.$refs["form"].validate(valid => {
@@ -307,7 +307,7 @@ export default {
             });
         },
         /** 删除按钮操作 */
-        handleDelete(row) { 
+        handleDelete(row) {
             this.$modal.confirm('是否确认删除数据项？').then(function() {
                 return delCheckInventoryApi({checkId:row.checkId});
             }).then(() => {
@@ -319,11 +319,11 @@ export default {
           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); 
+          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
@@ -344,7 +344,7 @@ export default {
             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>

From ae8c8f584e023cbe1d2f8df3f3e2886c31ab3668 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 12 Sep 2025 17:56:54 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierQuotation/detail.vue              | 23 ++++++++++---------
 .../supplierQuotation/edit.vue                |  3 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue b/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
index 53ae0b3f..df789204 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
@@ -36,7 +36,7 @@
                 </el-descriptions-item>  
                 <el-descriptions-item>
                     <template slot="label">总金额</template>
-                    {{ baseInfo.bidTotalPrice }}
+                    {{ (baseInfo.quoteAmount/100).toFixed(2) }}
                 </el-descriptions-item>   
                 <el-descriptions-item>
                     <template slot="label">备注</template>
@@ -95,7 +95,7 @@ export default {
     dicts: [],
     data() {
       return {
-        goodsInquiryData:{},//页面传参
+        supplierQuotationData:{},//页面传参
         loading:false,
         loadingBtn:false,
         baseInfo: { 
@@ -153,15 +153,16 @@ export default {
       };
     },
     created() { 
-        if(this.$route.query.goodsInquiryData){ 
-            this.goodsInquiryData = JSON.parse(this.$route.query.goodsInquiryData)
+        if(this.$route.query.supplierQuotationData){ 
+            this.supplierQuotationData = JSON.parse(this.$route.query.supplierQuotationData)
+            console.log(this.supplierQuotationData)
             this.getContractInfo()
         }
     },
     watch:{
-        '$route.query.goodsInquiryData':function(newId, oldId) { 
+        '$route.query.supplierQuotationData':function(newId, oldId) { 
             if(newId){
-                this.goodsInquiryData = JSON.parse(newId)
+                this.supplierQuotationData = JSON.parse(newId)
                 this.getContractInfo()
             }else{
                 this.baseInfo={}
@@ -177,16 +178,16 @@ export default {
             this.$router.replace({ path: "/foodManage/supplierFunction/supplierQuotation" }); // 要打开的页面 
         },
         getContractInfo(){
-            console.log(this.goodsInquiryData) 
+            console.log(this.supplierQuotationData) 
             let param = {
-                inquiryId:this.goodsInquiryData.inquiryId, 
-                // supplierId:row.supplierId
+                inquiryId:this.supplierQuotationData.inquiryId, 
+                supplierId:this.supplierQuotationData.supplierId
             }
             //查询
             getGoodsInquiryDetailInfoApi(param).then((response) => {
-                this.baseInfo = response.data; 
+                this.baseInfo = this.supplierQuotationData; 
                 // this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime]) 
-                this.materialList = this.baseInfo.detailList; 
+                this.materialList = response.data; 
                 // supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {
                 //     this.supplierOptions = response.rows||[]; 
                 // }); 
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
index 0ad092db..1679a712 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
@@ -255,6 +255,7 @@ export default {
         this.getMaterialTree()
         if(this.$route.query.supplierQuotationData){
             this.supplierQuotationData = JSON.parse(this.$route.query.supplierQuotationData)
+            console.log(this.supplierQuotationData)
             this.getContractInfo()
         }
     },
@@ -277,7 +278,7 @@ export default {
             this.$router.replace({ path: "/foodManage/supplierFunction/supplierQuotation" }); // 要打开的页面
         },
         getContractInfo(){
-            console.log(this.supplierQuotationData)
+            
             let param = {
                 inquiryId:this.supplierQuotationData.inquiryId
             }

From c9ad37f556db6d05d3b263dac45fade06f791501 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 12 Sep 2025 18:16:08 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/foodManage/supplierFunction/supplierQuotation/edit.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
index 1679a712..3aa1c80d 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
@@ -278,7 +278,6 @@ export default {
             this.$router.replace({ path: "/foodManage/supplierFunction/supplierQuotation" }); // 要打开的页面
         },
         getContractInfo(){
-            
             let param = {
                 inquiryId:this.supplierQuotationData.inquiryId
             }