提交 2864f2d4 编写于 作者: 刘英杰's avatar 刘英杰

优化loading、弹窗

上级 cc29572f
...@@ -15,40 +15,12 @@ ...@@ -15,40 +15,12 @@
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
<Table :columns="columns" :data="data"> <Table :columns="columns" :data="data" :loading="loading">
<template #action="{row}"> <template #action="{row}">
<Button type="primary" size="small" @click="update(row)">修改</Button> <Button type="primary" size="small" @click="update(row)">修改</Button>
<Button type="error" size="small" @click="Delete(row)" style="margin-left: 10px;">删除</Button> <Button type="error" size="small" @click="Delete(row)" style="margin-left: 10px;">删除</Button>
<Modal
v-model="modal"
title="值班类型"
@on-ok="modalOk(row)"
cancel-text="取消"
ok-text="确认"
:mask-closable="false"
>
<Form :model="formTop" :label-width="80" ref="updateRoleValue">
<!-- :rules="ruleValidate"-->
<FormItem label="区间名称" prop="input1">
<Input v-model="formTop.timeName"></Input>
</FormItem>
<FormItem label="时间" prop="input2">
<TimePicker @on-change="selectTileValue" format="HH:mm" type="timerange" placement="bottom-end"
placeholder="Select time" style="width: 100%"/>
</FormItem>
<!-- <FormItem label="选择教师" prop="input2" >-->
<!-- <Select v-model="teacherSelectCurrentValue" filterable placeholder="请选择或搜索...">-->
<!-- <Option v-for="item in cityTeacherList" :value="item.id" :key="item.id" >{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="选择权限" prop="input2" >-->
<!-- <Select v-model="roleSelectCurrentValue" multiple >-->
<!-- <Option v-for="item in cityRoleList" :value="item.id" :key="item.id">{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
</Form>
</Modal>
</template> </template>
</Table> </Table>
<div style="width: 100%;height: 70px;display: flex;align-items: center;"> <div style="width: 100%;height: 70px;display: flex;align-items: center;">
...@@ -63,12 +35,41 @@ ...@@ -63,12 +35,41 @@
@on-page-size-change="currentPageCount" @on-page-size-change="currentPageCount"
/> />
</div> </div>
<Modal
v-model="modal"
title="值班类型"
@on-ok="modalOk"
cancel-text="取消"
ok-text="确认"
:mask-closable="false"
>
<Form :model="formTop" :label-width="80" ref="updateRoleValue">
<!-- :rules="ruleValidate"-->
<FormItem label="区间名称" prop="input1">
<Input v-model="formTop.timeName"></Input>
</FormItem>
<FormItem label="时间" prop="input2">
<TimePicker @on-change="selectTileValue" format="HH:mm" type="timerange" placement="bottom-end"
placeholder="请选择时间" style="width: 100%"/>
</FormItem>
<!-- <FormItem label="选择教师" prop="input2" >-->
<!-- <Select v-model="teacherSelectCurrentValue" filterable placeholder="请选择或搜索...">-->
<!-- <Option v-for="item in cityTeacherList" :value="item.id" :key="item.id" >{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="选择权限" prop="input2" >-->
<!-- <Select v-model="roleSelectCurrentValue" multiple >-->
<!-- <Option v-for="item in cityRoleList" :value="item.id" :key="item.id">{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
</Form>
</Modal>
</div> </div>
</template> </template>
<script> <script>
import * as hooks from '../../../../hooks/index'
import * as api from '../../../../api/lezRequest' import * as api from '../../../../api/lezRequest'
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等) //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》'; //例如:import 《组件名称》 from '《组件路径》';
...@@ -80,6 +81,7 @@ ...@@ -80,6 +81,7 @@
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
loading: false,
modal: false, modal: false,
formTop: { formTop: {
id: '', id: '',
...@@ -158,30 +160,35 @@ ...@@ -158,30 +160,35 @@
this.formTop.input2 = e[1] this.formTop.input2 = e[1]
console.log("🚀🚀🚀,", e[1]) console.log("🚀🚀🚀,", e[1])
}, },
async modalOk() { modalOk() {
let data = { hooks.myEncapsulationFunction(async () => {
"watchhourid": this.formTop.id, let data = {
"watchhourname": this.formTop.timeName, "watchhourid": this.formTop.id,
"watchhour_start_time": this.formTop.input1, "watchhourname": this.formTop.timeName,
"watchhour_end_time": this.formTop.input2, "watchhour_start_time": this.formTop.input1,
} "watchhour_end_time": this.formTop.input2,
const res = await api.WatchHourSave(data) }
const res = await api.WatchHourSave(data)
this.GetWatchHourList() await this.GetWatchHourList()
return res
})
}, },
update(e) { update(e) {
console.log(e)
this.formTop.id = e.watchhourid; this.formTop.id = e.watchhourid;
this.formTop.timeName = e.watchhourname; this.formTop.timeName = e.watchhourname;
this.modal = true this.modal = true
}, },
async DeleteAction() { async DeleteAction() {
let data = { hooks.myEncapsulationFunction(async () => {
id: this.formTop.id let data = {
} id: this.formTop.id
const res = await api.WatchHourDel(data) }
this.GetWatchHourList() const res = await api.WatchHourDel(data)
await this.GetWatchHourList()
return res
})
}, },
Delete(e) { Delete(e) {
this.formTop.id = e.watchhourid this.formTop.id = e.watchhourid
...@@ -232,16 +239,20 @@ ...@@ -232,16 +239,20 @@
} }
}, },
async GetWatchHourList(searchValue = '') { async GetWatchHourList(searchValue = '') {
this.$Spin.show();
let data = { hooks.getInitListRequest(async () => {
condition: this.searchValue, this.loading = true
page_size: this.page_size, let data = {
page_index: this.page_index, condition: this.searchValue,
} page_size: this.page_size,
const res = await api.GetWatchHourList(data) page_index: this.page_index,
this.data = res.response.data }
this.total = res.response.data_count const res = await api.GetWatchHourList(data)
this.publicMessage(res) this.data = res.response.data
this.total = res.response.data_count
this.loading = false
})
} }
}, },
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载 //生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
<Table :columns="columns" :data="data"> <Table :columns="columns" :data="data" :loading="loading">
<!-- 签到类型 --> <!-- 签到类型 -->
<template #sign_type="{ row }"> <template #sign_type="{ row }">
<span v-if="row.sign_type == 0">免打卡</span> <span v-if="row.sign_type == 0">免打卡</span>
...@@ -26,53 +26,11 @@ ...@@ -26,53 +26,11 @@
<template #action="{row}"> <template #action="{row}">
<Button type="primary" size="small" @click="update(row)">修改</Button> <Button type="primary" size="small" @click="update(row)">修改</Button>
<Button type="error" size="small" @click="Delete(row)" style="margin-left: 10px;">删除</Button> <Button type="error" size="small" @click="Delete(row)" style="margin-left: 10px;">删除</Button>
<Modal
v-model="modal"
title="值班类型"
@on-ok="modalOk(row)"
cancel-text="取消"
ok-text="确认"
:mask-closable="false"
>
<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" placeholder="">
<Option :value="0">免打卡</Option>
<Option :value="1">无定位打卡</Option>
<Option :value="2">定位拍照打卡</Option>
</Select>
</FormItem>
<!-- <FormItem label="选择教师" prop="input2" >-->
<!-- <Select v-model="teacherSelectCurrentValue" filterable placeholder="请选择或搜索...">-->
<!-- <Option v-for="item in cityTeacherList" :value="item.id" :key="item.id" >{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="选择权限" prop="input2" >-->
<!-- <Select v-model="roleSelectCurrentValue" multiple >-->
<!-- <Option v-for="item in cityRoleList" :value="item.id" :key="item.id">{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
</Form>
</Modal>
</template> </template>
</Table> </Table>
<div style="width: 100%;height: 70px;display: flex;align-items: center;"> <div style="width: 100%;height: 70px;display: flex;align-items: center;">
<Page show-total <Page show-total
show-sizer show-sizer
show-elevator show-elevator
:total="total" :total="total"
...@@ -82,13 +40,55 @@ ...@@ -82,13 +40,55 @@
@on-page-size-change="currentPageCount" @on-page-size-change="currentPageCount"
/> />
</div> </div>
<Modal
v-model="modal"
title="值班类型"
@on-ok="modalOk"
cancel-text="取消"
ok-text="确认"
:mask-closable="false"
>
<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" placeholder="">
<Option :value="0">免打卡</Option>
<Option :value="1">无定位打卡</Option>
<Option :value="2">定位拍照打卡</Option>
</Select>
</FormItem>
<!-- <FormItem label="选择教师" prop="input2" >-->
<!-- <Select v-model="teacherSelectCurrentValue" filterable placeholder="请选择或搜索...">-->
<!-- <Option v-for="item in cityTeacherList" :value="item.id" :key="item.id" >{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="选择权限" prop="input2" >-->
<!-- <Select v-model="roleSelectCurrentValue" multiple >-->
<!-- <Option v-for="item in cityRoleList" :value="item.id" :key="item.id">{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
</Form>
</Modal>
</div> </div>
</template> </template>
<script> <script>
import * as api from '../../../../api/lezRequest' import * as api from '../../../../api/lezRequest'
import * as hooks from '../../../../hooks/index'
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等) //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》'; //例如:import 《组件名称》 from '《组件路径》';
export default { export default {
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
page_size: 10, page_size: 10,
page_index: 1, page_index: 1,
total: null, total: null,
loading: false,
columns: [ columns: [
{ {
title: '序号', title: '序号',
...@@ -182,17 +183,19 @@ ...@@ -182,17 +183,19 @@
}, },
//方法集合", //方法集合",
methods: { methods: {
async modalOk() { modalOk() {
let data = { hooks.myEncapsulationFunction(async () => {
"watchtypeid": this.formTop.id, let data = {
"watchtypename": this.formTop.input1, "watchtypeid": this.formTop.id,
"watchtype_remark": this.formTop.input2, "watchtypename": this.formTop.input1,
"watchhour_id": this.formTop.input3, "watchtype_remark": this.formTop.input2,
"sign_type": this.formTop.type, "watchhour_id": this.formTop.input3,
} "sign_type": this.formTop.type,
const res = await api.WatchTypeSave(data) }
const res = await api.WatchTypeSave(data)
this.GetWatchTypeList() await this.GetWatchTypeList()
return res
})
}, },
update(e) { update(e) {
// console.log(e) // console.log(e)
...@@ -204,11 +207,14 @@ ...@@ -204,11 +207,14 @@
this.modal = true this.modal = true
}, },
async DeleteAction() { async DeleteAction() {
let data = { hooks.myEncapsulationFunction(async () => {
id: this.formTop.id let data = {
} id: this.formTop.id
const res = await api.WatchTypeDel(data) }
this.GetWatchTypeList() const res = await api.WatchTypeDel(data)
await this.GetWatchTypeList()
return res
})
}, },
Delete(e) { Delete(e) {
this.formTop.id = e.watchtypeid this.formTop.id = e.watchtypeid
...@@ -259,21 +265,24 @@ ...@@ -259,21 +265,24 @@
} }
}, },
async GetWatchTypeList(searchValue = '') { async GetWatchTypeList(searchValue = '') {
this.$Spin.show(); hooks.getInitListRequest(async () => {
let data = { this.loading = true
name: this.searchValue, let data = {
page_size: this.page_size, name: this.searchValue,
page_index: this.page_index, page_size: this.page_size,
} page_index: this.page_index,
const res = await api.GetWatchTypeList(data) }
this.data = res.response.data const res = await api.GetWatchTypeList(data)
this.total = res.response.data_count this.data = res.response.data
this.publicMessage(res) this.total = res.response.data_count
this.loading = false
})
} }
}, },
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载 //生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() { beforeCreate() {
console.info("🚀🚀🚀,")
}, },
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染 //生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
......
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
<script> <script>
import * as api from '../../api/lezRequest' import * as api from '../../api/lezRequest'
import * as hooks from '@/hooks/index'
export default { export default {
name: 'numberLimit', name: 'numberLimit',
......
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
<!-- 注意!系部选择框根据[系部干事]是否勾选显示,[系部干事]id不为定值,部署时要跟后端确定改id --> <!-- 注意!系部选择框根据[系部干事]是否勾选显示,[系部干事]id不为定值,部署时要跟后端确定改id -->
<!-- watch中、编辑Modal中也有使用到这个id的,注意修改 --> <!-- watch中、编辑Modal中也有使用到这个id的,注意修改 -->
<div <div
v-if="modalSelect.checkboxValue.some(a => a == '8169147c-e4b1-41c0-9464-92bf446ec049')" v-if="modalSelect.checkboxValue.some(a => a == '8169147c-e4b1-41c0-9464-92bf446ec049')"
style="width: 100%; margin-bottom: 15px;"> style="width: 100%; margin-bottom: 15px;">
<span>系部:</span> <span>系部:</span>
<Select style="width: 600px" v-model="modalSelect.deptSlcList" multiple filterable placeholder=""> <Select style="width: 600px" v-model="modalSelect.deptSlcList" multiple filterable placeholder="">
<Option v-for="item in deptList" :key="item.value" :value="item.value"> <Option v-for="item in deptList" :key="item.value" :value="item.value">
...@@ -136,17 +136,17 @@ ...@@ -136,17 +136,17 @@
<!-- 编辑Modal --> <!-- 编辑Modal -->
<Modal <Modal
v-model="editRoleModalShow" v-model="editRoleModalShow"
title="编辑教师权限" title="编辑教师权限"
:mask-closable="false" :mask-closable="false"
@on-cancel="editCancel"> @on-cancel="editCancel">
<CheckboxGroup style="margin-bottom: 15px" v-model="modalSelect.checkboxValue"> <CheckboxGroup style="margin-bottom: 15px" v-model="modalSelect.checkboxValue">
<Checkbox v-for="(item,index) in modalSelect.rList" :label="item.id" :key="index" <Checkbox v-for="(item,index) in modalSelect.rList" :label="item.id" :key="index"
border><span>{{ item.name }}</span></Checkbox> border><span>{{ item.name }}</span></Checkbox>
</CheckboxGroup> </CheckboxGroup>
<div <div
v-if="modalSelect.checkboxValue.some(a => a == '8169147c-e4b1-41c0-9464-92bf446ec049')" v-if="modalSelect.checkboxValue.some(a => a == '8169147c-e4b1-41c0-9464-92bf446ec049')"
style="width: 100%; margin-bottom: 15px;"> style="width: 100%; margin-bottom: 15px;">
<span>系部:</span> <span>系部:</span>
<Select style="width: 445px" v-model="modalSelect.deptSlcList" multiple filterable placeholder=""> <Select style="width: 445px" v-model="modalSelect.deptSlcList" multiple filterable placeholder="">
<Option v-for="item in deptList" :key="item.value" :value="item.value"> <Option v-for="item in deptList" :key="item.value" :value="item.value">
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
//例如:import 《组件名称》 from '《组件路径》'; //例如:import 《组件名称》 from '《组件路径》';
import * as api from '../../api/lezRequest' import * as api from '../../api/lezRequest'
import Vue from "vue"; import Vue from "vue";
import * as hooks from '@/hooks/index'
export default { export default {
//import引入的组件需要注入到对象中才能使用", //import引入的组件需要注入到对象中才能使用",
...@@ -574,7 +575,7 @@ ...@@ -574,7 +575,7 @@
mounted() { mounted() {
this.GetUserList() this.GetUserList()
this.getTorR() this.getTorR()
// 获取值班部门(选择框) // 获取值班部门(选择框)
api.GetWatchDepSelect().then(res => { api.GetWatchDepSelect().then(res => {
// console.log('获取值班部门', res) // console.log('获取值班部门', res)
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
</div> </div>
</template> </template>
<Table :columns="columns" :data="data"> <Table :columns="columns" :data="data" :loading="loading">
<template #action="{row}"> <template #action="{row}">
<Button type="primary" size="small" @click="update(row)">修改</Button> <Button type="primary" size="small" @click="update(row)">修改</Button>
<Button type="error" size="small" @click="roleDelete(row)" style="margin-left: 10px;">删除</Button> <Button type="error" size="small" @click="roleDelete(row)" style="margin-left: 10px;">删除</Button>
...@@ -64,6 +63,7 @@ ...@@ -64,6 +63,7 @@
//例如:import 《组件名称》 from '《组件路径》'; //例如:import 《组件名称》 from '《组件路径》';
import * as api from '../../api/lezRequest' import * as api from '../../api/lezRequest'
import Vue from "vue"; import Vue from "vue";
import * as hooks from '@/hooks/index'
export default { export default {
//import引入的组件需要注入到对象中才能使用", //import引入的组件需要注入到对象中才能使用",
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
loading: false,
searchValue: '', // 搜索框的值 searchValue: '', // 搜索框的值
total: null, total: null,
page_size: 10, page_size: 10,
...@@ -250,18 +251,22 @@ ...@@ -250,18 +251,22 @@
}, },
async GetUserRoleList() { async GetUserRoleList() {
this.$Spin.show();
// 获取初始话列表 hooks.getInitListRequest(async () => {
let data = { // 获取初始话列表
"page_index": this.page_index, this.loading = true
"page_size": this.page_size, let data = {
"name": this.searchValue, "page_index": this.page_index,
} "page_size": this.page_size,
const res = await api.GetUserRoleList(data) "name": this.searchValue,
this.data = [] }
this.data = res.response.data const res = await api.GetUserRoleList(data)
this.total = res.response.data_count this.data = []
this.publicMessage(res) this.data = res.response.data
this.total = res.response.data_count
this.loading = false
})
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或