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 | 147 +++++++++++++++++++++++++++++++++----------------
1 files changed, 99 insertions(+), 48 deletions(-)
diff --git a/src/views/basics/school/index.vue b/src/views/basics/school/index.vue
index bfab7b4..7f1884b 100644
--- a/src/views/basics/school/index.vue
+++ b/src/views/basics/school/index.vue
@@ -19,47 +19,47 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鐪佷唤" prop="provinceCode">
- <el-select v-model="queryParams.provinceCode" placeholder="璇烽�夋嫨鐪佷唤" clearable size="small"
- @change="provinceQueryChange">
- <el-option
- v-for="item in provinceList"
- :key="item.provinceCode"
- :label="item.provinceName"
- :value="item.provinceCode"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍩庡競" prop="cityCode">
- <el-select v-model="queryParams.cityCode" placeholder="璇烽�夋嫨鐪佷唤" clearable size="small">
- <el-option
- v-for="item in cityList"
- :key="item.cityCode"
- :label="item.cityName"
- :value="item.cityCode"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍔炲灞傛" prop="schoolRunLevel">
- <el-select v-model="queryParams.schoolRunLevel" placeholder="璇烽�夋嫨鍔炲灞傛" clearable size="small">
- <el-option
- v-for="dict in dict.type.DICT105"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="瀛︾鑼冨洿" prop="disciplineScope">
- <el-select v-model="queryParams.disciplineScope" placeholder="璇烽�夋嫨瀛︾鑼冨洿" clearable size="small">
- <el-option
- v-for="dict in dict.type.DICT106"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
+ <!--<el-form-item label="鐪佷唤" prop="provinceCode">-->
+ <!--<el-select v-model="queryParams.provinceCode" placeholder="璇烽�夋嫨鐪佷唤" clearable size="small"-->
+ <!--@change="provinceQueryChange">-->
+ <!--<el-option-->
+ <!--v-for="item in provinceList"-->
+ <!--:key="item.provinceCode"-->
+ <!--:label="item.provinceName"-->
+ <!--:value="item.provinceCode"-->
+ <!--/>-->
+ <!--</el-select>-->
+ <!--</el-form-item>-->
+ <!--<el-form-item label="鍩庡競" prop="cityCode">-->
+ <!--<el-select v-model="queryParams.cityCode" placeholder="璇烽�夋嫨鐪佷唤" clearable size="small">-->
+ <!--<el-option-->
+ <!--v-for="item in cityList"-->
+ <!--:key="item.cityCode"-->
+ <!--:label="item.cityName"-->
+ <!--:value="item.cityCode"-->
+ <!--/>-->
+ <!--</el-select>-->
+ <!--</el-form-item>-->
+ <!--<el-form-item label="鍔炲灞傛" prop="schoolRunLevel">-->
+ <!--<el-select v-model="queryParams.schoolRunLevel" placeholder="璇烽�夋嫨鍔炲灞傛" clearable size="small">-->
+ <!--<el-option-->
+ <!--v-for="dict in dict.type.DICT105"-->
+ <!--:key="dict.value"-->
+ <!--:label="dict.label"-->
+ <!--:value="dict.value"-->
+ <!--/>-->
+ <!--</el-select>-->
+ <!--</el-form-item>-->
+ <!--<el-form-item label="瀛︾鑼冨洿" prop="disciplineScope">-->
+ <!--<el-select v-model="queryParams.disciplineScope" placeholder="璇烽�夋嫨瀛︾鑼冨洿" clearable size="small">-->
+ <!--<el-option-->
+ <!--v-for="dict in dict.type.DICT106"-->
+ <!--:key="dict.value"-->
+ <!--:label="dict.label"-->
+ <!--:value="dict.value"-->
+ <!--/>-->
+ <!--</el-select>-->
+ <!--</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -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="鎿嶄綔" 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"
@@ -151,6 +165,7 @@
<el-button
size="mini"
type="text"
+ class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['oa:school:remove']"
@@ -169,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="璇疯緭鍏ュ鏍′唬鐮�"/>
@@ -226,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
@@ -295,6 +326,9 @@
disciplineScope: [
{required: true, message: "瀛︾鑼冨洿涓嶈兘涓虹┖", trigger: "change"}
],
+ remarks: [
+ {max: 128, message: '鏈�澶氳緭鍏�128涓瓧绗�', trigger: 'blur' }
+ ]
},
// 鐪佷唤
provinceList: [],
@@ -303,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();
},
@@ -381,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 = "淇敼瀛︽牎";
});
@@ -413,7 +455,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎瀛︽牎缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm(`鏄惁纭鍒犻櫎瀛︽牎浠ｇ爜涓�${row.code}鐨勫鏍★紵`).then(() => {
this.loading = true;
return delSchool(ids);
}).then(() => {
@@ -448,7 +490,6 @@
},
// 鏌ヨ鏉′欢鐪佷唤鏀瑰彉
provinceQueryChange(v) {
- this.queryParams.cityCode = undefined
this.getCity(v).then(res => {
this.cityList = res
})
@@ -459,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