Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20200617-zlp-1

Browse Source 
多部门切换
视频学习页面 过滤bug
This commit is contained in:
paidaxing444
2020-06-17 17:58:52 +08:00
parent 4b8bf8f5d4
commit 639357f280
17 changed files with 415 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ruoyi-ui/src/views/system/school/index.vue
View File

@ -12,7 +12,12 @@
</el-form-item>
<el-form-item label="幼儿园类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择幼儿园类型" clearable size="small">
<el-option label="请选择字典生成" value />
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="所在省" prop="provincename">
@ -43,21 +48,15 @@
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option label="请选择字典生成" value />
<el-select v-model="queryParams.status" placeholder="状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="approvalTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.approvalTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间"
></el-date-picker>
</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>
@ -169,18 +168,6 @@
<el-form-item label="所在省" prop="provincename">
<v-distpicker v-model="form.provincename" @selected="onSelected"></v-distpicker>
</el-form-item>
<!--<el-form-item label="所在城市" prop="regionid">
<el-input v-model="form.regionid" placeholder="请输入所在城市" />
</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">
<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>
@ -223,18 +210,7 @@
</el-form-item>
<el-form-item label="创建时间" prop="createTime" v-show="false">
<el-input v-model="form.createTime"></el-input>
</el-form-item>
<el-form-item label="审核时间" prop="approvalTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.approvalTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择审核时间"
></el-date-picker>
</el-form-item>
</el-form-item>
<el-form-item label="园所会员性质" prop="isDemonstr">
<el-select v-model="form.isDemonstr" placeholder="请选择">
<el-option
@ -244,10 +220,7 @@
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="营业执照图片" prop="businesslicenseimg">
<el-input v-model="form.businesslicenseimg" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form-item>
<el-form-item label="家长手册发布状态" prop="openBook" v-show="false">
<el-input v-model="form.openBook" placeholder="请输入家长手册发布状态" />
</el-form-item>
@ -271,12 +244,6 @@
placeholder="选择开通截至日期"
></el-date-picker>
</el-form-item>
<el-form-item label="当前学年" prop="dqxn">
<el-input v-model="form.dqxn" placeholder="请输入当前学年" />
</el-form-item>
<el-form-item label="当前学期" prop="dqxq">
<el-input v-model="form.dqxq" placeholder="请输入当前学期" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>

106
ruoyi-ui/src/views/system/user/change/dept/index.vue Normal file
View File

@ -0,0 +1,106 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<el-col :span="24" :xs="24">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>所属园所信息</span>
</div>
<div>
<ul class="list-group list-group-striped">
<li class="list-group-item">
<svg-icon icon-class="user" />用户名称
<div class="pull-right">{{ user.userName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />选择部门
<div class="pull-right" v-for="item in deptsOptions" :key="item.deptId">
<input
type="radio"
name="dept"
:id="item.deptId"
:value="item.deptId"
v-model="checkedValue"
/>
<label :for="item.deptId">{{ item.deptName }}</label>
</div>
</li>
<li class="list-group-item">
<el-button type="primary" size="mini" @click="submit">保存</el-button>
<el-button type="danger" size="mini" @click="close">关闭</el-button>
</li>
</ul>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import { getUserProfile } from "@/api/system/user";
import { getDeptsInfo,changeDept } from "@/api/system/dept";
export default {
name: "changedept",
data() {
return {
checkedValue: null,
oldValue: null,
user: {},
deptsOptions: []
};
},
created() {
this.getUser();
this.getDepts();
},
methods: {
getDepts() {
getDeptsInfo().then(response => {
// console.log("school=" + response.total);
// console.log( response);
if (response.total <= 1) {
} else {
console.log(response);
this.deptsOptions = response.rows;
}
});
},
getUser() {
getUserProfile().then(response => {
this.user = response.data;
this.checkedValue = response.data.dept.deptId;
this.oldValue = response.data.dept.deptId;
});
},
submit() {
if (this.checkedValue == this.oldValue) {
this.msgError("幼儿园无变化");
return;
} else {
//切换岗位
changeDept(this.checkedValue).then(
response => {
if (response.code === 200) {
this.msgSuccess(response.msg);
this.getUser();
this.getDepts();
} else {
this.msgError(response.msg);
}
}
)
}
},
close() {
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({ path: "/index" });
}
}
};
</script>