From 1eb1bd6c6de2cd4b3ecbee68d4b2f7d4c69e0c6b Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Fri, 31 May 2024 11:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E6=9B=B4=E6=94=B9=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/fileprovide/add.html     | 115 ++++++++++--------
 .../templates/system/fileprovide/detail.html  |  62 +++++++++-
 2 files changed, 122 insertions(+), 55 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
index 9982156..ed78a1a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
@@ -7,27 +7,21 @@
     <th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-fileprovide-add">
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">所属地市：</label>
                 <div class="col-sm-8">
-                    <select id="City" name="frameworkId" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in CityList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
+                    <select id="City" name="frameworkId" required class="form-control m-b">
+                        <option value="">请选择市</option>
                     </select>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">所属区县：</label>
                 <div class="col-sm-8">
-                    <select id="Area" name="areaid" v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
+                    <select id="Area" name="areaid" required class="form-control m-b">
+                        <option value="">请选择区</option>
                     </select>
                 </div>
             </div>
@@ -125,48 +119,69 @@
         $("#form-fileprovide-add").validate({
             focusCleanup: true
         });
-        var app = new Vue({
-            el: '#app',
-            data: {
-                CityList: [],
-                AreaList:[],
-                City:'',
-                Area:'',
-                params:{
-                    parentId:'',
-                }
-            },
-            mounted(){
-                // 初始化地市列表
-                this.getCityList();
-                if (this.City){
-                    this.getAreaList()
-                }
-            },
-            methods:{
-                getCityList(){
-                    $.ajax({
-                        url: ctx + "system/area/getSysAreaList",
-                        type: 'GET',
-                        data:this.params ,
-                        success:((res)=>{
-                            this.CityList = res.data
-                        }) ,
+        $(document).ready(function() {
+            // 获取市级数据并填充到城市下拉框
+            $.ajax({
+                url: ctx + "system/area/getSysAreaList",
+                method: 'GET',
+                success: function(res) {
+                    var cities = res.data; // 假设返回的数据中有一个叫做 'cities' 的字段包含市级数据
+                    var $citySelect = $('#City');
+
+                    // 填充城市下拉框
+                    cities.forEach(function(city) {
+                        $citySelect.append($('<option>', {
+                            value: city.id,
+                            text: city.name
+                        }));
                     });
+
+                    // 初始化 select2 插件
+                    $citySelect.select2();
                 },
-                getAreaList(){
-                    this.params.parentId = this.City
-                    $.ajax({
-                        url: ctx + "system/area/getSysAreaList",
-                        type: 'GET',
-                        data:this.params,
-                        success:((res)=>{
-                            this.AreaList = res.data
-                        }) ,
-                    });
+                error: function(err) {
+                    console.error('Failed to load city data:', err);
                 }
-            }
-        })
+            });
+
+            // 监听城市下拉框的变化事件
+            $('#City').on('change', function() {
+                var selectedCityId = $(this).val();
+
+                // 如果未选择城市，则不执行后续操作
+                if (!selectedCityId) return;
+
+                // 根据选中的城市ID发送请求获取对应的区级数据
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    data:{parentId:selectedCityId},
+                    method: 'GET',
+                    success: function(res) {
+                        var areas = res.data; // 假设返回的数据中有一个叫做 'areas' 的字段包含区级数据
+                        var $areaSelect = $('#Area');
+
+                        // 清空区级下拉框并填充数据
+                        $areaSelect.empty().append($('<option>', {
+                            value: '',
+                            text: '请选择区'
+                        }));
+
+                        areas.forEach(function(area) {
+                            $areaSelect.append($('<option>', {
+                                value: area.id,
+                                text: area.name
+                            }));
+                        });
+
+                        // 更新 select2 插件
+                        $areaSelect.select2();
+                    },
+                    error: function(err) {
+                        console.error('Failed to load area data:', err);
+                    }
+                });
+            });
+        });
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-fileprovide-add').serialize());
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
index d8d94d3..5131b48 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
@@ -11,7 +11,7 @@
     }
 </style>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
     <form class="form-horizontal m" id="form-fileprovide-edit" th:object="${tdFileProvide}">
         <input name="fileId" th:field="*{fileId}" type="hidden">
         <div class="form-group">
@@ -21,15 +21,25 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">所属市州：</label>
+            <label class="col-sm-3 control-label is-required">所属地市：</label>
             <div class="col-sm-8">
-                <input name="frameworkId" readonly th:field="*{frameworkId}" class="form-control" type="text">
+                <select id="City" name="frameworkId" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
+                    <option value="">请选择</option>
+                    <option v-for="option in CityList" :value="option.id" :key="option.id">
+                        {{ option.name }}
+                    </option>
+                </select>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">所属区县：</label>
+            <label class="col-sm-3 control-label is-required">所属区县：</label>
             <div class="col-sm-8">
-                <input name="areaid" readonly th:field="*{areaid}" class="form-control" type="text">
+                <select id="Area" name="areaid" disabled required v-model="Area" class="form-control m-b">
+                    <option value="">请选择</option>
+                    <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                        {{ option.name }}
+                    </option>
+                </select>
             </div>
         </div>
         <div class="form-group">
@@ -124,6 +134,48 @@
     $("#form-fileprovide-edit").validate({
         focusCleanup: true
     });
+    var app = new Vue({
+        el: '#app',
+        data: {
+            CityList: [],
+            AreaList:[],
+            City:[[${tdFileProvide.frameworkId}]],
+            Area:[[${tdFileProvide.areaid}]],
+            params:{
+                parentId:'',
+            }
+        },
+        mounted(){
+            // 初始化地市列表
+            this.getCityList();
+            if (this.City){
+                this.getAreaList()
+            }
+        },
+        methods:{
+            getCityList(){
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params ,
+                    success:((res)=>{
+                        this.CityList = res.data
+                    }) ,
+                });
+            },
+            getAreaList(){
+                this.params.parentId = this.City
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params,
+                    success:((res)=>{
+                        this.AreaList = res.data
+                    }) ,
+                });
+            }
+        }
+    })
     var updateDate = document.querySelector('#updateDate').value;
     var provideDate = document.querySelector('#provideDate').value;
     if (updateDate != null && updateDate !== ''){
