@@ -54,10 +54,6 @@
-
-
-
-
@@ -74,7 +70,7 @@
'userInfo','roles'
])
},
- props:['xmTaskExecuser','visible',"execUserList","xmTask",'execuserAddType'],
+ props:['xmTaskExecuser','visible',"xmTask",'execuserAddType'],
watch: {
'xmTaskExecuser':function( xmTaskExecuser ) {
this.addForm = xmTaskExecuser;
@@ -85,8 +81,9 @@
if(this.execuserAddType!="join"){
this.showSelectUsers();
}else{
- this.addForm.userid=this.userInfo.userid
- this.addForm.username=this.userInfo.username
+ this.addForm.bidUserid=this.userInfo.userid
+ this.addForm.bidUsername=this.userInfo.username
+ this.addForm.bidBranchId=this.userInfo.branchId
}
//从新打开页面时某些数据需要重新加载，可以在这里添加
}
@@ -110,7 +107,7 @@
},
//新增界面数据 xm_task_execuse
addForm: {
- createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
+ createTime:'',id:'',taskId:'',bidUserid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',bidUsername:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
},
userSelectVisible: false,
quoteDateRanger: [
@@ -127,17 +124,10 @@
},
//新增提交XmTaskExecuser xm_task_execuser 父组件监听@submit="afterAddSubmit"
addSubmit: function () {
- if(!this.addForm.userid){
+ if(!this.addForm.bidUserid){
this.$notify.error("请选择一个人");
return
- }
- const tf = this.execUserList.some(i=>{return i.userid == this.addForm.userid;});
- const that = this;
- if(tf){
- this.$notify.error(this.addForm.username+"已在任务中");
- return;
-
- }
+ }
else{
this.$refs.addForm.validate((valid) => {
if (valid) {
@@ -169,24 +159,7 @@
/**begin 在下面加自定义方法,记得补上面的一个逗号**/
showSelectUsers: function(){
this.userSelectVisible=true;
- },
- //选择接收人
- onUserSelected: function(users) {
- if(users.length>1){
- this.$notify({position:'bottom-left',showClose:true,message: "只能选择一个人", type:'error' });
- return;
- }
- if(users==null || users.length ==0 ){
- this.addForm.userid='';
- this.addForm.username="";
- return;
- }
- users.forEach(u => {
- this.addForm.userid=u.userid
- this.addForm.username=u.username
- });
- this.userSelectVisible = false;
- },
+ },
getWeekday(first, last) {
//计算工作日方法：遍历这两个日期区间的每一个日期，获取他的getDay()
@@ -230,8 +203,9 @@
if(this.execuserAddType!="join"){
this.showSelectUsers();
}else{
- this.addForm.userid=this.userInfo.userid
- this.addForm.username=this.userInfo.username
+ this.addForm.bidUserid=this.userInfo.userid
+ this.addForm.bidUsername=this.userInfo.username
+ this.addForm.bidBranchId=this.userInfo.branchId
}
/**在下面写其它函数***/
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
index d915facd..4c8b2fa5 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
@@ -3,25 +3,13 @@
-
-
-
-
-
+
+
-
-
-
-
+
+
+
@@ -39,14 +27,8 @@
-
-
-
-
+
+
@@ -80,17 +62,12 @@
'userInfo','roles'
])
},
- props:['xmTaskExecuser','visible',"execUserList","xmTask"],
+ props:['xmTaskExecuser','visible',"xmTask"],
watch: {
'xmTaskExecuser':function( xmTaskExecuser ) {
this.editForm = xmTaskExecuser;
},
- 'visible':function(visible) {
- if(visible==true){
- this.execUser.userid = this.editForm.userid;
- this.execUser.username = this.editForm.username;
- //从新打开页面时某些数据需要重新加载，可以在这里添加
- }
+ 'visible':function(visible) {
}
},
data() {
@@ -145,9 +122,7 @@
//在下面添加其它组件 'xm-task-execuser-edit':XmTaskExecuserEdit
},
mounted() {
- this.editForm=Object.assign(this.editForm, this.xmTaskExecuser);
- this.execUser.userid = this.editForm.userid;
- this.execUser.username = this.editForm.username;
+ this.editForm=Object.assign(this.editForm, this.xmTaskExecuser);
}
}
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
index 7f78fe79..d3b636bd 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
@@ -40,9 +40,9 @@
-
+
-
+
@@ -54,8 +54,8 @@
- {{item.name}}
-
+
+
@@ -77,7 +77,7 @@
-
+
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 723e3b6b..f242dfca 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -20,12 +20,12 @@
-
+
-
+
-
+
@@ -67,8 +67,8 @@
- {{item.name}}
-
+
+
@@ -100,7 +100,7 @@
- {{ quotePriceForm.username }}
+ {{ quotePriceForm.bidUsername }}
@@ -240,7 +240,7 @@
editFormVisible: false,//编辑界面是否显示
//编辑xmTaskExecuser界面初始化数据
editForm: {
- createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
+ createTime:'',id:'',taskId:'',bidUserid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
},
/**begin 自定义属性请在下面加 请加备注**/
@@ -250,7 +250,7 @@
},
settleListVisible:false,
quotePriceForm: {
- quoteAmount: '',quoteWorkload: '', skillRemark: '',quoteStartTime:'',quoteEndTime:'',id:'',userid:'',usernane:'',taskId:'',
+ quoteAmount: '',quoteWorkload: '', skillRemark: '',quoteStartTime:'',quoteEndTime:'',id:'',bidUserid:'',bidUsernane:'',taskId:'',
},
quotePriceVisible:false,
readyAdd: [],
@@ -677,12 +677,12 @@
data:{
projectId:projectId,
taskId:taskId,
- userid:row.userid,
+ bidUserid:row.userid,
settleAmount:this.settleForm.settleAmount,
settleWorkload:this.settleForm.settleWorkload,
id:row.id,
branchId:branchId,
- username:row.username
+ bidUsername:row.username
}
},
}