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

周计划和详细 页面优化

Browse Source
This commit is contained in:
sk1551
2020-08-28 17:25:23 +08:00
parent 33afe5382a
commit b4c60d8314
6 changed files with 215 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
ruoyi-ui/src/views/benyi/planweek/data.vue
View File

@ -49,7 +49,7 @@
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</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>
@ -97,7 +97,11 @@
</el-col>
</el-row>
<el-table v-loading="loading" :data="planweekitemList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="planweekitemList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="活动内容" align="center" prop="content" />
@ -113,6 +117,7 @@
<span>{{ parseTime(scope.row.activitytime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="星期" align="center" prop="day" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -176,8 +181,11 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择活动时间"
:picker-options="pickerOptions7">
></el-date-picker>
:picker-options="pickerOptions7"
>></el-date-picker>
</el-form-item>
<el-form-item label="星期" prop="day">
<el-input v-model="form.day" placeholder="请输入星期几" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -200,6 +208,15 @@ import {
import { getPlanweek, listPlanweek } from "@/api/benyi/planweek";
const weekArr = [
"星期日",
"星期一",
"星期二",
"星期三",
"星期四",
"星期五",
"星期六"
];
export default {
name: "Planweekitem",
data() {
@ -235,12 +252,13 @@ export default {
content: undefined,
activitytime: undefined,
createuserid: undefined,
updateuserid: undefined
updateuserid: undefined,
day: undefined
},
// 日期控件 只显示今天和今天以后一周时间区间
pickerOptions7: {
disabledDate(time) {
let curDate = (new Date()).getTime();
let curDate = new Date().getTime();
let three = 7 * 24 * 3600 * 1000;
let threeMonths = curDate + three;
let datestart = Date.now() - 86400000;
@ -252,14 +270,23 @@ export default {
form: {},
// 表单校验
rules: {
activitytype: [{ required: true, message: "活动类型不能为空", trigger: "blur" }],
content: [{ required: true, message: "活动内容不能为空", trigger: "blur" }],
activitytime: [{ required: true, message: "活动时间不能为空", trigger: "blur" }],
activitytype: [
{ required: true, message: "活动类型不能为空", trigger: "blur" }
],
content: [
{ required: true, message: "活动内容不能为空", trigger: "blur" }
],
activitytime: [
{ required: true, message: "活动时间不能为空", trigger: "blur" }
],
day: [
{ required: true, message: "星期不能为空", trigger: "blur" }
]
}
};
},
created() {
const planweekid = this.$route.params && this.$route.params.id;
const planweekid = this.$route.params && this.$route.params.id;
this.getPlanweek2(planweekid);
this.getPlanWeekList();
this.getDicts("sys_math_type").then(response => {
@ -269,7 +296,7 @@ export default {
methods: {
// 周计划
getPlanweek2(planweekid) {
getPlanweek(planweekid).then((response) => {
getPlanweek(planweekid).then(response => {
this.queryParams.wid = response.data.id;
this.defaultWeekType = response.data.id;
this.getList();
@ -286,7 +313,7 @@ export default {
},
// 查询周计划选项
getPlanWeekList() {
listPlanweek().then((response) => {
listPlanweek().then(response => {
this.planweekOptions = response.rows;
});
},
@ -295,7 +322,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid);
var actions = [];
var datas = this.planweekOptions;
Object.keys(datas).map((key) => {
Object.keys(datas).map(key => {
if (datas[key].id == "" + row.wid) {
actions.push(datas[key].name);
return false;
@ -323,7 +350,8 @@ export default {
createuserid: undefined,
createTime: undefined,
updateuserid: undefined,
updateTime: undefined
updateTime: undefined,
day: undefined
};
this.resetForm("form");
},

94
ruoyi-ui/src/views/benyi/planweek/index.vue
View File

@ -19,7 +19,7 @@
:value="dict.dictValue"
/>
</el-select>
</el-form-item> -->
</el-form-item>-->
<el-form-item label="开始时间" prop="starttime">
<el-date-picker
clearable
@ -99,6 +99,11 @@
</router-link>
</template>
</el-table-column>
<el-table-column label="月份" align="center" prop="month" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.starttime, '{y}-{m}') }}</span>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="starttime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.starttime, '{y}-{m}-{d}') }}</span>
@ -109,6 +114,7 @@
<span>{{ parseTime(scope.row.endtime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="周次" align="center" prop="weekly" :formatter="weeklyFormat" />
<el-table-column label="本周主题" align="center" prop="themeofweek" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -126,7 +132,7 @@
@click="handleCheck(scope.row)"
v-hasPermi="['system:planweek:edit']"
v-show="isShow(scope.row)"
>提交</el-button> -->
>提交</el-button>-->
<el-button
size="mini"
type="text"
@ -152,6 +158,17 @@
<el-form-item label="计划名称" prop="name">
<el-input v-model="form.name" placeholder="请输入计划名称" />
</el-form-item>
<el-form-item label="月份" prop="month">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.month"
type="month"
value-format="yyyy-MM"
placeholder="选择月份"
></el-date-picker>
</el-form-item>
<el-form-item label="开始时间" prop="starttime">
<el-date-picker
clearable
@ -174,6 +191,16 @@
placeholder="选择结束时间"
></el-date-picker>
</el-form-item>
<el-form-item label="周次" prop="weekly">
<el-select v-model="form.weekly" placeholder="请选择周次">
<el-option
v-for="dict in weeklyOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="本周主题" prop="themeofweek">
<el-input v-model="form.themeofweek" placeholder="请输入本周主题" />
</el-form-item>
@ -234,6 +261,8 @@ export default {
statusOptions: [],
//班级
classOptions: [],
// 周次
weeklyOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -256,37 +285,43 @@ export default {
createuserid: undefined,
status: undefined,
shrid: undefined,
shtime: undefined
shtime: undefined,
weekly: undefined,
month: undefined
},
// 表单参数
form: {},
// 表单校验
rules: {
name: [{ required: true, message: "计划名称不能为空", trigger: "blur" }],
name: [
{ required: true, message: "计划名称不能为空", trigger: "blur" }
],
starttime: [
{ required: true, message: "开始时间不能为空", trigger: "blur" },
{ required: true, message: "开始时间不能为空", trigger: "blur" }
],
endtime: [
{ required: true, message: "结束时间不能为空", trigger: "blur" },
{ required: true, message: "结束时间不能为空", trigger: "blur" }
],
themeofweek: [
{ required: true, message: "本周主题不能为空", trigger: "blur" },
{ required: true, message: "本周主题不能为空", trigger: "blur" }
],
jxmbSh: [
{ required: true, message: "教学目标(社会)不能为空", trigger: "blur" },
{ required: true, message: "教学目标(社会)不能为空", trigger: "blur" }
],
jxmbYy: [
{ required: true, message: "教学目标(语言)不能为空", trigger: "blur" },
{ required: true, message: "教学目标(语言)不能为空", trigger: "blur" }
],
jxmbJk: [
{ required: true, message: "教学目标(健康)不能为空", trigger: "blur" },
{ required: true, message: "教学目标(健康)不能为空", trigger: "blur" }
],
jxmbKx: [
{ required: true, message: "教学目标(科学)不能为空", trigger: "blur" },
{ required: true, message: "教学目标(科学)不能为空", trigger: "blur" }
],
jxmbYs: [
{ required: true, message: "教学目标(艺术)不能为空", trigger: "blur" },
]
{ required: true, message: "教学目标(艺术)不能为空", trigger: "blur" }
],
weekly: [{ required: true, message: "周次不能为空", trigger: "blur" }],
month: [{ required: true, message: "月份不能为空", trigger: "blur" }]
}
};
},
@ -297,6 +332,9 @@ export default {
this.getDicts("sys_dm_planweekstatus").then(response => {
this.statusOptions = response.data;
});
this.getDicts("sys_dm_weekly").then(response => {
this.weeklyOptions = response.data;
});
},
methods: {
/** 查询周计划(家长和教育部门)列表 */
@ -310,7 +348,7 @@ export default {
},
// 获取班级列表
getClassList() {
listClass(null).then((response) => {
listClass(null).then(response => {
this.classOptions = response.rows;
});
},
@ -329,12 +367,16 @@ export default {
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status);
},
// 性别字典翻译
weeklyFormat(row, column) {
return this.selectDictLabel(this.weeklyOptions, row.weekly);
},
// 班级字典翻译
classFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
var actions = [];
var datas = this.classOptions;
Object.keys(datas).map((key) => {
Object.keys(datas).map(key => {
if (datas[key].bjbh == "" + row.classid) {
actions.push(datas[key].bjmc);
return false;
@ -366,7 +408,9 @@ export default {
createTime: undefined,
status: "0",
shrid: undefined,
shtime: undefined
shtime: undefined,
weekly: undefined,
month: undefined
};
this.resetForm("form");
},
@ -405,23 +449,19 @@ export default {
/** 审核提交按钮操作 */
handleCheck(row) {
const ids = row.id || this.ids;
this.$confirm(
'确认提交周计划编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
this.$confirm('确认提交周计划编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(function() {
return checkPlanweek(ids);
})
.then(() => {
this.getList();
this.msgSuccess("提交成功");
})
.catch(function () {});
.catch(function() {});
},
isShow(row) {
if (row.status == "1" || row.status == "2") {