From 1c01e669cca92f94eea5d1a73ff60f3bd34b9079 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期一, 23 五月 2022 16:38:27 +0800
Subject: [PATCH] BUG修改

---
 src/views/basics/school/index.vue |   64 ++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/views/basics/school/index.vue b/src/views/basics/school/index.vue
index 7c164e1..7f1884b 100644
--- a/src/views/basics/school/index.vue
+++ b/src/views/basics/school/index.vue
@@ -137,9 +137,23 @@
           <dict-tag :options="dict.type.DICT106" :value="scope.row.disciplineScope"/>
         </template>
       </el-table-column>
-      <el-table-column label="澶囨敞" align="center" prop="remarks"/>
-      <el-table-column label="鎿嶄綔" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
+<!--      <el-table-column label="澶囨敞" align="center" prop="remarks"/>-->
+      <el-table-column label="鎿嶄綔" fixed="right" width="220" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-wind-power"
+              @click="handleOrganization(scope.row)"
+          >鏈烘瀯
+          </el-button>
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-office-building"
+              @click="handleBuild(scope.row)"
+          >寤虹瓚
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -170,7 +184,7 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀瑰鏍″璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="瀛︽牎浠ｇ爜" prop="code">
           <el-input v-model="form.code" placeholder="璇疯緭鍏ュ鏍′唬鐮�"/>
@@ -227,17 +241,33 @@
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
-    </el-dialog>
+    </Dialog>
+
+    <!-- 寤虹瓚 -->
+    <el-drawer title="寤虹瓚鍗曞厓" :visible.sync="buildOpen" size="50%" :append-to-body="true" :destroy-on-close="true">
+      <building :schoolId="id"></building>
+    </el-drawer>
+
+    <!-- 缁勭粐鏈烘瀯 -->
+    <el-drawer title="缁勭粐鏈烘瀯" :visible.sync="organizationOpen" size="50%" :append-to-body="true" :destroy-on-close="true">
+      <organization :schoolId="id"></organization>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 import {listSchool, getSchool, delSchool, addSchool, updateSchool} from "@/api/oa/school";
 import {listProvince, listCity} from "@/api/common/common";
+import building from '../building'
+import organization from '../organization'
 
 export default {
   name: "School",
   dicts: ['DICT105', 'DICT106'],
+  components: {
+    building,
+    organization
+  },
   data() {
     return {
       // 鎸夐挳loading
@@ -296,6 +326,9 @@
         disciplineScope: [
           {required: true, message: "瀛︾鑼冨洿涓嶈兘涓虹┖", trigger: "change"}
         ],
+        remarks: [
+          {max: 128, message: '鏈�澶氳緭鍏�128涓瓧绗�', trigger: 'blur' }
+        ]
       },
       // 鐪佷唤
       provinceList: [],
@@ -304,12 +337,16 @@
       // 鐪佷唤
       provinceFormList: [],
       // 鍩庡競
-      cityFormList: []
+      cityFormList: [],
+      buildOpen: false,
+      organizationOpen: false,
+      id: undefined
     };
   },
   created() {
     this.getProvince().then(res => {
       this.provinceList = res
+      this.provinceFormList = res
     })
     this.getList();
   },
@@ -382,6 +419,10 @@
       getSchool(id).then(response => {
         this.loading = false;
         this.form = response.data;
+        listCity(this.form.provinceCode)
+          .then(res => {
+            this.cityFormList = res.data
+          })
         this.open = true;
         this.title = "淇敼瀛︽牎";
       });
@@ -414,7 +455,7 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
+      this.$modal.confirm(`鏄惁纭鍒犻櫎瀛︽牎浠ｇ爜涓�${row.code}鐨勫鏍★紵`).then(() => {
         this.loading = true;
         return delSchool(ids);
       }).then(() => {
@@ -449,7 +490,6 @@
     },
     // 鏌ヨ鏉′欢鐪佷唤鏀瑰彉
     provinceQueryChange(v) {
-      this.queryParams.cityCode = undefined
       this.getCity(v).then(res => {
         this.cityList = res
       })
@@ -460,6 +500,16 @@
       this.getCity(v).then(res => {
         this.cityFormList = res
       })
+    },
+    // 寤虹瓚
+    handleBuild(r) {
+      this.id = r.id;
+      this.buildOpen = true;
+    },
+    // 缁勭粐鏈烘瀯
+    handleOrganization(r) {
+      this.id = r.id;
+      this.organizationOpen = true;
     }
   }
 };

--
Gitblit v1.9.1