From 98e032c0909d7ab2590efc33ffc959d5bba8c4ba Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 6 Aug 2025 18:15:34 +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=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/superstore/shopMaterial/index.vue |  2 +-
 .../purchaseManage/contractList/edit.vue      |  2 +-
 .../goodsInquiry/checkPrice.vue               |  5 ++--
 .../purchaseManage/goodsInquiry/index.vue     | 23 ++++++++++---------
 .../purchaseManage/productionPlan/edit.vue    | 22 +++++++++++++-----
 .../purchaseInspection/index.vue              |  2 +-
 .../purchaseManage/purchaseOrder/edit.vue     |  2 +-
 .../purchaseManage/purchaseOrder/index.vue    | 13 ++++++-----
 .../purchaseManage/purchasePlan/edit.vue      |  6 ++---
 .../stockManage/depotManage/index.vue         | 10 +++++++-
 .../stockManage/totalStock/index.vue          |  6 ++---
 .../stockManage/warehouseIn/edit.vue          |  4 ++--
 .../stockManage/warehouseOut/edit.vue         |  2 +-
 .../supplierManage/supplierList/index.vue     |  2 +-
 14 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/src/views/canteen/superstore/shopMaterial/index.vue b/src/views/canteen/superstore/shopMaterial/index.vue
index 1d16b781..8fa94476 100644
--- a/src/views/canteen/superstore/shopMaterial/index.vue
+++ b/src/views/canteen/superstore/shopMaterial/index.vue
@@ -379,7 +379,7 @@ export default {
     // 筛选节点 - 左侧树
     filterNode(value, data) {
       if (!value) return true;
-      return data.materialTypeName.indexOf(value) !== -1;
+      return data.categoryName.indexOf(value) !== -1;
     },
     /** 查询新增页面-上级类型下拉树结构 */
     getTreeData() {
diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue
index 3c3899ba..35f720b0 100644
--- a/src/views/foodManage/purchaseManage/contractList/edit.vue
+++ b/src/views/foodManage/purchaseManage/contractList/edit.vue
@@ -451,7 +451,7 @@ export default {
             let param = {
                 "pageSize": this.queryParams.pageSize,
                 "pageNum": this.queryParams.pageNum,
-                "areaId": this.queryParams.areaId,
+                "areaId": this.baseInfo.areaId,
                 "materialName": this.queryParams.materialName,
                 "materialCode": this.queryParams.materialCode,  
                 "materialTypeIds": this.queryParams.materialTypeIds,
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue b/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue
index 1667854a..dcc93601 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue
@@ -15,6 +15,7 @@
                     <span v-if="baseInfo.status==1">未开始</span>
                     <span v-if="baseInfo.status==2">进行中</span>
                     <span v-if="baseInfo.status==3">已结束</span>
+                    <span v-if="baseInfo.status==4">未决标</span>
                     <span v-if="baseInfo.status==5">已取消</span>
                 </el-descriptions-item>
                 <el-descriptions-item>
@@ -71,7 +72,7 @@
                           <span v-if="scope.row.bidStatus==3">已选中</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
+                    <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" v-if="baseInfo.status==2">
                         <template slot-scope="scope">
                             <el-button
                                 size="mini"  
@@ -230,7 +231,7 @@ export default {
             }
             editInquirySupplierApi(param).then((response) => {
                 console.log('response',response); 
-                
+                this.getContractInfo()
             });
         },
 
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
index fa2fc73e..d9c1dcdb 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
@@ -79,29 +79,30 @@
         <el-table-column label="询价标题" align="center" prop="title" :show-overflow-tooltip="true" />
         <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="inquiryState" :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==1">--</span>
-                <span v-if="scope.row.status==3">进行中</span>
+                <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>
             </template>
         </el-table-column>
-        <el-table-column label="提交状态" align="center" prop="orderStatus" :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==1">待提交</span>
                 <span v-if="scope.row.status!=1">已提交</span>
             </template>
-        </el-table-column>
+        </el-table-column> -->
         <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>
             </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">
@@ -284,10 +285,10 @@ export default {
                 "pageNum": this.queryParams.pageNum,
                 "pageSize": this.queryParams.pageSize,
                 "searchValue": this.queryParams.searchValue,
-                "areaId": this.queryParams.areaId,
-                "inquiryState": this.queryParams.inquiryState,
-                "status": this.queryParams.status,
-                "orderStatus": this.queryParams.orderStatus
+                // "areaId": this.queryParams.areaId,
+                // "inquiryState": this.queryParams.inquiryState,
+                // "status": this.queryParams.status,
+                // "orderStatus": this.queryParams.orderStatus
             }
             if(this.dateRange&&this.dateRange.length>0){
                 param.startTime=this.formatDateTime(this.dateRange[0])
diff --git a/src/views/foodManage/purchaseManage/productionPlan/edit.vue b/src/views/foodManage/purchaseManage/productionPlan/edit.vue
index 764e7f34..6cc1f0a2 100644
--- a/src/views/foodManage/purchaseManage/productionPlan/edit.vue
+++ b/src/views/foodManage/purchaseManage/productionPlan/edit.vue
@@ -96,7 +96,7 @@
                     <div class="body-card">
                         <div v-for="dish in item.dishesList" :key="dish.dishesId" style="width: 100%;display: flex;justify-content: space-between;align-items: center;">
                             <span>{{dish.dishesName}}</span> 
-                            <el-input v-model="dish.dishesNum" placeholder="份数" maxlength="10" clearable 
+                            <el-input v-model="dish.dishesNum" placeholder="份数" maxlength="8" clearable 
                                     @input="(v)=>(dish.dishesNum=v.replace(/[^\d]/g,''))" style="width: 100px;"/>
                             <!-- <i class="el-icon-delete" style="color: red;cursor: pointer;" @click="deleteDishes(item,dish)"  v-if="dialogType==1"></i> -->
                         </div>
@@ -181,7 +181,7 @@
                         </el-table-column> 
                         <el-table-column label="份数" align="center" prop="dishesNum">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.dishesNum" placeholder="份数" maxlength="10" clearable @input="(v)=>(scope.row.dishesNum=v.replace(/[^\d]/g,''))"/>
+                                <el-input  v-model="scope.row.dishesNum" placeholder="份数" maxlength="8" clearable @input="(v)=>(scope.row.dishesNum=v.replace(/[^\d]/g,''))"/>
                             </template>
                         </el-table-column> 
                         <el-table-column label="操作" align="center">
@@ -833,7 +833,12 @@ export default {
                         if(param.productionPlanDetailVOList&&param.productionPlanDetailVOList.length>0){
                             addList.forEach(item=>{ 
                                 let index = param.productionPlanDetailVOList.findIndex(v=>(v.detailDate==item.detailDate&&v.mealtimeType==item.mealtimeType&&v.dishesId==item.dishesId))
-                                param.productionPlanDetailVOList[index].dishesNum = item.dishesNum
+                                if(index>-1){
+                                    param.productionPlanDetailVOList[index].dishesNum = item.dishesNum
+                                }else{
+                                    item.goodsType=1;
+                                    param.productionPlanDetailVOList.push(item)
+                                }
                             })
                             param.productionPlanDetailAddList = param.productionPlanDetailVOList 
                         }else{
@@ -944,11 +949,16 @@ export default {
                             }
                         }
                         console.log(addList)
-                        if(param.productionPlanDetailVOList&&param.productionPlanDetailVOList.length>0){
+                        if(param.productionPlanDetailVOList&&param.productionPlanDetailVOList.length>0){ 
                             addList.forEach(item=>{ 
                                 let index = param.productionPlanDetailVOList.findIndex(v=>(v.detailDate==item.detailDate&&v.mealtimeType==item.mealtimeType&&v.dishesId==item.dishesId))
-                                param.productionPlanDetailVOList[index].dishesNum = item.dishesNum
-                            })
+                                if(index>-1){
+                                    param.productionPlanDetailVOList[index].dishesNum = item.dishesNum
+                                }else{
+                                    item.goodsType=1;
+                                    param.productionPlanDetailVOList.push(item)
+                                }
+                            }) 
                             param.productionPlanDetailAddList = param.productionPlanDetailVOList 
                         }else{
                             param.productionPlanDetailAddList = addList
diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/index.vue b/src/views/foodManage/purchaseManage/purchaseInspection/index.vue
index 9f78ee4a..7e839e0c 100644
--- a/src/views/foodManage/purchaseManage/purchaseInspection/index.vue
+++ b/src/views/foodManage/purchaseManage/purchaseInspection/index.vue
@@ -69,7 +69,7 @@
         <el-table-column label="送货人" align="center" prop="deliveryMan" :show-overflow-tooltip="true"/>
         <el-table-column label="送货人电话" align="center" prop="deliveryPhone" :show-overflow-tooltip="true"/>
         <!-- <el-table-column label="送货仓库" align="center" prop="deliveryWarehouseId" :show-overflow-tooltip="true"/> -->
-         <el-table-column label="送货日期" align="center" prop="deliveryDate" :show-overflow-tooltip="true"/>
+         <el-table-column label="验货日期" align="center" prop="inspectDate" :show-overflow-tooltip="true"/>
         <el-table-column label="送货总数量" align="center" prop="deliveryTotalNum" :show-overflow-tooltip="true"/>
         <el-table-column label="验收总数量" align="center" prop="inspectQualifiedNum" :show-overflow-tooltip="true"/>  
         <!-- <el-table-column label="提交状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
index 2a114805..af05099e 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
@@ -606,7 +606,7 @@ export default {
             let param = {
                 "pageSize": this.queryParams.pageSize,
                 "pageNum": this.queryParams.pageNum,
-                "areaId": this.queryParams.areaId,
+                "areaId": this.baseInfo.areaId,
                 "materialName": this.queryParams.materialName,
                 "materialCode": this.queryParams.materialCode,  
                 "materialTypeIds": this.queryParams.materialTypeIds,
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/index.vue b/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
index 6bbe574d..f096c2b0 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
@@ -1,10 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-        <el-form-item label="采购订单号" prop="orderGoodsCode">
-            <el-input v-model="queryParams.orderGoodsCode" placeholder="请输入采购单编号" maxlength="20" clearable style="width: 240px"/>
-        </el-form-item>
-        <el-form-item label="采购日期">
+        <el-form-item label="日期">
             <el-date-picker
                 v-model="dateRange"
                 type="datetimerange"
@@ -18,6 +15,9 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item>
+        <el-form-item label="采购订单号" prop="orderGoodsCode">
+            <el-input v-model="queryParams.orderGoodsCode" placeholder="请输入采购单编号" maxlength="20" clearable style="width: 240px"/>
+        </el-form-item>
         <el-form-item label="供应商" prop="supplierId">
             <el-select v-model="queryParams.supplierId" placeholder="请选择供应商" style="width: 240px;">
                 <el-option v-for="item in supplierOptions"
@@ -120,6 +120,8 @@
         </el-table-column>
         <el-table-column label="采购订单号" align="center" prop="orderGoodsCode" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="采购订单标题" align="center" prop="orderTitle" :show-overflow-tooltip="true" width="180"/> 
+        <el-table-column label="采购订单时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="160"/> 
+        
         <!-- <el-table-column label="提交状态" align="center" prop="orderStatus" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <span v-if="scope.row.orderStatus==1">待提交</span>
@@ -132,8 +134,7 @@
                 <span v-if="scope.row.supplierConfirmStatus==2">确认通过</span>
                 <span v-if="scope.row.supplierConfirmStatus==3">已拒绝</span> 
             </template>  
-        </el-table-column> -->
-     
+        </el-table-column> --> 
         <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>
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
index 04cc1f1c..fba2e241 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
@@ -82,12 +82,12 @@
                     </el-table-column> 
                     <el-table-column label="参考价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <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'))"/>
+                            <el-input  v-model="scope.row.unitPrice" placeholder="请输入" maxlength="9" 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="purchaseNum" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <el-input  v-model.number="scope.row.purchaseNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.purchaseNum=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
+                            <el-input  v-model.number="scope.row.purchaseNum" placeholder="请输入" maxlength="7" clearable @input="(v)=>(scope.row.purchaseNum=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
                         </template>
                     </el-table-column> 
                     <el-table-column label="预计采购金额(元)" align="center" prop="" :show-overflow-tooltip="true">
@@ -378,7 +378,7 @@ export default {
             let param = {
                 "pageSize": this.queryParams.pageSize,
                 "pageNum": this.queryParams.pageNum,
-                "areaId": this.queryParams.areaId,
+                "areaId": this.baseInfo.areaId,
                 "materialName": this.queryParams.materialName,
                 "materialCode": this.queryParams.materialCode,  
                 "materialTypeIds": this.queryParams.materialTypeIds,
diff --git a/src/views/foodManage/stockManage/depotManage/index.vue b/src/views/foodManage/stockManage/depotManage/index.vue
index 14a10bc9..0696ffc4 100644
--- a/src/views/foodManage/stockManage/depotManage/index.vue
+++ b/src/views/foodManage/stockManage/depotManage/index.vue
@@ -239,7 +239,15 @@ export default {
                 ],
                 warehouseCode: [
                     { required: true, message: "仓库编码不能为空", trigger: "blur" }
-                ]
+                ],
+                managerPhone: [
+                    {
+                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                        message: '请输入正确的手机号码',
+                        trigger: 'blur',
+                    }
+                ],
+                
             }
         };
     },
diff --git a/src/views/foodManage/stockManage/totalStock/index.vue b/src/views/foodManage/stockManage/totalStock/index.vue
index cb3878bb..6b63c8a4 100644
--- a/src/views/foodManage/stockManage/totalStock/index.vue
+++ b/src/views/foodManage/stockManage/totalStock/index.vue
@@ -81,9 +81,9 @@
       <el-table-column label="最大库存" align="center" prop="maxNum" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
-          <span v-if="scope.row.inventoryStatus==1">正常</span>
-          <span v-if="scope.row.inventoryStatus==2">即将缺货</span>
-          <span v-if="scope.row.inventoryStatus==3">超额</span>
+          <span v-if="scope.row.inventoryStatus==1" style="color: #1890ff;">正常</span>
+          <span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">即将缺货</span>
+          <span v-if="scope.row.inventoryStatus==3" style="color: red;">超额</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="总库存数" align="center" prop="totalNum" :show-overflow-tooltip="true" width="120"/> -->
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index 9093d402..0b53b054 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -101,12 +101,12 @@
                     </el-table-column> 
                     <el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <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'))"/>
+                            <el-input  v-model="scope.row.unitPrice" placeholder="请输入" maxlength="8" 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="purNum" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <el-input  v-model.number="scope.row.purNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.purNum=v.replace(/[^\d]/g,''))"/>
+                            <el-input  v-model.number="scope.row.purNum" placeholder="请输入" maxlength="8" clearable @input="(v)=>(scope.row.purNum=v.replace(/[^\d]/g,''))"/>
                         </template>
                     </el-table-column>  
                 </el-table>
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index d422f8dd..f5da1de8 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -74,7 +74,7 @@
                     <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
                     <el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <el-input  v-model.number="scope.row.fetchNum" placeholder="请输入" maxlength="10" clearable @change="patternValue(scope.row)"/>
+                            <el-input  v-model.number="scope.row.fetchNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/>
                         </template>
                     </el-table-column>  
                 </el-table>
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index f1aa9e8b..ac1b89a5 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -84,7 +84,7 @@
         <el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
-                <el-switch v-model="scope.row.status" active-value="1" inactive-value="2"
+                <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2"
                             @change="handleStatusChange(scope.row)"
                 ></el-switch>
             </template>