|
@@ -47,6 +47,7 @@ import dataTable from '@frame/components/data-table';
|
|
|
import _ from 'lodash';
|
|
|
import { createNamespacedHelpers } from 'vuex';
|
|
|
const { mapActions } = createNamespacedHelpers('trainplan');
|
|
|
+const { mapActions: schPlan } = createNamespacedHelpers('schPlan');
|
|
|
export default {
|
|
|
metaInfo: { title: '计划详情' },
|
|
|
name: 'detail',
|
|
@@ -79,10 +80,16 @@ export default {
|
|
|
heights: 250,
|
|
|
selected: [],
|
|
|
}),
|
|
|
- created() {},
|
|
|
+ created() {
|
|
|
+ this.search();
|
|
|
+ },
|
|
|
mounted() {},
|
|
|
methods: {
|
|
|
...mapActions(['fetch', 'create', 'update']),
|
|
|
+ ...schPlan({
|
|
|
+ schPlanCreate: 'create',
|
|
|
+ schPlanUpdate: 'update',
|
|
|
+ }),
|
|
|
//查询计划
|
|
|
async search() {
|
|
|
const res = await this.fetch(this.id);
|
|
@@ -104,12 +111,17 @@ export default {
|
|
|
return item.batchnum;
|
|
|
})
|
|
|
);
|
|
|
- //这个events不完整,真正的events还需要将假期的数据整合至一起
|
|
|
- // 不需要知道哪些是安排的计划.没有计划简表,计划简表=>上报时间表
|
|
|
- //TODO,服务端修改后,整理假期事件并整合
|
|
|
- console.log(events);
|
|
|
- // 假期中添加一个字段 editable:false,只有假期有这个字段
|
|
|
- this.$set(this, `events`, events);
|
|
|
+ let vac = midArr.festivals.map(i => {
|
|
|
+ let object = {};
|
|
|
+ object.id = i._id;
|
|
|
+ object.start = i.begindate;
|
|
|
+ object.end = i.finishdate;
|
|
|
+ object.rendering = 'background';
|
|
|
+ object.color = 'red';
|
|
|
+ object.editable = false;
|
|
|
+ return object;
|
|
|
+ });
|
|
|
+ this.$set(this, `events`, events.concat(vac));
|
|
|
},
|
|
|
//日历事件点击事件
|
|
|
eventClick({ event }) {
|
|
@@ -170,14 +182,25 @@ export default {
|
|
|
// 获取已选择的时间
|
|
|
let arr = JSON.parse(JSON.stringify(this.selected));
|
|
|
//TODO整理数据
|
|
|
- let data = { ...this.info };
|
|
|
+ let { year, _id, remark } = JSON.parse(JSON.stringify(this.info));
|
|
|
arr = arr.map(i => {
|
|
|
- console.log(i);
|
|
|
- return { termnum: i.termnum, termid: i.termid, number: '未计算,使用实际数据计算' };
|
|
|
+ return { termnum: i.termnum, termid: i.termid, number: i.number };
|
|
|
});
|
|
|
- data.term = arr;
|
|
|
- //最后加入schoolId
|
|
|
+ // TODO 修改schoolid为登录用户的id
|
|
|
+ let object = { year, planid: _id, remark, term: arr, schid: '99991' };
|
|
|
+ let res;
|
|
|
+ let msg;
|
|
|
//TODO 连接接口
|
|
|
+ //需要找到条件判断是修改还是添加,默认先修改看看出现什么情况
|
|
|
+ let isNew = true;
|
|
|
+ if (isNew) {
|
|
|
+ res = this.schPlanCreate(object);
|
|
|
+ msg = `时间上报成功`;
|
|
|
+ } else {
|
|
|
+ res = this.schPlanUpdate(object);
|
|
|
+ msg = `时间修改成功`;
|
|
|
+ }
|
|
|
+ if (this.$checkRes(res, msg)) this.$router.push({ path: '/plan/index' });
|
|
|
},
|
|
|
setHeight() {
|
|
|
let heights = this.$refs.card.$el.clientHeight * 0.63;
|
|
@@ -208,14 +231,6 @@ export default {
|
|
|
return res;
|
|
|
},
|
|
|
},
|
|
|
- watch: {
|
|
|
- isNew: {
|
|
|
- immediate: true,
|
|
|
- handler(val) {
|
|
|
- if (!val) this.search();
|
|
|
- },
|
|
|
- },
|
|
|
- },
|
|
|
computed: {
|
|
|
widths() {
|
|
|
let width = (document.body.clientWidth - 200) * 0.5;
|
|
@@ -224,9 +239,6 @@ export default {
|
|
|
id() {
|
|
|
return this.$route.query.id;
|
|
|
},
|
|
|
- isNew() {
|
|
|
- return this.$route.query.id ? false : true;
|
|
|
- },
|
|
|
mainTitle() {
|
|
|
let meta = this.$route.meta;
|
|
|
let main = meta.title || '';
|