From 10dc3923f28c127f869c7bbeb2e413b9ec53ea45 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 10 Apr 2020 08:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E5=9C=A8=E7=9C=81=E5=B8=82=E5=8C=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/package.json                      |  5 +--
 ruoyi-ui/src/views/system/school/index.vue | 38 +++++++++++++---------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index b4292fe53..07bb2bea1 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -46,8 +46,8 @@
     "echarts": "4.2.1",
     "element-ui": "2.13.0",
     "file-saver": "2.0.1",
-    "js-beautify": "^1.10.2",
     "fuse.js": "3.4.4",
+    "js-beautify": "^1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",
     "normalize.css": "7.0.0",
@@ -55,10 +55,11 @@
     "path-to-regexp": "2.4.0",
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",
+    "v-distpicker": "^1.2.2",
     "vue": "2.6.10",
     "vue-count-to": "1.0.13",
-    "vue-quill-editor": "3.0.6",
     "vue-cropper": "0.4.9",
+    "vue-quill-editor": "3.0.6",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vuedraggable": "2.20.0",
diff --git a/ruoyi-ui/src/views/system/school/index.vue b/ruoyi-ui/src/views/system/school/index.vue
index d041fbf35..76326695a 100644
--- a/ruoyi-ui/src/views/system/school/index.vue
+++ b/ruoyi-ui/src/views/system/school/index.vue
@@ -201,24 +201,24 @@
         <el-form-item label="集团下属ID" prop="parentId" v-show="flag1">
           <el-input v-model="form.parentId" placeholder="请输入集团下属id" />
         </el-form-item>
-        <el-form-item label="所在省" prop="province">
+        <!--<el-form-item label="所在省" prop="province">
           <el-input v-model="form.province" placeholder="请输入所在省" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="所在省" prop="provincename">
-          <el-input v-model="form.provincename" placeholder="请输入所在省" />
+          <v-distpicker v-model="form.province" @selected="onSelected"></v-distpicker>
         </el-form-item>
-        <el-form-item label="所在城市" prop="regionid">
+        <!--<el-form-item label="所在城市" prop="regionid">
           <el-input v-model="form.regionid" placeholder="请输入所在城市" />
-        </el-form-item>
-        <el-form-item label="所在城市" prop="regionname">
-          <el-input v-model="form.regionname" placeholder="请输入所在城市" />
-        </el-form-item>
-        <el-form-item label="所在区" prop="area">
+        </el-form-item>-->
+        <!--<el-form-item label="所在城市" prop="regionname">
+          <v-distpicker v-model="form.regionname" @selected="onSelected"></v-distpicker>
+        </el-form-item>-->
+        <!--<el-form-item label="所在区" prop="area">
           <el-input v-model="form.area" placeholder="请输入所在区" />
-        </el-form-item>
-        <el-form-item label="所在区" prop="areaname">
-          <el-input v-model="form.areaname" placeholder="请输入所在区" />
-        </el-form-item>
+        </el-form-item>-->
+        <!--<el-form-item label="所在区" prop="areaname">
+          <v-distpicker v-model="form.areaname" @selected="onSelected"></v-distpicker>
+        </el-form-item>-->
         <el-form-item label="详细地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入详细地址" />
         </el-form-item>
@@ -303,6 +303,7 @@
 </template>
 
 <script>
+import VDistpicker from "v-distpicker";
 import {
   listSchool,
   getSchool,
@@ -316,7 +317,7 @@ export default {
   name: "School",
   data() {
     return {
-      //显示集团属性的标志  测试测试测试
+      //显示集团属性的标志
       // 遮罩层
       loading: true,
       // 选中数组
@@ -384,7 +385,9 @@ export default {
       this.typeOptions = response.data;
     });
   },
-  watch: {},
+  components: {
+    VDistpicker
+  },
   methods: {
     /** 查询幼儿园机构列表 */
     getList() {
@@ -540,6 +543,11 @@ export default {
       } else {
         this.flag1 = false;
       }
+    },
+    onSelected(date) {
+      this.form.province = date.province.value;
+      this.form.regionname = date.regionname.value;
+      this.form.areaname = date.areaname.value;
     }
   }
 };