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

---
 .../components/MaterialDialog.vue             |  2 +-
 .../pickManage/materialPicking/edit.vue       |  3 ++
 .../purchaseManage/contractList/edit.vue      |  5 ++-
 .../purchaseManage/goodsInquiry/edit.vue      |  3 ++
 .../purchaseManage/goodsInquiry/index.vue     |  8 ++--
 .../purchaseManage/productionPlan/edit.vue    | 45 ++++++++++++-------
 .../purchaseInspection/edit.vue               |  3 ++
 .../purchaseManage/purchaseOrder/edit.vue     |  3 ++
 .../purchaseManage/purchasePlan/edit.vue      |  3 ++
 .../returnManage/materialReturn/edit.vue      |  3 ++
 .../stockManage/goodsTransfer/edit.vue        |  3 ++
 .../stockManage/inventoryCount/edit.vue       |  7 ++-
 .../stockManage/warehouseIn/edit.vue          |  5 +++
 .../stockManage/warehouseOut/edit.vue         |  3 ++
 .../supplierQuotation/edit.vue                |  3 ++
 .../supplierManage/supplierList/index.vue     |  6 +--
 .../supplierManage/supplyStatistics/index.vue |  4 +-
 17 files changed, 79 insertions(+), 30 deletions(-)

diff --git a/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue b/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
index d210d964..a90addca 100644
--- a/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
+++ b/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
@@ -129,7 +129,7 @@
               </el-form-item>
             </el-col>  -->
             <el-col :span="12"> 
-              <el-form-item label="商品简介22" prop="description"> 
+              <el-form-item label="商品简介" prop="description"> 
                   <el-input
                     type="textarea"
                     :rows="3"
diff --git a/src/views/foodManage/pickManage/materialPicking/edit.vue b/src/views/foodManage/pickManage/materialPicking/edit.vue
index de2dba22..d18aa774 100644
--- a/src/views/foodManage/pickManage/materialPicking/edit.vue
+++ b/src/views/foodManage/pickManage/materialPicking/edit.vue
@@ -474,6 +474,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue
index 65a7ce0a..94473d7c 100644
--- a/src/views/foodManage/purchaseManage/contractList/edit.vue
+++ b/src/views/foodManage/purchaseManage/contractList/edit.vue
@@ -418,13 +418,16 @@ export default {
                     this.contractMaterialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
             if(this.baseInfo.areaId!=undefined){
                  this.openDialog=true
                 this.resetQuery()
-                setTimeout(()=>{
+                setTimeout(()=>{ 
                     this.$refs.multipleTable1.clearSelection() 
                 },300) 
             }else{
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
index d2084076..01bc3821 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
@@ -487,6 +487,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
index 17eeb1f3..1e22743e 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="areaName" :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==3">已中选</span>
-                <span v-if="scope.row.status!=3">未中选</span>
+                <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/edit.vue b/src/views/foodManage/purchaseManage/productionPlan/edit.vue
index 6cc1f0a2..22589614 100644
--- a/src/views/foodManage/purchaseManage/productionPlan/edit.vue
+++ b/src/views/foodManage/purchaseManage/productionPlan/edit.vue
@@ -774,12 +774,14 @@ export default {
                                             obj.detailDate = this.dateRangeList[i].applyDate
                                             obj.dishesId=dishItem.dishesId;
                                             obj.dishesName=dishItem.dishesName;
+                                            obj.goodsType=1;
                                             obj.dishesNum=Number(dishItem.dishesNum); 
                                             obj.mealtimeName=this.dateRangeList[0].detailList[j].mealtimeName;
-                                            obj.mealtimeType=this.dateRangeList[0].detailList[j].mealtimeType;
-                                            obj.dishesNum=dishItem.dishesNum;
+                                            obj.mealtimeType=this.dateRangeList[0].detailList[j].mealtimeType; 
                                             obj.sizeType=dishItem.sizeType; 
-                                            param.productionPlanDetailAddList.push(obj)
+                                            if(obj.dishesNum>0){
+                                                param.productionPlanDetailAddList.push(obj)
+                                            } 
                                         }) 
                                     } 
                                 }
@@ -795,11 +797,13 @@ export default {
                                             obj.dishesId=dishItem.dishesId;
                                             obj.dishesName=dishItem.dishesName;
                                             obj.dishesNum=Number(dishItem.dishesNum); 
+                                            obj.goodsType=1;
                                             obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
-                                            obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
-                                            obj.dishesNum=dishItem.dishesNum;
+                                            obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType; 
                                             obj.sizeType=dishItem.sizeType; 
-                                            param.productionPlanDetailAddList.push(obj)
+                                            if(obj.dishesNum>0){
+                                                param.productionPlanDetailAddList.push(obj)
+                                            } 
                                         }) 
                                     } 
                                 }
@@ -819,6 +823,7 @@ export default {
                                             obj.dishesId=dishItem.dishesId;
                                             obj.dishesName=dishItem.dishesName;
                                             obj.dishesNum=Number(dishItem.dishesNum); 
+                                            obj.goodsType=1;
                                             obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
                                             obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
                                             obj.dishesNum=dishItem.dishesNum;
@@ -894,11 +899,13 @@ export default {
                                             obj.dishesId=dishItem.dishesId;
                                             obj.dishesName=dishItem.dishesName;
                                             obj.dishesNum=Number(dishItem.dishesNum); 
+                                            obj.goodsType=1;
                                             obj.mealtimeName=this.dateRangeList[0].detailList[j].mealtimeName;
-                                            obj.mealtimeType=this.dateRangeList[0].detailList[j].mealtimeType;
-                                            obj.dishesNum=dishItem.dishesNum;
+                                            obj.mealtimeType=this.dateRangeList[0].detailList[j].mealtimeType; 
                                             obj.sizeType=dishItem.sizeType; 
-                                            param.productionPlanDetailAddList.push(obj)
+                                            if(obj.dishesNum>0){
+                                                param.productionPlanDetailAddList.push(obj)
+                                            } 
                                         }) 
                                     } 
                                 }
@@ -914,11 +921,13 @@ export default {
                                             obj.dishesId=dishItem.dishesId;
                                             obj.dishesName=dishItem.dishesName;
                                             obj.dishesNum=Number(dishItem.dishesNum); 
+                                            obj.goodsType=1;
                                             obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
-                                            obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
-                                            obj.dishesNum=dishItem.dishesNum;
+                                            obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType; 
                                             obj.sizeType=dishItem.sizeType; 
-                                            param.productionPlanDetailAddList.push(obj)
+                                            if(obj.dishesNum>0){
+                                                param.productionPlanDetailAddList.push(obj)
+                                            }
                                         }) 
                                     } 
                                 }
@@ -938,11 +947,13 @@ export default {
                                             obj.dishesId=dishItem.dishesId;
                                             obj.dishesName=dishItem.dishesName;
                                             obj.dishesNum=Number(dishItem.dishesNum); 
+                                            obj.goodsType=1;
                                             obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
-                                            obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
-                                            obj.dishesNum=dishItem.dishesNum;
+                                            obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType; 
                                             obj.sizeType=dishItem.sizeType; 
-                                            addList.push(obj)
+                                            if(obj.dishesNum>0){
+                                                addList.push(obj)
+                                            }  
                                         } 
                                     }) 
                                 } 
@@ -972,7 +983,7 @@ export default {
                         this.loadingBtn=true;
                             if (this.baseInfo.planId != undefined) {
                                 editProductionPlanApi(param).then((response) => {
-                                    this.$modal.msgSuccess("修改成功");
+                                    this.$modal.msgSuccess("提交成功");
                                     this.loadingBtn=false
                                     this.jumpList() 
                                 }).catch(() => {
@@ -980,7 +991,7 @@ export default {
                                 }); 
                             } else {
                                 addProductionPlanApi(param).then((response) => {
-                                    this.$modal.msgSuccess("保存成功");
+                                    this.$modal.msgSuccess("提交成功");
                                     this.loadingBtn=false
                                     this.jumpList() 
                                 }).catch(() => {
diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
index 4393d1cd..71110125 100644
--- a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
@@ -492,6 +492,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
index 7c2ecf41..b828111a 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
@@ -575,6 +575,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
index 851b7187..798bf6c5 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
@@ -347,6 +347,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/returnManage/materialReturn/edit.vue b/src/views/foodManage/returnManage/materialReturn/edit.vue
index 70cc0f0c..8658ddcc 100644
--- a/src/views/foodManage/returnManage/materialReturn/edit.vue
+++ b/src/views/foodManage/returnManage/materialReturn/edit.vue
@@ -342,6 +342,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/stockManage/goodsTransfer/edit.vue b/src/views/foodManage/stockManage/goodsTransfer/edit.vue
index dc65dadd..d691d96d 100644
--- a/src/views/foodManage/stockManage/goodsTransfer/edit.vue
+++ b/src/views/foodManage/stockManage/goodsTransfer/edit.vue
@@ -366,6 +366,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue
index 78a071eb..c30bb220 100644
--- a/src/views/foodManage/stockManage/inventoryCount/edit.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue
@@ -367,17 +367,20 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
-            if(this.baseInfo.areaId!=undefined){
+            if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId!=undefined){
                  this.openDialog=true
                 this.resetQuery()
                 setTimeout(()=>{
                     this.$refs.multipleTable1.clearSelection() 
                 },300) 
             }else{
-                this.$modal.msgError("请先选择区域");
+                this.$modal.msgError("请先选择区域,仓库");
             }
            
         }, 
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index 770559cd..4b5ed24f 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -448,6 +448,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
@@ -680,6 +683,8 @@ export default {
                 "pageNum": this.queryParams2.pageNum,
                 "orderGoodsCode": this.queryParams2.orderGoodsCode,
                 "orderStatus":2,
+                "isInspect":2,
+                "ifAllInto":2,
                 "areaId": this.baseInfo.areaId,
                 "warehouseId": this.baseInfo.warehouseId, 
                 "supplierId": this.baseInfo.deliverySupplierId, 
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index 5833fe61..5aac5efa 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -374,6 +374,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
index df73b237..90629958 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
@@ -354,6 +354,9 @@ export default {
                     this.materialList.splice(index,1)
                 }
             })
+            setTimeout(()=>{ 
+                this.$refs.multipleTable.clearSelection() 
+            },300) 
         },
         //添加货品
         addMaterial(){
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index 8201a33a..2ff05862 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -824,8 +824,8 @@ export default {
             });
         },  
         // 状态修改
-        handleStatusChange(row) {
-            let text = row.status === '1' ? '启用' : '停用'
+        handleStatusChange(row) { 
+            let text = row.status == '1' ? '启用' : '停用'
             let param = {
                 supplierId:row.supplierId,
                 status:row.status
@@ -835,7 +835,7 @@ export default {
             }).then(() => {
                 this.$modal.msgSuccess(text + '成功')
             }).catch(function() {
-                row.status = row.status === '1' ? '2' : '1'
+                row.status = row.status == '1' ? '2' : '1'
             })
         },
         /** 新增按钮操作 */
diff --git a/src/views/foodManage/supplierManage/supplyStatistics/index.vue b/src/views/foodManage/supplierManage/supplyStatistics/index.vue
index 3140e484..553b04f4 100644
--- a/src/views/foodManage/supplierManage/supplyStatistics/index.vue
+++ b/src/views/foodManage/supplierManage/supplyStatistics/index.vue
@@ -65,8 +65,8 @@
         </template> 
       </el-table-column>
       <el-table-column label="采购订单数量" align="center" prop="orderNum" :show-overflow-tooltip="true" />
-      <!-- <el-table-column label="最近一次采购中标日期" align="center" prop="areaName" :show-overflow-tooltip="true"/>
-      <el-table-column label="最近一次采购中标金额" align="center" prop="areaName" :show-overflow-tooltip="true"/>   -->
+      <el-table-column label="最近一次采购中标日期" align="center" prop="" :show-overflow-tooltip="true"/>
+      <el-table-column label="最近一次采购中标金额" align="center" prop="" :show-overflow-tooltip="true"/>  
     </el-table>
 
     <pagination