From 6757122d6e33dab1b5409c180e7c64c2c72b020d Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 21 Aug 2025 09:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=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

---
 src/views/canteen/dish/nutritionInfo/index.vue         | 10 +++++-----
 src/views/foodManage/stockManage/depotManage/index.vue |  6 ++++++
 src/views/foodManage/stockManage/warehouseOut/edit.vue |  3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/canteen/dish/nutritionInfo/index.vue b/src/views/canteen/dish/nutritionInfo/index.vue
index 00035a08..4e794803 100644
--- a/src/views/canteen/dish/nutritionInfo/index.vue
+++ b/src/views/canteen/dish/nutritionInfo/index.vue
@@ -143,7 +143,7 @@
           <el-input v-model="typeForm.parentName" placeholder="请输入父节点名称" maxlength="30" disabled/>
         </el-form-item>  
         <el-form-item label="类别名称" prop="nutritionTypeName">
-          <el-input v-model="typeForm.nutritionTypeName" placeholder="请输入类别名称" maxlength="30"/>
+          <el-input v-model="typeForm.nutritionTypeName" placeholder="请输入类别名称" maxlength="15"/>
         </el-form-item> 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -840,7 +840,7 @@ export default {
       },
       // 表单参数
       form: {
-        categoryId: undefined, // 营养信息类别
+        nutritionTypeId: undefined, // 营养信息类别
         nutritionName: undefined, // 营养信息名称
         nutritionCode: undefined, // 食材编码
         processingTime: undefined, // 加工时间
@@ -874,7 +874,7 @@ export default {
       formTable:[],
       // 表单校验
       rules: {
-        categoryId: [
+        nutritionTypeId: [
           { required: true, message: "请选择营养信息类别", trigger: "change" }
         ],
         nutritionName: [
@@ -899,7 +899,7 @@ export default {
       typeRules: {
         name: [
           { required: true, message: "类别名称不能为空", trigger: "change" }
-        ],
+        ], 
         // nutritionName: [
         //   { required: true, message: "营养信息名称不能为空", trigger: "blur" }
         // ],
@@ -1058,7 +1058,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        categoryId: undefined, // 营养信息类别
+        nutritionTypeId: undefined, // 营养信息类别
         nutritionName: undefined, // 营养信息名称
         nutritionCode: undefined, // 食材编码
         processingTime: undefined, // 加工时间
diff --git a/src/views/foodManage/stockManage/depotManage/index.vue b/src/views/foodManage/stockManage/depotManage/index.vue
index 0696ffc4..59e90d26 100644
--- a/src/views/foodManage/stockManage/depotManage/index.vue
+++ b/src/views/foodManage/stockManage/depotManage/index.vue
@@ -316,6 +316,12 @@ export default {
         },
         handleUpdate(row) {
             this.form = Object.assign({}, row);
+            let param= {
+                areaId:row.areaId
+            }
+            getCanteenByAreaApi(param).then((response) => {
+                this.canteenOptions=response.rows||[] 
+            });
             this.open = true;
             this.title = "修改";
         },
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index 5aac5efa..5b270a2b 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -599,7 +599,8 @@ export default {
                 "pageSize": this.queryParams2.pageSize,
                 "pageNum": this.queryParams2.pageNum,
                 "areaId": this.baseInfo.areaId, 
-                "warehouseId": this.baseInfo.warehouseId
+                "warehouseId": this.baseInfo.warehouseId,
+                "fetchStatus":2 //1已领取,2未领取
             }
             fetchMaterialPageApi(param).then(response => {
                 this.tableListData2 = response.rows;