周计划 优化
This commit is contained in:
@ -194,8 +194,7 @@
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="选择活动时间"
|
||||
>></el-date-picker
|
||||
>
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动内容" prop="content">
|
||||
<Editor v-model="form.content" placeholder="请输入活动内容" />
|
||||
@ -242,6 +241,8 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
starttime: null,
|
||||
endtime: null,
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
@ -276,17 +277,6 @@ export default {
|
||||
updateuserid: undefined,
|
||||
day: undefined,
|
||||
},
|
||||
// 日期控件 只显示今天和今天以后一周时间区间
|
||||
pickerOptions7: {
|
||||
disabledDate(time) {
|
||||
let curDate = new Date().getTime();
|
||||
let three = 7 * 24 * 3600 * 1000;
|
||||
let threeMonths = curDate + three;
|
||||
let datestart = Date.now() - 86400000;
|
||||
return time.getTime() < datestart || time.getTime() > threeMonths;
|
||||
},
|
||||
},
|
||||
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
@ -318,6 +308,9 @@ export default {
|
||||
// 周计划
|
||||
getPlanweek2(planweekid) {
|
||||
getPlanweek(planweekid).then((response) => {
|
||||
//console.log(response.data);
|
||||
this.starttime = response.data.starttime;
|
||||
this.endtime = response.data.endtime;
|
||||
this.queryParams.wid = response.data.id;
|
||||
this.defaultWeekType = response.data.id;
|
||||
this.getList();
|
||||
@ -399,6 +392,7 @@ export default {
|
||||
this.open = true;
|
||||
this.title = "添加周计划(家长和教育部门)细化";
|
||||
this.form.wid = this.queryParams.wid;
|
||||
this.form.activitytime = this.starttime;
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
|
@ -202,19 +202,62 @@
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
class="v-dialog"
|
||||
width="1024px"
|
||||
width="960px"
|
||||
append-to-body
|
||||
>
|
||||
<el-row :gutter="15">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="计划名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入计划名称" />
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="form.name"
|
||||
placeholder="请输入计划名称"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item label="开始时间" prop="starttime">
|
||||
<!-- <el-date-picker
|
||||
clearable
|
||||
size="small"
|
||||
class="my-date-picker"
|
||||
v-model="form.starttime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="选择开始时间"
|
||||
></el-date-picker> -->
|
||||
<el-date-picker
|
||||
v-model="form.starttime"
|
||||
clearable
|
||||
size="small"
|
||||
class="my-date-picker"
|
||||
type="daterange"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
v-on:change="change()"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="12">
|
||||
<el-form-item label="结束时间" prop="endtime">
|
||||
<el-date-picker
|
||||
clearable
|
||||
size="small"
|
||||
class="my-date-picker"
|
||||
v-model="form.endtime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="选择结束时间"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
<el-col :span="12">
|
||||
<el-form-item label="选择月份" prop="month">
|
||||
<label slot="label">选择月份</label>
|
||||
<el-date-picker
|
||||
clearable
|
||||
size="small"
|
||||
@ -226,36 +269,13 @@
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="开始时间" prop="starttime">
|
||||
<el-date-picker
|
||||
clearable
|
||||
size="small"
|
||||
class="my-date-picker"
|
||||
v-model="form.starttime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="选择开始时间"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="结束时间" prop="endtime">
|
||||
<el-date-picker
|
||||
clearable
|
||||
size="small"
|
||||
class="my-date-picker"
|
||||
v-model="form.endtime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="选择结束时间"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="选择周次" prop="weekly">
|
||||
<label slot="label">选择周次</label>
|
||||
<el-select v-model="form.weekly" placeholder="请选择周次">
|
||||
<el-select
|
||||
size="small"
|
||||
v-model="form.weekly"
|
||||
placeholder="请选择周次"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in weeklyOptions"
|
||||
:key="dict.dictValue"
|
||||
@ -268,6 +288,7 @@
|
||||
<el-col :span="12">
|
||||
<el-form-item label="本周主题" prop="themeofweek">
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="form.themeofweek"
|
||||
placeholder="请输入本周主题"
|
||||
/>
|
||||
@ -409,9 +430,9 @@ export default {
|
||||
starttime: [
|
||||
{ required: true, message: "开始时间不能为空", trigger: "blur" },
|
||||
],
|
||||
endtime: [
|
||||
{ required: true, message: "结束时间不能为空", trigger: "blur" },
|
||||
],
|
||||
// endtime: [
|
||||
// { required: true, message: "结束时间不能为空", trigger: "blur" },
|
||||
// ],
|
||||
themeofweek: [
|
||||
{ required: true, message: "本周主题不能为空", trigger: "blur" },
|
||||
],
|
||||
@ -467,6 +488,10 @@ export default {
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
change: function () {
|
||||
//console.log(this.form.starttime);
|
||||
this.form.month=this.form.starttime[0].slice(0,7);
|
||||
},
|
||||
/** 查询周计划(家长和教育部门)列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
@ -560,9 +585,13 @@ export default {
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
let timeArr = [];
|
||||
const id = row.id || this.ids;
|
||||
getPlanweek(id).then((response) => {
|
||||
this.form = response.data;
|
||||
timeArr.push(response.data.starttime);
|
||||
timeArr.push(response.data.endtime);
|
||||
this.form.starttime = timeArr;
|
||||
this.open = true;
|
||||
this.title = "修改周计划(家长和教育部门)";
|
||||
});
|
||||
@ -595,6 +624,12 @@ export default {
|
||||
submitForm: function () {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
let timeArr = this.form.starttime;
|
||||
this.form.starttime = timeArr[0];
|
||||
this.form.endtime = timeArr[1];
|
||||
// console.log(this.form.starttime);
|
||||
// console.log(this.form.endtime);
|
||||
// console.log(this.form.month);
|
||||
if (this.form.id != undefined) {
|
||||
updatePlanweek(this.form).then((response) => {
|
||||
if (response.code === 200) {
|
||||
|
@ -53,6 +53,7 @@
|
||||
<if test="weekly != null and weekly != ''"> and weekly = #{weekly}</if>
|
||||
<if test="month != null ">and month = #{month}</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectByPlanweekById" parameterType="String" resultMap="ByPlanweekResult">
|
||||
|
@ -32,6 +32,8 @@
|
||||
<if test="updateuserid != null ">and updateuserid = #{updateuserid}</if>
|
||||
<if test="day != null and day != ''">and day = #{day}</if>
|
||||
</where>
|
||||
|
||||
order by day
|
||||
</select>
|
||||
|
||||
<select id="selectByPlanweekitemById" parameterType="Long" resultMap="ByPlanweekitemResult">
|
||||
|
Reference in New Issue
Block a user