From 93aaffd3d8cfd5f937348a1ce144f8f5e19b6e1d Mon Sep 17 00:00:00 2001
From: HUANGBANGLIN <kj11553253@gmail.com>
Date: Tue, 30 Sep 2025 16:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B0=E5=BB=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E7=9A=84=E6=97=B6=E5=80=99=E5=87=BA=E7=8E=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/admin/region/index.aspx | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/web/admin/region/index.aspx b/web/admin/region/index.aspx
index 37975a6..c3f1480 100644
--- a/web/admin/region/index.aspx
+++ b/web/admin/region/index.aspx
@@ -15,17 +15,16 @@
             <i class="mdi mdi-arrow-collapse-all"></i> 全部收起
          </button>
     </nav>
-    <nav v-if="form && selectedType==null">
+    <nav v-if="createRegionFlag">
         <button class="btn btn-primary me-2" @click="saveRegion" type="button">
             <i class="bi bi-save me-1"></i> 儲存區域資料
         </button>
     </nav>
-    <nav class="btn-group mb-2 ps-3 pe-3" role="group" v-if="form && selectedType=='region'">
-
-        <button class="btn btn-primary me-2" @click="saveRegion" type="button">
-            <i class="bi bi-save me-1"></i> 儲存區域資料
-        </button>
+    <nav class="btn-group mb-2 ps-3 pe-3" role="group" v-if="form && selectedType=='region' && !createRegionFlag">
         <div  v-if="selectedRegionId">
+            <button class="btn btn-primary me-2" @click="saveRegion" type="button">
+                <i class="bi bi-save me-1"></i> 儲存區域資料1
+            </button>
             <button class="btn btn-success me-2" @click="createSubRegion" type="button" >
                 <i class="mdi mdi-arrow-down-right"></i> 新增下層區域
             </button>
@@ -517,6 +516,7 @@
                     regionTypes: [],
                     currentSelectRegion: null,
                     currentSelectRoom: null,
+                    createRegionFlag: false,
                     form: {
                         uuid: null,
                         name: '',
@@ -636,6 +636,8 @@
                     this.disabledParentOptions = [];
                     this.currentSelectRegion = null;
                     this.currentSelectRoom = null;
+                    this.createRegionFlag = true;
+                    this.selectedType = null;
                 },
                 createSubRegion() {
                     if (!this.selectedRegionId) return;
@@ -658,17 +660,18 @@
                         return;
                     }
                     const url = this.form.uuid
-                        ? HTTP_HOST + '/api/region/update'
-                        : HTTP_HOST + '/api/region/create';
+                        ? HTTP_HOST + 'api/region/update'
+                        : HTTP_HOST + 'api/region/create';
 
                     axios.post(url, this.form)
                         .then((res) => {
                             //alert('儲存成功');
                             this.loadRegions();
                             //this.newRegion();
-                            this.form.uuid = res.data.uuid;
-                            this.selectedRegionId = res.data.uuid;
+                            this.form.uuid = res.data.id;
+                            this.selectedRegionId = res.data.id;
                             this.currentSelectRegion = JSON.parse(JSON.stringify(this.form));
+                            this.createRegionFlag = false;
                             this.$refs.messageModal.open({
                                 title: "更新",
                                 message: "更新成功",
@@ -1000,7 +1003,16 @@
 
             },
             watch: {
-
+                currentSelectRegion(newVal) {
+                    if (newVal !== null) {
+                        this.createRegionFlag = false;
+                    }
+                },
+                currentSelectRoom(newVal) {
+                    if (newVal !== null) {
+                        this.createRegionFlag = false;
+                    }
+                }
             },
             mounted() {
                 this.loadRegions();