提交 466138d1 编写于 作者: 钟一霄's avatar 钟一霄

用户管理添加角色时新增[系部干事]院系选择,新增编辑功能;值班安排模板导出新增年月选择,新增推送功能

上级 3cdb3639
......@@ -61,11 +61,19 @@ export function GetUserList(data) {
});
}
export function GetUserInfo(data) {
export function GetUserInfo(id) {
// 获取用户详细
return request({
url: '/api/UserInfo/api/UserInfo/GetUserInfo',
url: `/api/UserInfo/api/UserInfo/GetUserInfo?id=${id}`,
method: 'get',
});
}
export function UserUpdateSave(data) {
// 修改用户
return request({
url: '/api/UserInfo/api/UserInfo/UserUpdateSave',
method: 'post',
data
});
}
......@@ -306,12 +314,11 @@ export function WatchDataExport(data) {
});
}
export function WatchImportTemplate(data) {
export function WatchImportTemplate(year, month) {
// 值班模版导出
return request({
url: '/api/Watch/api/Watch/WatchImportTemplate',
url: `/api/Watch/api/Watch/WatchImportTemplate?year=${year}&month=${month}`,
method: 'get',
data
});
}
......@@ -324,6 +331,15 @@ export function WatchImport(data) {
});
}
export function WatchSendMeg(data) {
// 量发送消息提醒
return request({
url: '/api/Watch/api/Watch/WatchSendMeg',
method: 'post',
data
});
}
export function GetWatchHourTime(data) {
// 获取值班时段(选择框)
return request({
......
此差异已折叠。
......@@ -34,16 +34,23 @@
ok-text="确认"
:mask-closable="false"
>
<Form :model="formTop" :label-width="80" ref="updateRoleValue">
<Form :model="formTop" :label-width="100" ref="updateRoleValue">
<!-- :rules="ruleValidate"-->
<FormItem label="值班类型" prop="input1">
<Input v-model="formTop.input1"></Input>
</FormItem>
<FormItem label="值班时间" prop="input2">
<Select v-model="formTop.input3" placeholder="">
<Option v-for="item in watchHourTimeList" :key="item.id" :value="item.id">
{{ item.name }}
</Option>
</Select>
</FormItem>
<FormItem label="值班类型备注" prop="input2">
<Input v-model="formTop.input2"></Input>
</FormItem>
<FormItem label="签到类型">
<Select v-model="formTop.type">
<Select v-model="formTop.type" placeholder="">
<Option :value="0">免打卡</Option>
<Option :value="1">无定位打卡</Option>
<Option :value="2">定位拍照打卡</Option>
......@@ -92,11 +99,13 @@
data() {
//这里存放数据",
return {
watchHourTimeList: [],
modal: false,
formTop: {
id: '',
input1: '',
input2: '',
input3: '',
type: '',
},
page_size: 10,
......@@ -113,6 +122,10 @@
title: '值班类型',
key: 'watchtypename',
},
{
title: '值班时间',
key: 'watchhourname',
},
{
title: '类型备注',
key: 'watchtype_remark',
......@@ -148,6 +161,8 @@
let data = {
"watchtypename": this.input.input1,
"watchtype_remark": this.input.input2,
"watchhour_id": this.input.input3,
"sign_type": this.input.type,
}
const res = await api.WatchTypeSave(data)
await this.GetWatchTypeList()
......@@ -172,6 +187,7 @@
"watchtypeid": this.formTop.id,
"watchtypename": this.formTop.input1,
"watchtype_remark": this.formTop.input2,
"watchhour_id": this.formTop.input3,
"sign_type": this.formTop.type,
}
const res = await api.WatchTypeSave(data)
......@@ -183,6 +199,7 @@
this.formTop.id = e.watchtypeid;
this.formTop.input1 = e.watchtypename;
this.formTop.input2 = e.watchtype_remark
this.formTop.input3 = e.watchhour_id
this.formTop.type = e.sign_type
this.modal = true
},
......@@ -271,6 +288,11 @@
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
this.GetWatchTypeList()
// 获取值班时段(选择框)
api.GetWatchHourTime().then(res => {
// console.log('获取值班时段(选择框)', res)
this.watchHourTimeList = res.response
})
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
......
......@@ -56,9 +56,23 @@
<FormItem v-if="showComponent.type" label="值班名称" prop="input1">
<Input v-model="formTop.input1"></Input>
</FormItem>
<FormItem v-if="showComponent.type" label="值班时间" prop="input3">
<Select v-model="formTop.input3" placeholder="">
<Option v-for="item in watchHourTimeList" :key="item.id" :value="item.id">
{{ item.name }}
</Option>
</Select>
</FormItem>
<FormItem v-if="showComponent.type" label="值班备注" prop="input2">
<Input v-model="formTop.input2"></Input>
</FormItem>
<FormItem v-if="showComponent.type" label="签到类型">
<Select v-model="formTop.type" placeholder="">
<Option :value="0">免打卡</Option>
<Option :value="1">无定位打卡</Option>
<Option :value="2">定位拍照打卡</Option>
</Select>
</FormItem>
<!--校区-->
<FormItem v-if="showComponent.campus" label="校区名称" prop="input1">
<Input v-model="formTop.input1"></Input>
......@@ -104,6 +118,7 @@
</template>
<script>
import * as api from '@/api/lezRequest.js'
import watchType from '@/pages/systemConfiguration/component/initialComponent/watchType.vue'
import Campus from '@/pages/systemConfiguration/component/initialComponent/Campus.vue'
import MessageConfig from '@/pages/systemConfiguration/component/initialComponent/MessageConfig.vue'
......@@ -125,6 +140,7 @@
//这里存放数据",
return {
// spinShow:true,
watchHourTimeList: [],
showComponent: {
type: true,
time: false,
......@@ -139,6 +155,8 @@
formTop: { //值班类型数据对象
input1: '',
input2: '',
input3: '',
type: '',
flag: false, // 增添modal确认按钮 flag
searchFlag: false, // 点击查找 按钮flag
timeName1: ''
......@@ -205,6 +223,8 @@
this.searchValue = ''
this.formTop.input1 = ''
this.formTop.input2 = ''
this.formTop.input3 = ''
this.formTop.type = ''
this.formTop.timeName1 = ''
break;
case 'info':
......@@ -216,6 +236,8 @@
this.searchValue = ''
this.formTop.input1 = ''
this.formTop.input2 = ''
this.formTop.input3 = ''
this.formTop.type = ''
this.formTop.timeName1 = ''
break;
......@@ -228,6 +250,8 @@
this.searchValue = ''
this.formTop.input1 = ''
this.formTop.input2 = ''
this.formTop.input3 = ''
this.formTop.type = ''
this.formTop.timeName1 = ''
break;
case 'campus':
......@@ -239,6 +263,8 @@
this.searchValue = ''
this.formTop.input1 = ''
this.formTop.input2 = ''
this.formTop.input3 = ''
this.formTop.type = ''
this.formTop.timeName1 = ''
break;
case 'attendance':
......@@ -250,6 +276,8 @@
this.searchValue = ''
this.formTop.input1 = ''
this.formTop.input2 = ''
this.formTop.input3 = ''
this.formTop.type = ''
this.formTop.timeName1 = ''
break;
}
......@@ -270,7 +298,11 @@
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
// 获取值班时段(选择框)
api.GetWatchHourTime().then(res => {
// console.log('获取值班时段(选择框)', res)
this.watchHourTimeList = res.response
})
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
......
......@@ -26,6 +26,7 @@
</template>
<template #action="{row}">
<!-- <Button type="primary" size="small" @click="update(row)">修改</Button>-->
<Button type="primary" size="small" @click="roleUpdate(row)" style="margin-left: 10px;">修改</Button>
<Button type="error" size="small" @click="roleDelete(row)" style="margin-left: 10px;">删除</Button>
</template>
......@@ -82,7 +83,7 @@
:width="800"
>
<div style="display: flex;">
<div style="display: flex; flex-wrap: wrap;">
<CheckboxGroup style="margin-bottom: 15px" v-model="modalSelect.checkboxValue">
<Checkbox v-for="(item,index) in modalSelect.rList" :label="item.id" :key="index"
border><span>{{ item.name }}</span></Checkbox>
......@@ -95,6 +96,18 @@
</Button>
<Button type="text" @click="searchReset" style="margin-left: 10px;">重置</Button>
</div>
<!-- 注意!系部选择框根据[系部干事]是否勾选显示,[系部干事]id不为定值,部署时要跟后端确定改id -->
<!-- watch中、编辑Modal中也有使用到这个id的,注意修改 -->
<div
v-if="modalSelect.checkboxValue.some(a => a == '8169147c-e4b1-41c0-9464-92bf446ec049')"
style="width: 100%; margin-bottom: 15px;">
<span>系部:</span>
<Select style="width: 600px" v-model="modalSelect.deptSlcList" multiple filterable placeholder="">
<Option v-for="item in deptList" :key="item.value" :value="item.value">
{{ item.lable }}
</Option>
</Select>
</div>
</div>
<Table :columns="modalSelect.column" :data="modalSelect.tList" @on-select-all="modalTableSelectAll"
......@@ -120,6 +133,32 @@
</template>
</Modal>
<!-- 编辑Modal -->
<Modal
v-model="editRoleModalShow"
title="编辑教师权限"
:mask-closable="false"
@on-cancel="editCancel">
<CheckboxGroup style="margin-bottom: 15px" v-model="modalSelect.checkboxValue">
<Checkbox v-for="(item,index) in modalSelect.rList" :label="item.id" :key="index"
border><span>{{ item.name }}</span></Checkbox>
</CheckboxGroup>
<div
v-if="modalSelect.checkboxValue.some(a => a == '8169147c-e4b1-41c0-9464-92bf446ec049')"
style="width: 100%; margin-bottom: 15px;">
<span>系部:</span>
<Select style="width: 445px" v-model="modalSelect.deptSlcList" multiple filterable placeholder="">
<Option v-for="item in deptList" :key="item.value" :value="item.value">
{{ item.lable }}
</Option>
</Select>
</div>
<template #footer>
<Button type="text" @click="editCancel" style="margin-left: 10px;">取消</Button>
<Button type="primary" @click="editSubmit" style="margin-left: 10px;">确认</Button>
</template>
</Modal>
</div>
</template>
......@@ -135,6 +174,10 @@
data() {
//这里存放数据",
return {
// 系部列表
deptList: [],
// 编辑时选中的userid
userid: '',
modalSelect: {
pageKey: 1,
checkboxValue: [],
......@@ -157,6 +200,8 @@
key: 'number'
}
],
// 已选系部列表
deptSlcList: [],
tList: [],
rList: [],
tid: [],
......@@ -195,10 +240,22 @@
// align: 'center',
},
{
title: '工号',
key: 'card_name'
},
{
title: '用户名称',
key: 'name'
},
{
title: '部门',
key: 'dept'
},
{
title: '电话',
key: 'mobile'
},
{
title: '权限名称',
slot: 'role_name',
......@@ -215,9 +272,12 @@
title: '操作',
slot: 'action',
align: 'center',
width: 150,
}
],
data: []
data: [],
// 编辑权限Modal显示
editRoleModalShow: false,
};
},
//监听属性 类似于data概念",
......@@ -233,6 +293,10 @@
watch: {
"modalSelect.checkboxValue"(newValue, oldValue) {
console.log(newValue)
// checkbox没选中[系部干事]时清空系部选择框的值
if (!newValue.some(a => a == '8169147c-e4b1-41c0-9464-92bf446ec049')) {
this.modalSelect.deptSlcList = []
}
},
'formTop.input1'(newValue, oldValue) {
console.log(newValue)
......@@ -277,6 +341,7 @@
let data = {
tid: this.modalSelect.tid,
role: this.modalSelect.checkboxValue,
dept_id: this.modalSelect.deptSlcList,
}
const res = await api.UserInfoSave(data)
this.modalSelect.modal = false
......@@ -368,6 +433,47 @@
const res = await api.UserInfoDel(data)
await this.GetUserList()
},
// 编辑用户
roleUpdate(row) {
// console.log('编辑用户', row)
this.editRoleModalShow = true
this.userid = row.userid
api.GetUserInfo(this.userid).then(res => {
// console.log('编辑用户res', res)
this.modalSelect.checkboxValue = res.response.roleid.split('|')
this.modalSelect.deptSlcList = res.response.admin_dept_id.split('|')
})
},
// 编辑用户提交
editSubmit() {
let data = {
userid: this.userid,
role: this.modalSelect.checkboxValue,
dept_id: this.modalSelect.deptSlcList
}
this.$Modal.confirm({
title: '提示',
content: '是否确认修改?',
loading: true,
onOk: () => {
api.UserUpdateSave(data).then(res => {
console.log('编辑用户提交res', res)
if (res.code == 1) {
this.$Message.success({content: res.response, background: true})
this.$Modal.remove()
this.editRoleModalShow = false
this.GetUserList()
}
})
}
})
},
// 编辑用户Modal取消
editCancel() {
this.editRoleModalShow = false
this.modalSelect.checkboxValue = []
this.modalSelect.deptSlcList = []
},
async roleDelete(e) {
//删除用户
this.formTop.roleId = e.userid;
......@@ -468,6 +574,14 @@
mounted() {
this.GetUserList()
this.getTorR()
// 获取值班部门(选择框)
api.GetWatchDepSelect().then(res => {
// console.log('获取值班部门', res)
this.deptList = res.response.map(a => {
return {value: a.id, lable: a.name}
})
})
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
......
......@@ -14,16 +14,6 @@ import Cookies from 'js-cookie';
Vue.use(VueRouter);
function getUrlKey(name) {
return (
decodeURIComponent(
(new RegExp("[?|&]" + name + "=" + "([^&;]+?)(&|#|;|$)").exec(
location.href
) || [, ""])[1].replace(/\+/g, "%20")
) || null
);
}
// 导出路由 在 main.js 里使用
const router = new VueRouter({
routes,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或