diff --git a/src/views/myWork/my/components/boxCard.vue b/src/views/myWork/my/components/boxCard.vue
index 5a1a7471..3b6d2989 100644
--- a/src/views/myWork/my/components/boxCard.vue
+++ b/src/views/myWork/my/components/boxCard.vue
@@ -24,7 +24,7 @@
:i="item.i"
:key="item.i">
- {{item.menuname}}刷新
+ {{item.menuname}}(及时取消关注不常用的，常用的5个排在最前面)刷新
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
index 3c962ff5..59593c8d 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
@@ -35,24 +35,35 @@
-
-
-
- 小时
-
-
-
+
-
+
-
-
+
+
+
+ {{xmTask.executorUsername}}
+
+
+
+
+
+
+ 小时
+
+
+
+
+
+
+
+
@@ -64,9 +75,7 @@
小时
-
-
-
+
注意：未来工时指完成工作还需要继续投入的工时，一般在原始预估出现比较大的偏差时，需要对预估偏差进行重新调整才填写。
@@ -79,6 +88,10 @@
取消
提交
+
+
+
+
@@ -89,12 +102,13 @@
import { addXmTaskWorkload,editXmTaskWorkload } from '@/api/xm/core/xmTaskWorkload';
import { listXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser';
+ import XmGroupSelect from '../xmGroup/XmGroupSelect.vue';
import { mapGetters } from 'vuex'
export default {
name:'xmTaskWorkloadEdit',
components: {
-
+ XmGroupSelect
},
computed: {
...mapGetters([ 'userInfo' ]),
@@ -168,6 +182,7 @@
},
execuser:null,
workloadFillType:'1',//工时填写方式
+ groupUserSelectVisible:false,
}//end return
},//end data
methods: {
@@ -216,13 +231,16 @@
}else{
if(this.xmTask){
this.editForm.taskId=this.xmTask.id
- this.editForm.ttype=this.xmTask.taskType
+ this.editForm.ttype=this.xmTask.taskType
}
this.editForm.bizDate=util.getDate();
if(!this.editForm.ttype){
this.editForm.ttype="4"
}
this.editForm.workload=8
+ this.editForm.userid=this.userInfo.userid
+ this.editForm.username=this.userInfo.username
+ this.editForm.ubranchId=this.userInfo.branchId
}
},
listXmTaskExecuser(){
@@ -236,6 +254,17 @@
this.$notify({position:'bottom-left',showClose:true,message:'没有找到报价信息',type:'error'})
}
});
+ },
+ groupUserSelectConfirm(users){
+ if(!users||users.length<=0){
+ this.$notify({position:'bottom-left',showClose:true,message:'请选择一个用户',type:'error'})
+ return;
+ }
+ this.groupUserSelectVisible=false;
+ var user=users[0]
+ this.editForm.userid=user.userid
+ this.editForm.username=user.username
+ this.editForm.ubranchId=user.obranchId
}
},//end method