|
@@ -127,12 +127,12 @@
|
|
<el-tab-pane label="周期" name="cycles">
|
|
<el-tab-pane label="周期" name="cycles">
|
|
<el-table :data="form.cycles" height="600px" size="size" v-horizontal-scroll>
|
|
<el-table :data="form.cycles" height="600px" size="size" v-horizontal-scroll>
|
|
<el-table-column label="序号" type="index" width="50" align="center" fixed/>
|
|
<el-table-column label="序号" type="index" width="50" align="center" fixed/>
|
|
- <el-table-column show-overflow-tooltip label="周期" align="center" width="200" prop="name">
|
|
+ <el-table-column show-overflow-tooltip label="周期" align="center" width="250" prop="name">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-input
|
|
<el-input
|
|
size="mini"
|
|
size="mini"
|
|
v-model="scope.row.name"
|
|
v-model="scope.row.name"
|
|
- style="width: 150px"
|
|
+ style="width: 200px"
|
|
clearable
|
|
clearable
|
|
/>
|
|
/>
|
|
</template>
|
|
</template>
|
|
@@ -415,7 +415,7 @@ export default {
|
|
deadline.setHours( 0, 0, 0);
|
|
deadline.setHours( 0, 0, 0);
|
|
if(this.form.cycle == 'period'){
|
|
if(this.form.cycle == 'period'){
|
|
cycles.push({
|
|
cycles.push({
|
|
- name:'目标期间',
|
|
+ name:this.formatDateTime(start, 'yyyy-MM-dd') + '到' + this.formatDateTime(deadline, 'yyyy-MM-dd'),
|
|
startTime:this.formatDateTime(start, 'yyyy-MM-dd'),
|
|
startTime:this.formatDateTime(start, 'yyyy-MM-dd'),
|
|
deadlineTime:this.formatDateTime(deadline, 'yyyy-MM-dd'),
|
|
deadlineTime:this.formatDateTime(deadline, 'yyyy-MM-dd'),
|
|
});
|
|
});
|
|
@@ -432,10 +432,11 @@ export default {
|
|
}
|
|
}
|
|
if(this.form.cycle == 'week'){
|
|
if(this.form.cycle == 'week'){
|
|
var cy = {};
|
|
var cy = {};
|
|
- cy.name = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
+ let date = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
cy.startTime = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
cy.startTime = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
start.setDate(start.getDate()+6);
|
|
start.setDate(start.getDate()+6);
|
|
cy.deadlineTime = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
cy.deadlineTime = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
|
|
+ cy.name = date + '到' + this.formatDateTime(start, 'yyyy-MM-dd');
|
|
cycles.push(cy);
|
|
cycles.push(cy);
|
|
start.setDate(start.getDate()+1);
|
|
start.setDate(start.getDate()+1);
|
|
}
|
|
}
|
|
@@ -452,10 +453,11 @@ export default {
|
|
}
|
|
}
|
|
if(this.form.cycle == 'season'){
|
|
if(this.form.cycle == 'season'){
|
|
var cy = {};
|
|
var cy = {};
|
|
- cy.name = this.formatDateTime(start, 'yyyy-MM');
|
|
+ let date = this.formatDateTime(start, 'yyyy-MM');
|
|
cy.startTime = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
cy.startTime = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
start.setDate(start.getDate()+90);
|
|
start.setDate(start.getDate()+90);
|
|
cy.deadlineTime = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
cy.deadlineTime = this.formatDateTime(start, 'yyyy-MM-dd');
|
|
|
|
+ cy.name = date + '到' + this.formatDateTime(start, 'yyyy-MM');
|
|
cycles.push(cy);
|
|
cycles.push(cy);
|
|
start.setDate(start.getDate()+1);
|
|
start.setDate(start.getDate()+1);
|
|
}
|
|
}
|