From aa81840f1cb73e25337941db5e5c4cb317b46f8e Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 7 Aug 2025 15:29:12 +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=B94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopMaterial/components/MaterialDialog.vue     |  4 ++--
 .../purchaseManage/purchaseInspection/edit.vue     | 12 ++++++++++--
 .../purchaseManage/purchaseOrder/edit.vue          | 14 ++++++++------
 .../purchaseManage/purchasePlan/edit.vue           | 12 +++++++-----
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue b/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
index 2574ba43..a90addca 100644
--- a/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
+++ b/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
@@ -17,7 +17,7 @@
                 <el-input
                   v-model="form.materialCode"
                   placeholder="请输入商品编号"
-                  maxlength="40"
+                  maxlength="20"
                   show-word-limit
                 />
               </el-form-item>
@@ -27,7 +27,7 @@
                 <el-input
                   v-model="form.materialName"
                   placeholder="请输入商品名称"
-                  maxlength="40"
+                  maxlength="20"
                   show-word-limit
                 />
               </el-form-item>
diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
index bb8f0106..52db127b 100644
--- a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
@@ -376,7 +376,9 @@ export default {
     created() {
         if(this.$route.query.purchaseInspectionRowData){ 
             this.purchaseInspectionRowData = JSON.parse(this.$route.query.purchaseInspectionRowData)
-            this.getContractInfo()
+            setTimeout(()=>{
+                this.getContractInfo() 
+            },500)
         }
         this.getAreaTreeData()  
         this.getMaterialTree()  
@@ -783,8 +785,14 @@ export default {
             param.type = 'canteen'
             imgUpLoadTwo(param).then((res) => {
               if (res.code == 200) {
+                console.log(this.attachmentList)
+                console.log(this.baseInfo.inspectAttachmentList)
                 this.attachmentList.push(res.data) 
-                this.baseInfo.inspectAttachmentList.push(res.data.url) 
+                if(!this.baseInfo.inspectAttachmentList){
+                    this.baseInfo.inspectAttachmentList=[res.data.url]
+                }else{
+                    this.baseInfo.inspectAttachmentList.push(res.data.url) 
+                } 
               } else {
                 this.$modal.msgError(res.msg);
               }
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
index 97a110a8..7c2ecf41 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
@@ -409,8 +409,10 @@ export default {
     },
     created() { 
         if(this.$route.query.purchaseOrderRowData){ 
-            this.purchaseOrderRowData = JSON.parse(this.$route.query.purchaseOrderRowData) 
-            this.getContractInfo() 
+            this.purchaseOrderRowData = JSON.parse(this.$route.query.purchaseOrderRowData)
+            setTimeout(()=>{
+                this.getContractInfo() 
+            },800)
         }
         this.getAreaTreeData()  
         this.getMaterialTree()   
@@ -454,12 +456,12 @@ export default {
                     this.$set(this.baseInfo,"stallId",this.baseInfo.stallId)  
                 });  
                 supplierPageApi({ isPaging:1,areaIdList:[this.baseInfo.areaId] }).then((response) => {
-                    this.supplierOptions = response.rows||[];
-                    this.$set(this.baseInfo,"supplierId",response.data.supplierId) 
+                    this.supplierOptions = response.rows||[]; 
+                    this.$set(this.baseInfo,"supplierId",response.data.supplierId)  
                 });  
                 drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
-                    this.wareHouseOptions = response.rows||[]; 
-                    this.$set(this.baseInfo,"warehouseId",response.data.warehouseId)  
+                    this.wareHouseOptions = response.rows||[];  
+                    this.$set(this.baseInfo,"warehouseId",response.data.warehouseId)    
                 });  
             }); 
         },
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
index 43882dab..851b7187 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
@@ -74,7 +74,7 @@
                     <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
-                    <el-table-column label="库存数量" align="center" prop="inventoryNum" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="库存数量" align="center" prop="materialTotalNum" :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>
@@ -232,13 +232,15 @@ export default {
         noMaterial:false,
       };
     },
-    created() {
-        this.getAreaTreeData()  
-        this.getMaterialTree()   
+    created() { 
         if(this.$route.query.purchasePlanRowData){ 
             this.purchasePlanRowData = JSON.parse(this.$route.query.purchasePlanRowData)
-            this.getContractInfo()
+            setTimeout(()=>{
+                this.getContractInfo() 
+            },500)
         }
+        this.getAreaTreeData()  
+        this.getMaterialTree()   
     },
     watch:{
         '$route.query.purchasePlanRowData':function(newId, oldId) {