diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index e9a78de3..f5c1adde 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -23,7 +23,7 @@
placement="top-start"
title="更多条件、操作"
v-model="moreVisible"
- width="600"
+ width="500"
trigger="manual" >
关闭
@@ -137,6 +137,8 @@
const map=new Map();
import { mapGetters } from 'vuex'
+
+ import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
import XmIterationAdd from "../xmIteration/XmIterationEdit.vue";
export default {
@@ -405,6 +407,7 @@
},
},//end methods
components: {
+ MdpSelectUserXm,
XmIterationAdd,
//在下面添加其它组件
},
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index e8955b90..1b52d32b 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -30,7 +30,7 @@
@@ -60,17 +60,7 @@
产品经理:
- {{ filters.pmUser.username }}
- 选责任人
- 我的
+
@@ -222,8 +212,8 @@ import util from "@/common/js/util"; //全局公共库
//import Sticky from '@/components/Sticky' // 粘性header组件
//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
import { listXmProductWithState } from "@/api/xm/core/xmProduct";
-import { mapGetters } from "vuex";
-import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+import { mapGetters } from "vuex";
+import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
import XmProductAdd from "../xmProduct/XmProductEdit.vue";
const map = new Map();
@@ -248,8 +238,9 @@ export default {
return {
filters: {
key: "",
- id: "", //产品编号
- pmUser: null, //产品经理
+ id: "", //产品编号
+ pmUserid:'',
+ pmUsername:'',
},
xmProducts: [], //查询结果
pageInfo: {
@@ -353,8 +344,8 @@ export default {
params.id = this.filters.id;
}
- if (this.filters.pmUser) {
- params.pmUserid = this.filters.pmUser.userid;
+ if (this.filters.pmUserid) {
+ params.pmUserid = this.filters.pmUserid;
}
this.load.list = true;
listXmProductWithState(params)
@@ -378,7 +369,7 @@ export default {
this.$refs.table.setCurrentRow(row);
this.rowClick(row);
}else{
- if(this.xmProducts.length==0 ){
+ if(this.xmProducts.length==0 && this.moreVisible==false ){
if(this.editForm && this.editForm.id){
this.clearSelect()
}
@@ -414,29 +405,7 @@ export default {
this.$emit("selected", row);
this.productVisible = false;
this.moreVisible = false;
- },
-
- /**begin 自定义函数请在下面加**/
- clearFiltersPmUser: function () {
- this.filters.pmUser = null;
- this.searchXmProducts();
- },
- selectFiltersPmUser() {
- this.selectFiltersPmUserVisible = true;
- },
- onFiltersPmUserSelected(users) {
- if (users && users.length > 0) {
- this.filters.pmUser = users[0];
- } else {
- this.filters.pmUser = null;
- }
- this.selectFiltersPmUserVisible = false;
- this.searchXmProducts();
- },
- setFiltersPmUserAsMySelf() {
- this.filters.pmUser = this.userInfo;
- this.searchXmProducts();
- },
+ },
tableRowClassName({ row, rowIndex }) {
if (row && this.editForm && row.id == this.editForm.id) {
@@ -530,8 +499,8 @@ export default {
this.addProductVisible = false;
},
}, //end methods
- components: {
- UsersSelect,
+ components: {
+ MdpSelectUserXm,
XmProductAdd,
//在下面添加其它组件
},
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 7a186718..770ab1e9 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -30,7 +30,7 @@
@@ -60,19 +60,7 @@
项目经理:
- {{ filters.pmUser.username }}
- 选责任人
- 我的
+
@@ -206,18 +194,7 @@
>
-
-
-
-
+
0) {
- this.filters.pmUser = users[0];
- } else {
- this.filters.pmUser = null;
- }
- this.selectFiltersPmUserVisible = false;
- this.searchXmProjects();
- },
- setFiltersPmUserAsMySelf() {
- this.filters.pmUser = this.userInfo;
- this.searchXmProjects();
- },
+ },
tableRowClassName({ row, rowIndex }) {
if (row && this.editForm && row.id == this.editForm.id) {
@@ -545,7 +501,7 @@ export default {
},
}, //end methods
components: {
- UsersSelect,XmProjectAdd,
+ MdpSelectUserXm,XmProjectAdd,
//在下面添加其它组件
},
mounted() {
diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
index 7ed37d26..ab1cdab3 100644
--- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue
+++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
@@ -106,7 +106,7 @@
@@ -170,7 +170,7 @@
diff --git a/src/views/xm/core/wiki/archive/WikiList.vue b/src/views/xm/core/wiki/archive/WikiList.vue
index b80466dc..ca5de76f 100644
--- a/src/views/xm/core/wiki/archive/WikiList.vue
+++ b/src/views/xm/core/wiki/archive/WikiList.vue
@@ -18,7 +18,7 @@
diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index 348ee266..386e43a6 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -13,7 +13,7 @@
变化日志
绑定即聊情况
diff --git a/src/views/xm/core/xmIteration/XmIterationBox.vue b/src/views/xm/core/xmIteration/XmIterationBox.vue
index 519ed74b..04dcceb0 100644
--- a/src/views/xm/core/xmIteration/XmIterationBox.vue
+++ b/src/views/xm/core/xmIteration/XmIterationBox.vue
@@ -13,7 +13,7 @@
查询条件
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index a53345f9..518e6231 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -42,7 +42,7 @@
v-on:click="searchXmIterations"
icon="el-icon-search"
>
-
+
查询条件
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 1d31ac3f..599798c6 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -42,7 +42,7 @@
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index a56df26a..da13e6c4 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -18,7 +18,7 @@
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index dbc93eec..ba64d0d3 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -33,7 +33,7 @@
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index ffbac22a..5bf55c40 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@@ -4,7 +4,7 @@
{{filters.product?filters.product.productName:'选择产品模板'}}
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 691f6853..54aca0ae 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -325,7 +325,7 @@
+ width="500" >
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 32817783..8f09644d 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -86,7 +86,7 @@
+ width="500" >
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 5dcb7a18..6cf66325 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -25,7 +25,7 @@
@@ -303,7 +303,7 @@
+ width="500" >
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index 0a32f523..e464db82 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -47,7 +47,7 @@
title="通过复制创建新的模板或者新的项目"
:visible.sync="copyToVisible"
append-to-body
- width="600" >
+ width="500" >
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 1b20d4cb..97fbd30f 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -27,7 +27,7 @@
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 6ca6ff4e..38b7c284 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -77,7 +77,7 @@
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index ae4cb82e..73448120 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -5,7 +5,7 @@
{{filters.selProject?filters.selProject.name:'选择项目'}}
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 569cdaff..bb177971 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -73,7 +73,7 @@
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 57d90ab5..ca2c7493 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -27,7 +27,7 @@
+ width="500" >
成为候选人
diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
index 165ea10d..6a2552a5 100644
--- a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
+++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
@@ -23,7 +23,7 @@
查询
-
+
创建时间:
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
index 407ad139..f84050b5 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
@@ -3,7 +3,7 @@
{{filters.project?filters.project.name:'选择项目模板'}}
@@ -11,7 +11,7 @@
{{filters.product?filters.product.productName:'选择产品模板'}}
diff --git a/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue b/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue
index 2e83978d..a0052da2 100644
--- a/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue
+++ b/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue
@@ -2,7 +2,7 @@
@@ -18,7 +18,7 @@
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue b/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue
index 5e3dbee2..b3840bad 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue
@@ -25,7 +25,7 @@
移出结算单
-
+
创建时间:
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadMng.vue b/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
index 40afe889..4e9bdf88 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
@@ -23,7 +23,7 @@
移出结算单
-
+
创建时间: