From aa2210a9fec0e32df76e54e9e4e7a7110af2fd1e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 18 七月 2025 15:55:00 +0800
Subject: [PATCH] 1.巡检上传-提交字段修改

---
 src/views/warehouseManagement/index.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 6fd3887..b7bd8a4 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -317,12 +317,14 @@
     coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
     unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
     coalPlanId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    supplierId: [{ required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }],
   },
   mergeRules: {
     supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
     coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
     unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
     coalPlanId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    supplierId: [{ required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }],
   }
 })
 
@@ -481,7 +483,9 @@
 const mergeRows = (type,row) => {
   getDropdownData()
   coalPlanListOptions()
-  mergeVisible.value = true;
+  if (type === 'edit') {
+    mergeVisible.value = true;
+  }
   operationType.value = type;
   if (type !== 'merge') {
     mergeForm.value = {...row}
@@ -490,6 +494,7 @@
       proxy.$modal.msgWarning('璇疯嚦灏戦�夋嫨涓ゆ潯鏁版嵁')
       return
     }
+    mergeVisible.value = true;
     filteredList.value.forEach(item => {
       mergeForm.value[item.fields] = ''
     })

--
Gitblit v1.9.3