Browse Source

优化

master
陈裕财 2 years ago
parent
commit
3b9e309116
  1. 2
      src/views/xm/core/components/XmIterationSelect.vue
  2. 4
      src/views/xm/core/components/XmProductSelect.vue
  3. 4
      src/views/xm/core/components/XmProjectSelect.vue
  4. 8
      src/views/xm/core/crowd/XmTaskCrowdMng.vue
  5. 8
      src/views/xm/core/xmIteration/XmIterationEdit.vue
  6. 6
      src/views/xm/core/xmMenu/XmMenuAdd.vue
  7. 16
      src/views/xm/core/xmMenu/XmMenuEdit.vue
  8. 8
      src/views/xm/core/xmMenu/XmMenuMng.vue
  9. 6
      src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
  10. 6
      src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
  11. 12
      src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
  12. 12
      src/views/xm/core/xmProduct/XmProductEdit.vue
  13. 6
      src/views/xm/core/xmProduct/XmProductMng.vue
  14. 12
      src/views/xm/core/xmProduct/XmProductSetting.vue
  15. 12
      src/views/xm/core/xmProject/XmProjectEdit.vue
  16. 4
      src/views/xm/core/xmProject/XmProjectMng.vue
  17. 14
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue
  18. 10
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  19. 2
      src/views/xm/core/xmTask/XmTaskAdd.vue
  20. 16
      src/views/xm/core/xmTask/XmTaskEdit.vue
  21. 24
      src/views/xm/core/xmTask/XmTaskMng.vue
  22. 4
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
  23. 2
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
  24. 2
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
  25. 16
      src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
  26. 10
      src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
  27. 8
      src/views/xm/core/xmTestCase/XmTestCaseMng.vue
  28. 6
      src/views/xm/core/xmTestCasedb/XmTestCasedbEdit.vue
  29. 4
      src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue
  30. 6
      src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
  31. 4
      src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
  32. 6
      src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
  33. 8
      src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
  34. 4
      src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
  35. 2
      src/views/xm/core/xmWorkload/WorkloadSetDayList.vue
  36. 2
      src/views/xm/core/xmWorkload/WorkloadSetMonthList.vue
  37. 2
      src/views/xm/core/xmWorkload/XmWorkloadEdit.vue
  38. 2
      src/views/xm/core/xmWorkload/XmWorkloadInit.vue
  39. 6
      src/views/xm/rpt/branch/branchRptOverview.vue
  40. 3
      src/views/xm/rpt/iteration/iterationRptOverview.vue
  41. 6
      src/views/xm/rpt/product/productRptOverview.vue
  42. 6
      src/views/xm/rpt/project/projectRptOverview.vue
  43. 2
      src/views/xm/rpt/project/projectWorkloadSetDayList.vue
  44. 2
      src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
  45. 2
      src/views/xm/rpt/testCase/testCasedbRptOverview.vue
  46. 6
      src/views/xm/rpt/testPlan/testPlanRptOverview.vue

2
src/views/xm/core/components/XmIterationSelect.vue

@ -31,7 +31,7 @@
<el-row> <el-row>
<font class="more-label-font"> 迭代管理员: </font> <font class="more-label-font"> 迭代管理员: </font>
<mdp-select-user-xm label="选择迭代管理员" v-model="filters" userid-key="adminUserid" username-key="adminUsername" :project-id="linkProjectId" :clearable="true"></mdp-select-user-xm>
<mdp-select-user label="选择迭代管理员" v-model="filters.adminUserid" :params="{relyType:'1',relyId:linkProjectId}"></mdp-select-user>
</el-row> </el-row>
<el-row> <el-row>
<font class="more-label-font">迭代编号:</font><el-input v-model="filters.id" style="width:200px;" placeholder="输入迭代编号" clearable> <font class="more-label-font">迭代编号:</font><el-input v-model="filters.id" style="width:200px;" placeholder="输入迭代编号" clearable>

4
src/views/xm/core/components/XmProductSelect.vue

@ -35,8 +35,8 @@
<el-row> <el-row>
<font class="more-label-font"> 产品经理: </font> <font class="more-label-font"> 产品经理: </font>
<mdp-select-user-xm label="选择产品经理" v-model="filters" userid-key="pmUserid" username-key="pmUsername" :project-id="linkProjectId" :clearable="true"></mdp-select-user-xm>
</el-row>
<mdp-select-user label="选择产品经理" v-model="filters.pmUserid"></mdp-select-user>
</el-row>
<el-row> <el-row>
<font class="more-label-font">产品编号:</font> <font class="more-label-font">产品编号:</font>
<el-input <el-input

4
src/views/xm/core/components/XmProjectSelect.vue

@ -35,8 +35,8 @@
<el-row> <el-row>
<font class="more-label-font"> 项目经理: </font> <font class="more-label-font"> 项目经理: </font>
<mdp-select-user-xm label="选择项目经理" v-model="filters" userid-key="pmUserid" username-key="pmUsername" :clearable="true"></mdp-select-user-xm>
</el-row>
<mdp-select-user label="选择项目经理" v-model="filters.pmUserid"></mdp-select-user>
</el-row>
<el-row> <el-row>
<font class="more-label-font">项目编号:</font> <font class="more-label-font">项目编号:</font>
<el-input <el-input

8
src/views/xm/core/crowd/XmTaskCrowdMng.vue

@ -1311,11 +1311,11 @@ export default {
}else if(fieldName==='workload'){ }else if(fieldName==='workload'){
params={...params,...$event} params={...params,...$event}
}else if(fieldName==='executorUserid'){ }else if(fieldName==='executorUserid'){
params.executorUserid=$event[0].userid
params.executorUsername=$event[0].username
params.executorUserid=$event.userid
params.executorUsername=$event.username
}else if(fieldName==='createUserid'){ }else if(fieldName==='createUserid'){
params.createUserid=$event[0].userid
params.createUsername=$event[0].username
params.createUserid=$event.userid
params.createUsername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

8
src/views/xm/core/xmIteration/XmIterationEdit.vue

@ -30,8 +30,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="adminUserid" label-width="0px"> <el-form-item prop="adminUserid" label-width="0px">
<mdp-select-user-xm label="负责人姓名" v-model="editForm" userid-key="adminUserid" username-key="adminUsername" @change="editSomeFields(editForm,'adminUserid',$event)"></mdp-select-user-xm>
</el-form-item>
<mdp-select-user label="负责人姓名" v-model="editForm.adminUserid" @change2="editSomeFields(editForm,'adminUserid',$event)"></mdp-select-user>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="istatus" label-width="0px"> <el-form-item prop="istatus" label-width="0px">
@ -175,8 +175,8 @@
let params={}; let params={};
params['ids']=[row].map(i=>i.id) params['ids']=[row].map(i=>i.id)
if(fieldName=='adminUserid'){ if(fieldName=='adminUserid'){
params['adminUserid']=$event[0].userid
params['adminUsername']=$event[0].username
params['adminUserid']=$event.userid
params['adminUsername']=$event.username
}else if(fieldName=='startTime'){ }else if(fieldName=='startTime'){
params['startTime']=row.startTime params['startTime']=row.startTime
params['endTime']=row.endTime params['endTime']=row.endTime

6
src/views/xm/core/xmMenu/XmMenuAdd.vue

@ -31,10 +31,10 @@
</mdp-field-x> </mdp-field-x>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="负责人" v-model="addForm" userid-key="mmUserid" username-key="mmUsername"></mdp-select-user-xm>
</el-col>
<mdp-select-user label="负责人" v-model="editForm.mmUserid"></mdp-select-user>
</el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="提出人" v-model="addForm" userid-key="proposerId" username-key="proposerName"></mdp-select-user-xm>
<mdp-select-user label="提出人" v-model="editForm.proposerId"></mdp-select-user>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="padding-top"> <el-row class="padding-top">

16
src/views/xm/core/xmMenu/XmMenuEdit.vue

@ -118,11 +118,11 @@
</mdp-field-x> </mdp-field-x>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="负责人" v-model="editForm" userid-key="mmUserid" username-key="mmUsername" @change="editXmMenuSomeFields(editForm,'mmUserid',$event)"></mdp-select-user-xm>
</el-col>
<mdp-select-user label="负责人" v-model="editForm.mmUserid" @change2="editXmMenuSomeFields(editForm,'mmUserid',$event)"></mdp-select-user>
</el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="提出人" v-model="editForm" userid-key="proposerId" username-key="proposerName" @change="editXmMenuSomeFields(editForm,'proposerId',$event)"></mdp-select-user-xm>
</el-col>
<mdp-select-user label="提出人" v-model="editForm.proposerId" @change2="editXmMenuSomeFields(editForm,'proposerId',$event)"></mdp-select-user>
</el-col>
</el-row> </el-row>
<el-row class="padding"> <el-row class="padding">
@ -555,11 +555,11 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
}else if(fieldName==='workload'){ }else if(fieldName==='workload'){
params={...params,...$event} params={...params,...$event}
}else if(fieldName==='mmUserid'){ }else if(fieldName==='mmUserid'){
params.mmUserid=$event[0].userid
params.mmUsername=$event[0].username
params.mmUserid=$event.userid
params.mmUsername=$event.username
}else if(fieldName==='proposerId'){ }else if(fieldName==='proposerId'){
params.proposerId=$event[0].userid
params.proposerName=$event[0].username
params.proposerId=$event.userid
params.proposerName=$event.username
}else if(fieldName==='startTime'){ }else if(fieldName==='startTime'){
params.startTime=$event.startTime params.startTime=$event.startTime
params.endTime=$event.endTime params.endTime=$event.endTime

8
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -47,7 +47,7 @@
<i class="el-icon-user"></i> <i class="el-icon-user"></i>
责任人 责任人
</template> </template>
<mdp-select-user-xm style="max-width:180px;" label="选择责任人" v-model="filters.mmUser" :clearable="true"></mdp-select-user-xm>
<mdp-select-user style="max-width:180px;" label="选择责任人" v-model="filters.mmUserid" :clearable="true"></mdp-select-user>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
@ -247,7 +247,7 @@
<template> <template>
<el-table-column prop="mmUsername" label="跟进人" min-width="100" show-overflow-tooltip sortable> <el-table-column prop="mmUsername" label="跟进人" min-width="100" show-overflow-tooltip sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm size="mini" @visible-change="selectVisible(scope.row,$event)" :value="scope.row" userid-key="mmUserid" username-key="mmUsername" :project-id="scope.row.projectId" @change="editXmMenuSomeFields(scope.row,'mmUserid',$event)"></mdp-select-user-xm>
<mdp-select-user size="mini" @visible-change="selectVisible(scope.row,$event)" @change="editXmMenuSomeFields(scope.row,'mmUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productId" label="产品" width="100" show-overflow-tooltip sortable> <el-table-column prop="productId" label="产品" width="100" show-overflow-tooltip sortable>
@ -1248,8 +1248,8 @@
}else if(fieldName==='workload'){ }else if(fieldName==='workload'){
params={...params,...$event} params={...params,...$event}
}else if(fieldName==='mmUserid'){ }else if(fieldName==='mmUserid'){
params.mmUserid=$event[0].userid
params.mmUsername=$event[0].username
params.mmUserid=$event.userid
params.mmUsername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

6
src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue

@ -51,7 +51,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="handlerUsername" label="负责人" width="100" show-overflow-tooltip> <el-table-column prop="handlerUsername" label="负责人" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" userid-key="handlerUserid" username-key="handlerUsername" :project-id="scope.row.projectId" v-model="scope.row" @change="editXmTaskSomeFields(scope.row,'handlerUserid',$event)"></mdp-select-user-xm>
<mdp-select-user @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.handlerUserid" @change="editXmTaskSomeFields(scope.row,'handlerUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
@ -256,8 +256,8 @@ export default {
} }
if(fieldName==='handlerUserid'){ if(fieldName==='handlerUserid'){
if($event){ if($event){
params[fieldName]=$event[0].userid;
params.handlerUsername=$event[0].username
params[fieldName]=$event.userid;
params.handlerUsername=$event.username
}else{ }else{
return; return;
} }

6
src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue

@ -57,7 +57,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="mmUsername" label="跟进人" width="150" show-overflow-tooltip sortable> <el-table-column prop="mmUsername" label="跟进人" width="150" show-overflow-tooltip sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" userid-key="mmUserid" username-key="mmUsername" :project-id="linkProjectId" v-model="scope.row" @change="editXmMenuSomeFields(scope.row,'mmUserid',$enent)"></mdp-select-user-xm>
<mdp-select-user show-style="tag" @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.mmUserid" @change="editXmMenuSomeFields(scope.row,'mmUserid',$enent)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -258,8 +258,8 @@ export default {
}else if(fieldName==='workload'){ }else if(fieldName==='workload'){
params={...params,...$event} params={...params,...$event}
}else if(fieldName==='mmUserid'){ }else if(fieldName==='mmUserid'){
params.mmUserid=$event[0].userid
params.mmUsername=$event[0].username
params.mmUserid=$event.userid
params.mmUsername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

12
src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue

@ -65,7 +65,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" userid-key="createUserid" username-key="createUsername" :project-id="scope.row.projectId" v-model="scope.row" @change="editXmTaskSomeFields(scope.row,'creatorUserid',$event)"></mdp-select-user-xm>
<mdp-select-user show-style="tag" @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.createUserid" @change="editXmTaskSomeFields(scope.row,'creatorUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
@ -77,7 +77,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" userid-key="executorUserid" username-key="executorUsername" :project-id="scope.row.projectId" v-model="scope.row" @change="selectExecUserConfirm(scope.row,'executorUserid',$event)"></mdp-select-user-xm>
<mdp-select-user show-style="tag" @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.executorUserid" @change="selectExecUserConfirm(scope.row,'executorUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -346,11 +346,11 @@ export default {
}else if(fieldName==='workload'){ }else if(fieldName==='workload'){
params={...params,...$event} params={...params,...$event}
}else if(fieldName==='executorUserid'){ }else if(fieldName==='executorUserid'){
params.executorUserid=$event[0].userid
params.executorUsername=$event[0].username
params.executorUserid=$event.userid
params.executorUsername=$event.username
}else if(fieldName==='createUserid'){ }else if(fieldName==='createUserid'){
params.createUserid=$event[0].userid
params.createUsername=$event[0].username
params.createUserid=$event.userid
params.createUsername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

12
src/views/xm/core/xmProduct/XmProductEdit.vue

@ -331,14 +331,14 @@ export default {
let params = {}; let params = {};
params["ids"] = [row].map((i) => i.id); params["ids"] = [row].map((i) => i.id);
if (fieldName == "admUserid") { if (fieldName == "admUserid") {
params["admUserid"] = $event[0].userid;
params["admUsername"] = $event[0].username;
params["admUserid"] = $event.userid;
params["admUsername"] = $event.username;
} else if (fieldName == "assUserid") { } else if (fieldName == "assUserid") {
params["assUserid"] = $event[0].userid;
params["assUsername"] = $event[0].username;
params["assUserid"] = $event.userid;
params["assUsername"] = $event.username;
} else if (fieldName == "pmUserid") { } else if (fieldName == "pmUserid") {
params["pmUserid"] = $event[0].userid;
params["pmUsername"] = $event[0].username;
params["pmUserid"] = $event.userid;
params["pmUsername"] = $event.username;
} else if (fieldName == "startTime") { } else if (fieldName == "startTime") {
params["startTime"] = row.startTime; params["startTime"] = row.startTime;
params["endTime"] = row.endTime; params["endTime"] = row.endTime;

6
src/views/xm/core/xmProduct/XmProductMng.vue

@ -209,8 +209,8 @@
</div> </div>
<div class="project-footer"> <div class="project-footer">
<div class="project-type" title="产品经理"> <div class="project-type" title="产品经理">
<mdp-select-user-xm v-if="p.pmUserid" :value="p" userid-key="pmUserid" username-key="pmUsername" :disabled="true"></mdp-select-user-xm>
<mdp-select-user-xm v-else-if="p.admUserid" :value="p" userid-key="admUserid" username-key="admUsername" :disabled="true"></mdp-select-user-xm>
<mdp-select-user show-style="tag" v-if="p.pmUserid" :value="p.pmUserid" :disabled="true"></mdp-select-user>
<mdp-select-user show-style="tag" v-else-if="p.admUserid" :value="p.admUserid" :disabled="true"></mdp-select-user>
</div> </div>
<div class="project-period">{{p.startTime?p.startTime.substr(0,10):''}} ~{{p.endTime?p.endTime.substr(0,10):''}}</div> <div class="project-period">{{p.startTime?p.startTime.substr(0,10):''}} ~{{p.endTime?p.endTime.substr(0,10):''}}</div>
<!--<div class="project-period">{{p.startTime.substr(0,10)}} ~{{p.endTime.substr(0,10)}}</div>--> <!--<div class="project-period">{{p.startTime.substr(0,10)}} ~{{p.endTime.substr(0,10)}}</div>-->
@ -284,7 +284,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="pmUsername" label="产品经理" width="150" sortable show-overflow-tooltip> <el-table-column prop="pmUsername" label="产品经理" width="150" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm v-model="scope.row" userid-key="pmUserid" username-key="pmUsername" :disabled="true"></mdp-select-user-xm>
<mdp-select-user v-model="scope.row.pmUserid" :disabled="true"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>

12
src/views/xm/core/xmProduct/XmProductSetting.vue

@ -276,14 +276,14 @@ export default {
let params = {}; let params = {};
params["ids"] = [row].map((i) => i.id); params["ids"] = [row].map((i) => i.id);
if (fieldName == "admUserid") { if (fieldName == "admUserid") {
params["admUserid"] = $event[0].userid;
params["admUsername"] = $event[0].username;
params["admUserid"] = $event.userid;
params["admUsername"] = $event.username;
} else if (fieldName == "assUserid") { } else if (fieldName == "assUserid") {
params["assUserid"] = $event[0].userid;
params["assUsername"] = $event[0].username;
params["assUserid"] = $event.userid;
params["assUsername"] = $event.username;
} else if (fieldName == "pmUserid") { } else if (fieldName == "pmUserid") {
params["pmUserid"] = $event[0].userid;
params["pmUsername"] = $event[0].username;
params["pmUserid"] = $event.userid;
params["pmUsername"] = $event.username;
} if (fieldName == "groupScope"||fieldName == "groupTransmit"||fieldName == "testScope"||fieldName=="testTransmit"||fieldName == "menuScope"||fieldName=="menuTransmit"||fieldName == "iterationScope"||fieldName=="iterationTransmit") { } if (fieldName == "groupScope"||fieldName == "groupTransmit"||fieldName == "testScope"||fieldName=="testTransmit"||fieldName == "menuScope"||fieldName=="menuTransmit"||fieldName == "iterationScope"||fieldName=="iterationTransmit") {
params["qxCode"] = [this.qxCode.groupScope,this.qxCode.groupTransmit,this.qxCode.testScope,this.qxCode.testTransmit,this.qxCode.menuScope,this.qxCode.menuTransmit,this.qxCode.iterationScope,this.qxCode.iterationTransmit].join(",") params["qxCode"] = [this.qxCode.groupScope,this.qxCode.groupTransmit,this.qxCode.testScope,this.qxCode.testTransmit,this.qxCode.menuScope,this.qxCode.menuTransmit,this.qxCode.iterationScope,this.qxCode.iterationTransmit].join(",")
} else { } else {

12
src/views/xm/core/xmProject/XmProjectEdit.vue

@ -888,14 +888,14 @@
if (fieldName == "admUserid") { if (fieldName == "admUserid") {
params["admUserid"] = $event[0].userid;
params["admUsername"] = $event[0].username;
params["admUserid"] = $event.userid;
params["admUsername"] = $event.username;
} else if (fieldName == "assUserid") { } else if (fieldName == "assUserid") {
params["assUserid"] = $event[0].userid;
params["assUsername"] = $event[0].username;
params["assUserid"] = $event.userid;
params["assUsername"] = $event.username;
} else if (fieldName == "pmUserid") { } else if (fieldName == "pmUserid") {
params["pmUserid"] = $event[0].userid;
params["pmUsername"] = $event[0].username;
params["pmUserid"] = $event.userid;
params["pmUsername"] = $event.username;
} else{ } else{
params[fieldName]=$event params[fieldName]=$event
} }

4
src/views/xm/core/xmProject/XmProjectMng.vue

@ -182,8 +182,8 @@
</div> </div>
<div class="project-footer"> <div class="project-footer">
<div class="project-type" title="项目经理"> <div class="project-type" title="项目经理">
<mdp-select-user-xm v-if="p.pmUserid" :value="p" userid-key="pmUserid" username-key="pmUsername" :disabled="true"></mdp-select-user-xm>
<mdp-select-user-xm v-else-if="p.createUserid" :value="p" userid-key="createUserid" username-key="createUsername" :disabled="true"></mdp-select-user-xm>
<mdp-select-user v-if="p.pmUserid" :value="p.pmUserid" :disabled="true"></mdp-select-user>
<mdp-select-user v-else-if="p.createUserid" :value="p.pmUserid" :disabled="true"></mdp-select-user>
</div> </div>
<div class="project-period">{{p.startTime?p.startTime.substr(0,10):''}} ~{{p.endTime?p.endTime.substr(0,10):''}}</div> <div class="project-period">{{p.startTime?p.startTime.substr(0,10):''}} ~{{p.endTime?p.endTime.substr(0,10):''}}</div>

14
src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@ -59,11 +59,11 @@
</el-form-item> </el-form-item>
<el-row class="padding"> <el-row class="padding">
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm :project-id="editForm.projectId" :product-id="editForm.productId" label="责任人" v-model="editForm" userid-key="handlerUserid" username-key="handlerUsername" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)">
<mdp-select-user label="责任人" v-model="editForm.handlerUserid" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)">
<el-row slot="extOper" style="margin-left:20px;"> <el-row slot="extOper" style="margin-left:20px;">
指派给 <el-button type="text" @click="sendToAsk"> 提出人</el-button> <el-button type="text" @click="sendToCreater"> 创建人</el-button> 指派给 <el-button type="text" @click="sendToAsk"> 提出人</el-button> <el-button type="text" @click="sendToCreater"> 创建人</el-button>
</el-row> </el-row>
</mdp-select-user-xm>
</mdp-select-user>
</el-col> </el-col>
@ -96,7 +96,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="提出人" prop="askUsername"> <el-form-item label="提出人" prop="askUsername">
<mdp-select-user-xm :project-id="editForm.projectId" :product-id="editForm.productId" label="提出人" v-model="editForm" userid-key="askUserid" username-key="askUsername" @change="editXmQuestionSomeFields(editForm,'askUserid',$event)"></mdp-select-user-xm>
<mdp-select-user label="提出人" v-model="editForm.askUserid" @change2="editXmQuestionSomeFields(editForm,'askUserid',$event)"></mdp-select-user>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -486,15 +486,15 @@
var params={ids:[row.id]}; var params={ids:[row.id]};
if(fieldName==='handlerUserid'){ if(fieldName==='handlerUserid'){
if($event){ if($event){
params[fieldName]=$event[0].userid;
params.handlerUsername=$event[0].username
params[fieldName]=$event.userid;
params.handlerUsername=$event.username
}else{ }else{
return; return;
} }
}else if(fieldName==='askUserid'){ }else if(fieldName==='askUserid'){
if($event){ if($event){
params[fieldName]=$event[0].userid;
params.askUsername=$event[0].username
params[fieldName]=$event.userid;
params.askUsername=$event.username
}else{ }else{
return; return;
} }

10
src/views/xm/core/xmQuestion/XmQuestionMng.vue

@ -35,14 +35,14 @@
<i class="el-icon-user"></i> <i class="el-icon-user"></i>
创建者 创建者
</template> </template>
<mdp-select-user-xm label="选择创建者" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>
<mdp-select-user label="选择创建者" v-model="filters.createUserid" :clearable="true"></mdp-select-user>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-user"></i> <i class="el-icon-user"></i>
指派给 指派给
</template> </template>
<mdp-select-user-xm label="选择负责人" v-model="filters.handlerUser" :clearable="true"></mdp-select-user-xm>
<mdp-select-user label="选择负责人" v-model="filters.handlerUserid" :clearable="true"></mdp-select-user>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
@ -204,7 +204,7 @@
--> -->
<el-table-column prop="handlerUsername" label="负责人" width="100" show-overflow-tooltip> <el-table-column prop="handlerUsername" label="负责人" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" :key="scope.row.id" v-model="scope.row" userid-key="handlerUserid" username-key="handlerUsername" :project-id="scope.row.projectId" @change="editXmQuestionSomeFields(scope.row,'handlerUserid',$event)"></mdp-select-user-xm>
<mdp-select-user show-style="tag" @visible-change="selectVisible(scope.row,$event)" :key="scope.row.id" v-model="scope.row.handlerUserid" @change2="editXmQuestionSomeFields(scope.row,'handlerUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="tagNames" label="标签" width="100" show-overflow-tooltip> <el-table-column prop="tagNames" label="标签" width="100" show-overflow-tooltip>
@ -1000,8 +1000,8 @@
} }
if(fieldName==='handlerUserid'){ if(fieldName==='handlerUserid'){
if($event){ if($event){
params[fieldName]=$event[0].userid;
params.handlerUsername=$event[0].username
params[fieldName]=$event.userid;
params.handlerUsername=$event.username
}else{ }else{
return; return;
} }

2
src/views/xm/core/xmTask/XmTaskAdd.vue

@ -47,7 +47,7 @@
<el-row class="padding"> <el-row class="padding">
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="负责人" v-model="addForm" userid-key="createUserid" username-key="createUsername" :project-id="addForm.projectId?addForm.projectId:(xmProjectCpd?xmProjectCpd.id:null)" @change="editXmTaskSomeFields(addForm,'createUserid',$event)"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="addForm.createUserid" @change2="editXmTaskSomeFields(addForm,'createUserid',$event)"></mdp-select-user>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-date-range <mdp-date-range

16
src/views/xm/core/xmTask/XmTaskEdit.vue

@ -143,13 +143,13 @@
</mdp-field-x> </mdp-field-x>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="负责人" v-model="editForm" userid-key="createUserid" username-key="createUsername" :project-id="xmProjectCpd?xmProjectCpd.id:null" :product-id="xmProductCpd?xmProductCpd.id:null" @change="editXmTaskSomeFields(editForm,'createUserid',$event)"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="editForm.createUserid" @change2="editXmTaskSomeFields(editForm,'createUserid',$event)"></mdp-select-user>
</el-col> </el-col>
<el-col :span="8" v-if="editForm.ntype=='0'"> <el-col :span="8" v-if="editForm.ntype=='0'">
<mdp-select-user-xm v-if="editForm.crowd=='1'" label="执行人" v-model="editForm" userid-key="executorUserid" username-key="executorUsername" >
<mdp-select-user v-if="editForm.crowd=='1'" label="执行人" v-model="editForm.executorUserid">
<el-button slot="oper" @click="activateTabPaneName='42'">去管理竞标人</el-button> <el-button slot="oper" @click="activateTabPaneName='42'">去管理竞标人</el-button>
</mdp-select-user-xm>
<mdp-select-user-xm v-if="editForm.crowd!='1'" label="执行人" v-model="editForm" userid-key="executorUserid" username-key="executorUsername" :project-id="xmProjectCpd?xmProjectCpd.id:null" :product-id="xmProductCpd?xmProductCpd.id:null" @change="editXmTaskSomeFields(editForm,'executorUserid',$event)"></mdp-select-user-xm>
</mdp-select-user>
<mdp-select-user v-if="editForm.crowd!='1'" label="执行人" v-model="editForm.executorUserid" @change2="editXmTaskSomeFields(editForm,'executorUserid',$event)"></mdp-select-user>
</el-col> </el-col>
</el-row> </el-row>
@ -947,11 +947,11 @@
}else if(fieldName==='workload'){ }else if(fieldName==='workload'){
params={...params,...$event} params={...params,...$event}
}else if(fieldName==='executorUserid'){ }else if(fieldName==='executorUserid'){
params.executorUserid=$event[0].userid
params.executorUsername=$event[0].username
params.executorUserid=$event.userid
params.executorUsername=$event.username
}else if(fieldName==='createUserid'){ }else if(fieldName==='createUserid'){
params.createUserid=$event[0].userid
params.createUsername=$event[0].username
params.createUserid=$event.userid
params.createUsername=$event.username
}else if(fieldName==='dateRange'){ }else if(fieldName==='dateRange'){
params.startTime=$event.startTime params.startTime=$event.startTime
params.endTime=$event.endTime params.endTime=$event.endTime

24
src/views/xm/core/xmTask/XmTaskMng.vue

@ -80,11 +80,11 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label">责任人</template> <template slot="label">责任人</template>
<mdp-select-user-xm label="选择责任人" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>
<mdp-select-user label="选择责任人" v-model="filters.createUserid" :clearable="true"></mdp-select-user>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label">执行人</template> <template slot="label">执行人</template>
<mdp-select-user-xm label="选择执行人" v-model="filters.executor" :clearable="true"></mdp-select-user-xm>
<mdp-select-user label="选择执行人" v-model="filters.executorUserid" :clearable="true"></mdp-select-user>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label">产品</template> <template slot="label">产品</template>
@ -430,7 +430,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm size="mini" v-model="scope.row" userid-key="createUserid" @visible-change="selectVisible(scope.row,$event)" username-key="createUsername" :project-id="scope.row.projectId" @change="editXmTaskSomeFields(scope.row,'createUserid',$event)"></mdp-select-user-xm>
<mdp-select-user show-style="tag" size="mini" v-model="scope.row.createUserid" @visible-change="selectVisible(scope.row,$event)" @change2="editXmTaskSomeFields(scope.row,'createUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -441,7 +441,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm size="mini" :key="scope.row.id" v-model="scope.row" userid-key="executorUserid" @visible-change="selectVisible(scope.row,$event)" username-key="executorUsername" :project-id="scope.row.projectId" @change="editXmTaskSomeFields(scope.row,'executorUserid',$event)"></mdp-select-user-xm>
<mdp-select-user show-style="tag" size="mini" :key="scope.row.id" v-model="scope.row.executorUserid" @visible-change="selectVisible(scope.row,$event)" @change="editXmTaskSomeFields(scope.row,'executorUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -2032,11 +2032,11 @@ export default {
if (this.filters.taskOut) { if (this.filters.taskOut) {
params.taskOut = this.filters.taskOut; params.taskOut = this.filters.taskOut;
} }
if (this.filters.createUser) {
params.createUserid = this.filters.createUser.userid;
if (this.filters.createUserid) {
params.createUserid = this.filters.createUserid;
} }
if (this.filters.executor) {
params.executorUserid = this.filters.executor.userid;
if (this.filters.executorUserid) {
params.executorUserid = this.filters.executorUserid;
} }
if (this.filters.product) { if (this.filters.product) {
params.productId = this.filters.product.id; params.productId = this.filters.product.id;
@ -2109,11 +2109,11 @@ export default {
this.$notify({position:'bottom-left',showClose:true,message:'外包任务不允许直接设置执行人,请到执行人管理中选择',type:'error'}) this.$notify({position:'bottom-left',showClose:true,message:'外包任务不允许直接设置执行人,请到执行人管理中选择',type:'error'})
return; return;
} }
params.executorUserid=$event[0].userid
params.executorUsername=$event[0].username
params.executorUserid=$event.userid
params.executorUsername=$event.username
}else if(fieldName==='createUserid'){ }else if(fieldName==='createUserid'){
params.createUserid=$event[0].userid
params.createUsername=$event[0].username
params.createUserid=$event.userid
params.createUsername=$event.username
}else if(fieldName==='startTime'){ }else if(fieldName==='startTime'){
params.startTime=$event.startTime params.startTime=$event.startTime
params.endTime=$event.endTime params.endTime=$event.endTime

4
src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue

@ -42,7 +42,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="username" label="姓名" min-width="150" > <el-table-column prop="username" label="姓名" min-width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm :key="scope.row.id" v-model="scope.row" userid-key="userid" username-key="username" :project-id="scope.row.projectId" :disabled="true"></mdp-select-user-xm>
<mdp-select-user :key="scope.row.id" v-model="scope.row.userid" :disabled="true"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
@ -77,7 +77,7 @@
<el-form :model="quotePriceForm" label-width="100px" ref="quotePriceForm"> <el-form :model="quotePriceForm" label-width="100px" ref="quotePriceForm">
<el-form-item label="候选人名称"> <el-form-item label="候选人名称">
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm v-model="quotePriceForm" userid-key="userid" username-key="username" :disabled="true"></mdp-select-user-xm>
<mdp-select-user v-model="quotePriceForm.userid" :disabled="true"></mdp-select-user>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="报价工期" prop="quoteWeekday"> <el-form-item label="报价工期" prop="quoteWeekday">

2
src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

@ -22,7 +22,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="username" label="用户姓名" width="150" sortable show-overflow-tooltip fixed="left"> <el-table-column prop="username" label="用户姓名" width="150" sortable show-overflow-tooltip fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm :key="scope.row.id" v-model="scope.row" userid-key="userid" username-key="username" :project-id="scope.row.projectId" :disabled="true"></mdp-select-user-xm>
<mdp-select-user :key="scope.row.id" v-model="scope.row.userid" :disabled="true"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="execUserBranchId" label="用户归属公司" width="150" sortable show-overflow-tooltip fixed="left"> <el-table-column prop="execUserBranchId" label="用户归属公司" width="150" sortable show-overflow-tooltip fixed="left">

2
src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue

@ -30,7 +30,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="username" label="用户姓名" width="150" sortable show-overflow-tooltip fixed="left"> <el-table-column prop="username" label="用户姓名" width="150" sortable show-overflow-tooltip fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm :key="scope.row.id" v-model="scope.row" userid-key="userid" username-key="username" :project-id="scope.row.projectId" :disabled="true"></mdp-select-user-xm>
<mdp-select-user :key="scope.row.id" v-model="scope.row.userid" :disabled="true"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="execUserBranchId" label="用户归属公司" width="150" sortable show-overflow-tooltip fixed="left"> <el-table-column prop="execUserBranchId" label="用户归属公司" width="150" sortable show-overflow-tooltip fixed="left">

16
src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue

@ -68,7 +68,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" userid-key="creatorUserid" username-key="creatorUsername" :project-id="scope.row.projectId" v-model="scope.row" @change="editXmTaskSomeFields(scope.row,'creatorUserid',$event)"></mdp-select-user-xm>
<mdp-select-user show-style="tag" @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.creatorUserid" @change2="editXmTaskSomeFields(scope.row,'creatorUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
@ -80,7 +80,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" userid-key="executorUserid" username-key="executorUsername" :project-id="scope.row.projectId" v-model="scope.row" @change="selectExecUserConfirm(scope.row,'executorUserid',$event)"></mdp-select-user-xm>
<mdp-select-user show-style="tag" @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.executorUserid" @change2="selectExecUserConfirm(scope.row,'executorUserid',$event)"></mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -330,9 +330,7 @@ export default {
}, },
// //
selectExecUserConfirm(row,fieldName,users) {
var user= users[0];
selectExecUserConfirm(row,fieldName,user) {
var params={} var params={}
params.taskId = row.id; params.taskId = row.id;
params.projectId=row.projectId params.projectId=row.projectId
@ -386,11 +384,11 @@ export default {
}else if(fieldName==='workload'){ }else if(fieldName==='workload'){
params={...params,...$event} params={...params,...$event}
}else if(fieldName==='executorUserid'){ }else if(fieldName==='executorUserid'){
params.executorUserid=$event[0].userid
params.executorUsername=$event[0].username
params.executorUserid=$event.userid
params.executorUsername=$event.username
}else if(fieldName==='createUserid'){ }else if(fieldName==='createUserid'){
params.createUserid=$event[0].userid
params.createUsername=$event[0].username
params.createUserid=$event.userid
params.createUsername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

10
src/views/xm/core/xmTestCase/XmTestCaseEdit.vue

@ -49,7 +49,7 @@
<mdp-select show-style="x" label="状态" item-code="testCaseStatus" v-model="editForm.caseStatus" @change="editSomeFields(editForm,'caseStatus',$event)"></mdp-select> <mdp-select show-style="x" label="状态" item-code="testCaseStatus" v-model="editForm.caseStatus" @change="editSomeFields(editForm,'caseStatus',$event)"></mdp-select>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="责任人" userid-key="cuserid" username-key="cusername" v-model="editForm" @change="editSomeFields(editForm,'cuserid',$event)" :product-id="editForm.productId"></mdp-select-user-xm>
<mdp-select-user label="责任人" v-model="editForm.cuserid" @change2="editSomeFields(editForm,'cuserid',$event)"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -644,12 +644,12 @@ import JsonViewer from 'vue-json-viewer'
params[fieldName]=$event.menuId params[fieldName]=$event.menuId
params['menuName']=$event.menuName params['menuName']=$event.menuName
}else if(fieldName=='cuserid'){ }else if(fieldName=='cuserid'){
params[fieldName]=$event[0].userid
params['cusername']=$event[0].username
params[fieldName]=$event.userid
params['cusername']=$event.username
params['cbranchId']=$event[0].branchId params['cbranchId']=$event[0].branchId
}else if(fieldName=='luserid'){ }else if(fieldName=='luserid'){
params[fieldName]=$event[0].userid
params['lusername']=$event[0].username
params[fieldName]=$event.userid
params['lusername']=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

8
src/views/xm/core/xmTestCase/XmTestCaseMng.vue

@ -59,8 +59,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="cusername" label="负责人姓名" min-width="120" show-overflow-tooltip> <el-table-column prop="cusername" label="负责人姓名" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" userid-key="cuserid" username-key="cusername" :product-id="xmProductCpd?xmProductCpd.id:null" v-model="scope.row" @change="editSomeFields(scope.row,'cuserid',$event)">
</mdp-select-user-xm>
<mdp-select-user show-style="tag" @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.cuserid" @change2="editSomeFields(scope.row,'cuserid',$event)">
</mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
@ -327,8 +327,8 @@ export default {
params['ids']=[row].map(i=>i.id) params['ids']=[row].map(i=>i.id)
} }
if(fieldName=='cuserid'){ if(fieldName=='cuserid'){
params.cuserid=$event[0].userid
params.cusername=$event[0].username
params.cuserid=$event.userid
params.cusername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

6
src/views/xm/core/xmTestCasedb/XmTestCasedbEdit.vue

@ -18,7 +18,7 @@
<el-row class="padding"> <el-row class="padding">
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="cuserid" label-width="0px"> <el-form-item prop="cuserid" label-width="0px">
<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="editForm" @change="editSomeFields(editForm,'cuserid',$event)" :product-id="editForm.productId" :project-id="selProject?selProject.id:null"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="editForm.cuserid" @change2="editSomeFields(editForm,'cuserid',$event)"></mdp-select-user>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -162,8 +162,8 @@ import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//修
let params={}; let params={};
params['ids']=[row].map(i=>i.id) params['ids']=[row].map(i=>i.id)
if(fieldName=='cuserid'){ if(fieldName=='cuserid'){
params.cuserid=$event[0].userid
params.cusername=$event[0].username
params.cuserid=$event.userid
params.cusername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

4
src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue

@ -37,8 +37,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="cusername" label="创建人" min-width="120" show-overflow-tooltip> <el-table-column prop="cusername" label="创建人" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm userid-key="cuserid" username-key="cusername" v-model="scope.row" :disabled="true">
</mdp-select-user-xm>
<mdp-select-user v-model="scope.row.cuserid" :disabled="true">
</mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ctime" label="创建日期" min-width="120" show-overflow-tooltip> <el-table-column prop="ctime" label="创建日期" min-width="120" show-overflow-tooltip>

6
src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue

@ -13,7 +13,7 @@
</el-form-item> </el-form-item>
<el-row class="padding-bottom"> <el-row class="padding-bottom">
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="editForm" :project-id="editForm.projectId" :product-id="editForm.productId" @change="editSomeFields(editForm,'cuserid',$event)"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="editForm.cuserid" @change2="editSomeFields(editForm,'cuserid',$event)"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select show-style="x" label="状态" item-code="testPlanStatus" v-model="editForm.status" @change="editSomeFields(editForm,'status',$event)"></mdp-select> <mdp-select show-style="x" label="状态" item-code="testPlanStatus" v-model="editForm.status" @change="editSomeFields(editForm,'status',$event)"></mdp-select>
@ -181,8 +181,8 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
params[fieldName]=$event.stime params[fieldName]=$event.stime
params.etime=$event.etime params.etime=$event.etime
}else if(fieldName=='cuserid'){ }else if(fieldName=='cuserid'){
params[fieldName]=$event[0].userid
params.cusername=$event[0].username
params[fieldName]=$event.userid
params.cusername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

4
src/views/xm/core/xmTestPlan/XmTestPlanMng.vue

@ -35,8 +35,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="cusername" label="负责人" min-width="120" show-overflow-tooltip> <el-table-column prop="cusername" label="负责人" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm userid-key="cuserid" username-key="cusername" v-model="scope.row" :disabled="true">
</mdp-select-user-xm>
<mdp-select-user v-model="scope.row.cuserid" :disabled="true">
</mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="totalCases" label="用例数" width="120" show-overflow-tooltip> <el-table-column prop="totalCases" label="用例数" width="120" show-overflow-tooltip>

6
src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue

@ -47,7 +47,7 @@
</el-row> </el-row>
<el-row class="padding"> <el-row class="padding">
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="执行人" userid-key="execUserid" username-key="execUsername" v-model="editForm" @change="editSomeFields(editForm,'execUserid',$event)"></mdp-select-user-xm>
<mdp-select-user label="执行人" v-model="editForm.execUserid" @change="editSomeFields(editForm,'execUserid',$event)"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select show-style="x" label="优先级" item-code="priority" v-model="editForm.priority" @change="editSomeFields(editForm,'priority',$event)"></mdp-select> <mdp-select show-style="x" label="优先级" item-code="priority" v-model="editForm.priority" @change="editSomeFields(editForm,'priority',$event)"></mdp-select>
@ -507,8 +507,8 @@ import JsonViewer from 'vue-json-viewer'
params['pkList']=[row].map(i=>{ return { caseId:i.caseId, planId:i.planId}}) params['pkList']=[row].map(i=>{ return { caseId:i.caseId, planId:i.planId}})
if(fieldName=='execUserid'){ if(fieldName=='execUserid'){
params.execUserid=$event[0].userid
params.execUsername=$event[0].username
params.execUserid=$event.userid
params.execUsername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

8
src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue

@ -56,8 +56,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="execUsername" label="执行人姓名" min-width="120" > <el-table-column prop="execUsername" label="执行人姓名" min-width="120" >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" :product-id="xmProductCpd?xmProductCpd.id:null" :project-id="xmProject?xmProject.id:null" userid-key="execUserid" username-key="execUsername" v-model="scope.row" @change="editSomeFields(scope.row,'execUserid',$event)">
</mdp-select-user-xm>
<mdp-select-user @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.execUserid" @change2="editSomeFields(scope.row,'execUserid',$event)">
</mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="priority" label="优先级" width="120" > <el-table-column prop="priority" label="优先级" width="120" >
@ -364,8 +364,8 @@ export default {
params['pkList']=[row].map(i=>{ return { caseId:i.caseId, planId:i.planId}}) params['pkList']=[row].map(i=>{ return { caseId:i.caseId, planId:i.planId}})
} }
if(fieldName=='execUserid'){ if(fieldName=='execUserid'){
params.execUserid=$event[0].userid
params.execUsername=$event[0].username
params.execUserid=$event.userid
params.execUsername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

4
src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue

@ -44,8 +44,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="execUsername" label="执行人姓名" min-width="120" > <el-table-column prop="execUsername" label="执行人姓名" min-width="120" >
<template slot-scope="scope"> <template slot-scope="scope">
<mdp-select-user-xm userid-key="execUserid" username-key="execUsername" v-model="scope.row" :disabled="true">
</mdp-select-user-xm>
<mdp-select-user v-model="scope.row.execUserid" :disabled="true">
</mdp-select-user>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="priority" label="优先级" width="120" > <el-table-column prop="priority" label="优先级" width="120" >

2
src/views/xm/core/xmWorkload/WorkloadSetDayList.vue

@ -24,7 +24,7 @@
></xm-project-select> ></xm-project-select>
</el-form-item> </el-form-item>
<el-form-item label="人员编号" v-if="queryScope !== 'my' && (!user|| !user.userid)"> <el-form-item label="人员编号" v-if="queryScope !== 'my' && (!user|| !user.userid)">
<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
<mdp-select-user label="选择人员" :clearable="true" v-model="filters.userid"></mdp-select-user>
</el-form-item> </el-form-item>
<el-form-item label="任务编号编号"> <el-form-item label="任务编号编号">

2
src/views/xm/core/xmWorkload/WorkloadSetMonthList.vue

@ -24,7 +24,7 @@
></xm-project-select> ></xm-project-select>
</el-form-item> </el-form-item>
<el-form-item label="人员编号" v-if="queryScope !== 'my'"> <el-form-item label="人员编号" v-if="queryScope !== 'my'">
<mdp-select-user-xm :clearable="true" label="选择人员" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
<mdp-select-user :clearable="true" label="选择人员" v-model="filters.userid"></mdp-select-user>
</el-form-item> </el-form-item>
<el-form-item label="任务编号编号"> <el-form-item label="任务编号编号">

2
src/views/xm/core/xmWorkload/XmWorkloadEdit.vue

@ -54,7 +54,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工时归属" prop="username"> <el-form-item label="工时归属" prop="username">
<mdp-select-user-xm label="工时归属" v-model="editForm" userid-key="userid" username-key="username" :project-id="val.projectId"></mdp-select-user-xm>
<mdp-select-user label="工时归属" v-model="editForm.userid"></mdp-select-user>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

2
src/views/xm/core/xmWorkload/XmWorkloadInit.vue

@ -54,7 +54,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工时归属" prop="username"> <el-form-item label="工时归属" prop="username">
<mdp-select-user-xm label="工时归属" v-model="editForm" userid-key="userid" username-key="username" :project-id="val.projectId"></mdp-select-user-xm>
<mdp-select-user label="工时归属" v-model="editForm.userid"></mdp-select-user>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

6
src/views/xm/rpt/branch/branchRptOverview.vue

@ -39,7 +39,7 @@
<el-form :model="rawDatas" label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left"> <el-form :model="rawDatas" label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">
<el-row class="padding"> <el-row class="padding">
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="rawDatas.cuserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-select show-style="x" label="状态" item-code="testPlanStatus" v-model="rawDatas.status"></mdp-select> <mdp-select show-style="x" label="状态" item-code="testPlanStatus" v-model="rawDatas.status"></mdp-select>
@ -224,8 +224,8 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
params[fieldName]=$event.stime params[fieldName]=$event.stime
params.etime=$event.etime params.etime=$event.etime
}else if(fieldName=='cuserid'){ }else if(fieldName=='cuserid'){
params[fieldName]=$event[0].userid
params.cusername=$event[0].username
params[fieldName]=$event.userid
params.cusername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

3
src/views/xm/rpt/iteration/iterationRptOverview.vue

@ -45,8 +45,7 @@
</el-row> </el-row>
<el-row class="padding"> <el-row class="padding">
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="负责人" userid-key="adminUserid" username-key="adminUsername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="rawDatas.adminUserid" @change2="(u)=>{rawDatas.adminUsername=u.username}"></mdp-select-user>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-select show-style="x" label="状态" item-code="iterationStatus" v-model="rawDatas.istatus"></mdp-select> <mdp-select show-style="x" label="状态" item-code="iterationStatus" v-model="rawDatas.istatus"></mdp-select>

6
src/views/xm/rpt/product/productRptOverview.vue

@ -45,13 +45,13 @@
</el-row> </el-row>
<el-row class="padding"> <el-row class="padding">
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="主管领导" userid-key="admUserid" username-key="admUsername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="主管领导" v-model="rawDatas.admUserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="负责人" userid-key="pmUserid" username-key="pmUsername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="rawDatas.pmUserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="助理" userid-key="assUserid" username-key="assUsername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="助理" v-model="rawDatas.assUserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select show-style="x" label="状态" item-code="xmProductPstatus" v-model="rawDatas.pstatus"></mdp-select> <mdp-select show-style="x" label="状态" item-code="xmProductPstatus" v-model="rawDatas.pstatus"></mdp-select>

6
src/views/xm/rpt/project/projectRptOverview.vue

@ -45,13 +45,13 @@
</el-row> </el-row>
<el-row class="padding"> <el-row class="padding">
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="主管领导" userid-key="admUserid" username-key="admUsername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="主管领导" v-model="rawDatas.admUserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="负责人" userid-key="pmUserid" username-key="pmUsername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="rawDatas.pmUserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="助理" userid-key="assUserid" username-key="assUsername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="助理" v-model="rawDatas.assUserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select show-style="x" label="状态" item-code="projectStatus" v-model="rawDatas.status"></mdp-select> <mdp-select show-style="x" label="状态" item-code="projectStatus" v-model="rawDatas.status"></mdp-select>

2
src/views/xm/rpt/project/projectWorkloadSetDayList.vue

@ -30,7 +30,7 @@
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span> <span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item> </el-form-item>
<el-form-item label="人员编号"> <el-form-item label="人员编号">
<mdp-select-user-xm label="选择人员" :clearable="true" v-model="params" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
<mdp-select-user label="选择人员" :clearable="true" v-model="params.userid"></mdp-select-user>
</el-form-item> </el-form-item>

2
src/views/xm/rpt/project/projectWorkloadSetMonthList.vue

@ -30,7 +30,7 @@
<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span> <span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{ xmProject.name }} </span> </span>
</el-form-item> </el-form-item>
<el-form-item label="人员编号"> <el-form-item label="人员编号">
<mdp-select-user-xm label="选择人员" :clearable="true" v-model="params" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
<mdp-select-user label="选择人员" :clearable="true" v-model="params.userid"></mdp-select-user>
</el-form-item> </el-form-item>

2
src/views/xm/rpt/testCase/testCasedbRptOverview.vue

@ -14,7 +14,7 @@
</el-row> </el-row>
<el-row class="padding"> <el-row class="padding">
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="rawDatas.cuserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<mdp-select show-style="x" label="状态" item-code="casedbStatus" v-model="rawDatas.status"></mdp-select> <mdp-select show-style="x" label="状态" item-code="casedbStatus" v-model="rawDatas.status"></mdp-select>

6
src/views/xm/rpt/testPlan/testPlanRptOverview.vue

@ -42,7 +42,7 @@
<el-form :model="rawDatas" label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left"> <el-form :model="rawDatas" label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">
<el-row class="padding"> <el-row class="padding">
<el-col :span="8"> <el-col :span="8">
<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas"></mdp-select-user-xm>
<mdp-select-user label="负责人" v-model="rawDatas.cuserid"></mdp-select-user>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<mdp-select show-style="x" label="状态" item-code="testPlanStatus" v-model="rawDatas.status"></mdp-select> <mdp-select show-style="x" label="状态" item-code="testPlanStatus" v-model="rawDatas.status"></mdp-select>
@ -223,8 +223,8 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
params[fieldName]=$event.stime params[fieldName]=$event.stime
params.etime=$event.etime params.etime=$event.etime
}else if(fieldName=='cuserid'){ }else if(fieldName=='cuserid'){
params[fieldName]=$event[0].userid
params.cusername=$event[0].username
params[fieldName]=$event.userid
params.cusername=$event.username
}else{ }else{
params[fieldName]=$event params[fieldName]=$event
} }

Loading…
Cancel
Save