diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index db5ba831..cf742562 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -46,7 +46,7 @@ - + {{editForm.menuName}} 选择归属故事查看故事明细 @@ -64,7 +64,7 @@ {{editForm.exeUsernames}} - 查看队员情况 + 候选人管理 我要加入 @@ -87,12 +87,11 @@ :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions" > -
- - - -
- + + + 工作量、成本 人时，{{this.toFixed(editForm.budgetWorkload/8/20)}}人月 @@ -173,7 +172,7 @@ - + @@ -501,6 +500,13 @@ toMenu(){ this.menuDetailVisible=true }, + + afterAddExecSubmit(execForm){ + this.$emit("after-add-submit",execForm); + }, + afterEditExecSubmit(execForm){ + this.$emit("after-edit-submit",execForm); + }, },//end method components: { xmSkillMng, diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index c27cb322..fcba47b4 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -11,7 +11,7 @@ 未完成 已完成 我关注 - 我排队 + 我排队 我是责任人 我执行 我提交 @@ -27,7 +27,7 @@ 众包 选择标签 - {{skill.skillName}} + {{skill.skillName}} {{this.filters.selProject.name}} 选项目 @@ -42,11 +42,11 @@ placement="top-start" title="选择创建任务的方式" width="200" - trigger="hover"> - - + trigger="hover"> + + - + 由故事快速创建任务(推荐) @@ -58,45 +58,45 @@ - + - + 产品:{{this.filters.product.productName}} 选产品 - + 项目:{{this.filters.selProject.name}} 选项目 - + 故事: {{item.menuName.substr(0,10)}} 选故事 - + 责任人: - {{this.filters.createUser.username}} + {{this.filters.createUser.username}} 选责任人 - 我的 - + 我的 + 执行人: - {{this.filters.executor.username}} + {{this.filters.executor.username}} 选执行人 - 我的 - + 我的 + - 创建时间: + 创建时间: - + > + 标签: 选择标签 {{skill.skillName}} - + 甘特图 - 查询 - + 查询 + @@ -134,7 +134,7 @@ - + - + - - - - - - - - - - - - - - - - - - @@ -224,54 +212,12 @@ - - - - - - @@ -286,17 +232,9 @@ - -
+
{{editForm.name}} {{taskStateList[parseInt(editForm.taskState)] }} @@ -319,17 +257,23 @@
用户故事
{{editForm.menuName}}
-
+
任务进度
- - 更新进度 - 完成20% - 完成40% - 完成60% - 完成80% - 完成99% - 完成100% - + + + + + + 保存进度 + 完成20% + 完成40% + 完成60% + 完成80% + 完成99% + 完成100% +
任务负责人
@@ -349,38 +293,7 @@
任务周期
{{getDateString(editForm.startTime)+' ~ '+ getDateString(editForm.endTime)}} 共{{taskTime}}天
-
-
子任务
{{item.sortLevel}}{{item.name}} -
-
-
子任务
无子任务 -
-
-
前置任务
{{(editForm.preTaskid==''||editForm.preTaskid == null)?'无前置任务':editForm.preTaskname}} -
-
-
里程碑
{{editForm.milestone == '0'? '否':'是'}} -
-
-
预算金额
{{editForm.budgetCost}} 元 -
-
-
预算工作量
{{editForm.budgetWorkload}} 人时 -
- -
-
任务描述
{{editForm.description}} -
-
-
-
- - - - 讨论 10 - 操作日志 10 - -
+
@@ -442,7 +355,7 @@ - + @@ -489,7 +402,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; return this.filters.selProject; }else{ return null; - + } }, currentProjectPhase(){ @@ -632,7 +545,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 ); return { filters: { - key: '', + key: '', isMyTask: '0',//0不区分我的，1 时我的任务 selProject:null, skillTags:[], @@ -714,7 +627,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; dateRanger: [ util.formatDate.format(beginDate, "yyyy-MM-dd"), util.formatDate.format(endDate, "yyyy-MM-dd") - ], + ], pickerOptions: util.pickerOptions('datarange'), /**end 自定义属性请在上面加 请加备注**/ } @@ -798,7 +711,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(!this.dateRanger || this.dateRanger.length==0){ this.$message({ message: "创建日期范围不能为空", type: 'error' }); return; - } + } if(this.filters.taskType!="all" && this.filters.taskType!="" && this.filters.taskType!=null){ params.taskType=this.filters.taskType } @@ -855,7 +768,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(this.filters.product){ params.productId=this.filters.product.id } - + params.createTimeStart=this.dateRanger[0]+" 00:00:00" params.createTimeEnd=this.dateRanger[1]+" 23:59:59" getTask(params).then((res) => { @@ -1076,7 +989,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showDrawer: function(row){ this.editFormVisible =true; this.editForm=row; - + // this.$emit('row-click',row,);// @row-click="rowClick" }, @@ -1139,7 +1052,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; }, onSelectedStory(menus){//根据故事查询 - + if(menus==null || menus.length==0){ this.menuStory=false; return; @@ -1505,12 +1418,12 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; } return parseFloat(value); }, - + clearProduct(){ this.filters.product=null; this.searchXmTasks(); }, - showProductVisible(){ + showProductVisible(){ this.productSelectVisible=true; }, onProductSelected(product){ @@ -1690,8 +1603,8 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; }) }, //查询时选择责任人 - seleConfirm(groupUsers){ - + seleConfirm(groupUsers){ + if(groupUsers&&groupUsers.length>0){ this.filters.createUser=groupUsers[0]; }else{ @@ -1701,7 +1614,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.menuGroupUser=false; }, seleExecutor(executors){ - + if(executors&&executors.length>0){ this.filters.executor=executors[0]; }else{ @@ -1763,8 +1676,44 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; setFiltersExecutorAsMySelf(){ this.filters.executor=this.userInfo; this.searchXmTasks(); + }, + formatExeUsernames(row){ + var exeUsernames=row.exeUsernames; + var respons={ + type:'info', + executorUsername:row.executorUsername, + showMsg:'', + exeUsernames:exeUsernames, + executorUserid:row.executorUserid, + } + if(!row.executorUserid && exeUsernames){ + var exeStatuss=exeUsernames.split(",") + respons.showMsg=exeStatuss.length+"人候选中" + return respons; + }else if(!row.executorUserid && !exeUsernames){ + respons.showMsg="候选中" + return respons; + } + if(row.executorUserid && exeUsernames && exeUsernames.length>0){ + var exeStatuss=exeUsernames.split(",").filter(i=>{ + return i.indexOf(row.executorUsername)>=0 + }) + if(exeStatuss.length<=0){ + respons.showMsg="去设置" + return respons; + } + respons.showMsg=exeStatuss.join(",") + if(respons.showMsg.indexOf('验收不过')>=0){ + respons.type="danger" + }else if(respons.showMsg.indexOf('已验收')>=0){ + respons.type="success" + } + }else{ + respons.showMsg="去设置" + } + return respons } - + /**end 自定义函数请在上面加**/ },//end methods @@ -1787,16 +1736,16 @@ XmProjectGroupSelect,XmProductSelect this.filters.product=this.xmProduct; } this.$nextTick(()=>{ - - this.getXmTasks(); - var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=50/1000 * window.innerHeight; - this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; + + this.getXmTasks(); + var clientRect=this.$refs.table.$el.getBoundingClientRect(); + var subHeight=50/1000 * window.innerHeight; + this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; // 监听窗口大小变化 /** let self = this; window.onresize = function() { - self.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; + self.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; } */ listOption([{categoryId:'all',itemCode:'planType'} @@ -1813,70 +1762,16 @@ XmProjectGroupSelect,XmProductSelect + -