|
|
@@ -56,6 +56,18 @@
|
|
|
</el-date-picker>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="所属项目" prop="projectId">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select v-model="scope.row.projectId" placeholder="请选择" size="mini">
|
|
|
+ <el-option
|
|
|
+ v-for="item in projects"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.projectName"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="操作" prop="op" width="150" v-if="currentWeek===weeks">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button size="mini" type="primary" @click="addRow()">添加</el-button>
|
|
|
@@ -82,7 +94,7 @@
|
|
|
<script>
|
|
|
|
|
|
import {list} from '@/api/meeting/meeting'
|
|
|
-import {deleteWorkPlanById, getMeetingsAndWorkPlansByWeeks, saveWorkPlans} from '@/api/meeting/work'
|
|
|
+import { deleteWorkPlanById, getMeetingsAndWorkPlansByWeeks, getProjects, saveWorkPlans } from '@/api/meeting/work'
|
|
|
import {getTask} from "@/api/task/task";
|
|
|
import TaskDetail from "../task/components/taskDetail"
|
|
|
|
|
|
@@ -95,12 +107,14 @@ export default {
|
|
|
meetingWeek: null,
|
|
|
meetingData: [],
|
|
|
workContents: [],
|
|
|
+ projects:[],
|
|
|
workPlans: [{
|
|
|
planContent: '请填写工作计划信息',
|
|
|
id: null,
|
|
|
meetingId: null,
|
|
|
completionTimes: null,
|
|
|
- completionTime: null
|
|
|
+ completionTime: null,
|
|
|
+ projectId: null
|
|
|
}],
|
|
|
meetingStatus: null,
|
|
|
weeks: null,
|
|
|
@@ -126,6 +140,9 @@ export default {
|
|
|
this.meetingWeek = currentWeek
|
|
|
this.getMeetingsAndWorkPlansByWeeksData(currentWeek)
|
|
|
})
|
|
|
+ getProjects().then(res=>{
|
|
|
+ this.projects=res.data
|
|
|
+ });
|
|
|
},
|
|
|
getMeetingsAndWorkPlansByWeeksData(currentWeek) {
|
|
|
let weekss = currentWeek
|