|
@@ -186,7 +186,14 @@ import {
|
|
|
} from '@/api/meeting/meeting'
|
|
} from '@/api/meeting/meeting'
|
|
|
|
|
|
|
|
import {downloadPdf} from "@/api/meeting/meeting";
|
|
import {downloadPdf} from "@/api/meeting/meeting";
|
|
|
-import { addWorkPlan, deleteWorkPlanById, getProjects, getWorkPlanByWeeks, updateWorkPlan } from '@/api/meeting/work'
|
|
|
|
|
|
|
+import {
|
|
|
|
|
+ addWorkPlan,
|
|
|
|
|
+ deleteWorkPlanById,
|
|
|
|
|
+ getProjects,
|
|
|
|
|
+ getWorkPlanByWeeks,
|
|
|
|
|
+ getWorkPlanConfirmFlags,
|
|
|
|
|
+ updateWorkPlan
|
|
|
|
|
+} from '@/api/meeting/work'
|
|
|
import { editEnforceRemind } from '@/api/meeting/enforceRemind'
|
|
import { editEnforceRemind } from '@/api/meeting/enforceRemind'
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -404,19 +411,33 @@ export default {
|
|
|
addWorkPlanWin(row, column, cell, event){
|
|
addWorkPlanWin(row, column, cell, event){
|
|
|
let label=column.label
|
|
let label=column.label
|
|
|
if(label==='工作内容与完成时间'){
|
|
if(label==='工作内容与完成时间'){
|
|
|
- getProjects().then(res=>{
|
|
|
|
|
- this.projects=res.data
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ //已经确认的工作不能继续编辑工作计划,临时增加就去任务系统手动添加
|
|
|
let meetingId=this.meetingId
|
|
let meetingId=this.meetingId
|
|
|
- let weeks=this.weeks
|
|
|
|
|
- let userId=row.executor
|
|
|
|
|
- this.workPlanTitle=row.userName+'下周工作计划'
|
|
|
|
|
- getWorkPlanByWeeks(weeks,userId).then(res=>{
|
|
|
|
|
- this.workPlanDatas=res.data
|
|
|
|
|
- console.log(JSON.stringify(res))
|
|
|
|
|
|
|
+ let data={
|
|
|
|
|
+ weeks:this.weeks,
|
|
|
|
|
+ userId:row.executor,
|
|
|
|
|
+ meetingId:meetingId
|
|
|
|
|
+ }
|
|
|
|
|
+ getWorkPlanConfirmFlags(data).then(res=>{
|
|
|
|
|
+ if(res.success!==true){
|
|
|
|
|
+ this.$message.warning(res.data)
|
|
|
|
|
+ }else{
|
|
|
|
|
+ getProjects().then(res=>{
|
|
|
|
|
+ this.projects=res.data
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ let weeks=this.weeks
|
|
|
|
|
+ let userId=row.executor
|
|
|
|
|
+ this.workPlanTitle=row.userName+'下周工作计划'
|
|
|
|
|
+ getWorkPlanByWeeks(weeks,userId).then(res=>{
|
|
|
|
|
+ this.workPlanDatas=res.data
|
|
|
|
|
+ console.log(JSON.stringify(res))
|
|
|
|
|
+ })
|
|
|
|
|
+ this.row=row
|
|
|
|
|
+ this.workPlanVisible=true
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
- this.row=row
|
|
|
|
|
- this.workPlanVisible=true
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
addWorkPlan(){
|
|
addWorkPlan(){
|