From 9e124390bcbc65960669edba84fe6e891ccd894d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 5 Sep 2025 17:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E7=94=B5=E8=A1=A8=E5=8F=B7=E4=B8=8D?=
 =?UTF-8?q?=E5=A1=AB=E4=B8=8D=E5=85=81=E8=AE=B8=E6=8F=90=E4=BA=A4=E6=8A=84?=
 =?UTF-8?q?=E8=A1=A8=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesA/sdPage/dfReport.vue | 14 ++++++++++++++
 pagesA/sdPage/sfReport.vue | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/pagesA/sdPage/dfReport.vue b/pagesA/sdPage/dfReport.vue
index 8db84f5..b2037fd 100644
--- a/pagesA/sdPage/dfReport.vue
+++ b/pagesA/sdPage/dfReport.vue
@@ -729,6 +729,13 @@ export default {
           //   });
           //   return;
           // }
+          if(!item.isSystemElectricMeterNumber){
+            uni.showToast({
+              title: `第${i + 1}个房间请填写电表号`,
+              icon: "none",
+            });
+            return;
+          }
           if (!item.thisMeterReading && item.thisMeterReading !== 0) {
             uni.showToast({
               title: `第${i + 1}个房间请填写本次表数`,
@@ -765,6 +772,13 @@ export default {
           //   });
           //   return;
           // }
+          if(!item.isSystemElectricMeterNumber){
+            uni.showToast({
+              title: `请填写电表号`,
+              icon: "none",
+            });
+            return;
+          }
           if (!item.thisMeterReading && item.thisMeterReading !== 0) {
             uni.showToast({
               title: `请填写本次表数`,
diff --git a/pagesA/sdPage/sfReport.vue b/pagesA/sdPage/sfReport.vue
index 9bee439..0f8372d 100644
--- a/pagesA/sdPage/sfReport.vue
+++ b/pagesA/sdPage/sfReport.vue
@@ -653,6 +653,13 @@ export default {
           //   });
           //   return;
           // }
+          if(!item.waterMeterNumber){
+            uni.showToast({
+              title: `第${i + 1}个房间请填写水表号`,
+              icon: "none",
+            });
+            return;
+          }
           if (!item.thisMeterReading && item.thisMeterReading !== 0) {
             uni.showToast({
               title: `第${i + 1}个房间请填写本次表数`,
@@ -689,6 +696,13 @@ export default {
           //   });
           //   return;
           // }
+          if(!item.waterMeterNumber){
+            uni.showToast({
+              title: `请填写水表号`,
+              icon: "none",
+            });
+            return;
+          }
           if (!item.thisMeterReading && item.thisMeterReading !== 0) {
             uni.showToast({
               title: `请填写本次表数`,