diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 591a250b..86a7a7d2 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -1,17 +1,17 @@
-
+
-
-
+ v-model="productVisible">
+
+
-
-
- 产品名称
+
+
+ 产品名称
清空
关闭
@@ -21,90 +21,17 @@
width="400"
v-model="moreVisible"
trigger="manual" >
-
-
- 产品编号:
-
-
-
-
-
- 创建时间:
-
-
-
-
-
- 产品名称:
-
-
-
-
-
-
- 产品经理:
-
- {{filters.pmUser.username}}
- 选责任人
- 我的
-
+
- 关闭查询
+ 产品编号:
+
+
-
- 更多条件
-
-
-
-
- {{scope.row.productName}}
-
-
-
-
-
-
{{editForm && editForm.id?editForm.productName:'选择产品'}}
-
-
-
-
-
-
-
-
- 产品名称
-
- 清空
- 关闭
-
-
-
- 产品编号:
-
-
-
-
+
- 创建时间:
+ 创建时间:
-
-
+ >
+
+
产品名称:
-
-
-
+
+
+
产品经理:
-
- {{filters.pmUser.username}}
+
+ {{filters.pmUser.username}}
选责任人
我的
关闭查询
-
+
更多条件
-
+
{{scope.row.productName}}
-
+
-
-
-
+
+
+
{{editForm && editForm.id?editForm.productName:'选择产品'}}
+
@@ -155,12 +83,12 @@
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 { listXmProductWithState } from '@/api/xm/core/xmProduct';
+ import { mapGetters } from 'vuex'
+ import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
const map=new Map();
-
- export default {
+
+ export default {
props:['dialog','linkProjectId','iterationId','autoSelect'],
computed: {
...mapGetters([
@@ -171,7 +99,7 @@
iterationId(){
this.initData();
},
-
+
linkProjectId(){
this.initData();
}
@@ -182,9 +110,9 @@
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
return {
filters: {
- key: '',
+ key: '',
id:'',//产品编号
- pmUser:null,//产品经理
+ pmUser:null,//产品经理
},
xmProducts: [],//查询结果
@@ -198,32 +126,32 @@
},
load:{ list: false, edit: false, del: false, add: false },//查询中...
sels: [],//列表选中数据
- dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
-
+ dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+
//新增xmProduct界面初始化数据
addForm: {
id:'',productName:'',branchId:'',remark:''
},
-
+
//编辑xmProduct界面初始化数据
editForm: {
id:'',productName:'',branchId:'',remark:''
- },
+ },
selectFiltersPmUserVisible:false,
maxTableHeight:300,
- dateRanger: [ ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
productVisible:false,
moreVisible:false,
hadInit:false,
/**begin 自定义属性请在下面加 请加备注**/
-
+
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
- methods: {
- handleSizeChange(pageSize) {
- this.pageInfo.pageSize=pageSize;
+ methods: {
+ handleSizeChange(pageSize) {
+ this.pageInfo.pageSize=pageSize;
this.getXmProducts();
},
handleCurrentChange(pageNum) {
@@ -245,9 +173,9 @@
this.getXmProducts();
},
searchXmProducts(){
- this.pageInfo.count=true;
+ this.pageInfo.count=true;
this.getXmProducts();
- },
+ },
//获取列表 XmProduct 产品表
getXmProducts() {
let params = {
@@ -258,31 +186,31 @@
};
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[];
- for(var i=0;i
{
var tips=res.data.tips;
- if(tips.isOk){
+ if(tips.isOk){
this.pageInfo.total = res.data.total;
this.pageInfo.count=false;
this.xmProducts = res.data.data;
@@ -291,46 +219,46 @@
}else if(this.linkProjectId){
map.set(this.linkProjectId,this.xmProducts)
}
- if(this.autoSelect!==false&&this.xmProducts.length>0 && this.productVisible==false){
- var row=this.xmProducts[0];
+ if(this.autoSelect!==false&&this.xmProducts.length>0 && this.productVisible==false){
+ var row=this.xmProducts[0];
this.$refs.table.setCurrentRow(row);
- this.rowClick(row);
+ this.rowClick(row);
}
}else{
this.$notify({showClose: true, message: tips.msg, type: 'error' });
- }
+ }
this.load.list = false;
}).catch( err => this.load.list = false );
},
-
+
//选择行xmProduct
selsChange: function (sels) {
this.sels = sels;
- },
-
+ },
+
rowClick: function(row, event, column){
this.editForm=row
this.$emit('row-click',row, event, column);// @row-click="rowClick"
- this.selectedProduct(row)
+ this.selectedProduct(row)
this.productVisible=false;
this.moreVisible=false;
},
selectedProduct:function(row){
this.editForm=row
- this.$emit('selected',row);
+ 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){
+ onFiltersPmUserSelected(users){
if(users && users.length>0){
this.filters.pmUser=users[0]
}else{
@@ -342,10 +270,10 @@
setFiltersPmUserAsMySelf(){
this.filters.pmUser=this.userInfo;
this.searchXmProducts();
- },
-
+ },
+
tableRowClassName({row, rowIndex}) {
- if (row.id == this.editForm.id) {
+ if (row.id == this.editForm.id) {
return 'success-row';
}
return '';
@@ -362,17 +290,17 @@
this.moreVisible=false;
this.$emit("close");
},
-
- initData(){
+
+ initData(){
if(this.iterationId){
var xmProducts=map.get(this.iterationId);
if(xmProducts){
this.xmProducts=xmProducts;
if(this.productVisible==false){
if(this.autoSelect!==false && this.xmProducts.length>0){
- var row=this.xmProducts[0];
+ var row=this.xmProducts[0];
this.$refs.table.setCurrentRow(row);
- this.rowClick(row);
+ this.rowClick(row);
}
}
}else{
@@ -381,12 +309,12 @@
}else if(this.linkProjectId){
var xmProducts=map.get(this.linkProjectId);
if(xmProducts){
- this.xmProducts=xmProducts;
+ this.xmProducts=xmProducts;
if(this.productVisible==false){
if(this.autoSelect!==false && this.xmProducts.length>0){
- var row=this.xmProducts[0];
+ var row=this.xmProducts[0];
this.$refs.table.setCurrentRow(row);
- this.rowClick(row);
+ this.rowClick(row);
}
}
}else{
@@ -404,23 +332,23 @@
this.productVisible=!this.productVisible;
}
},//end methods
- components: {
+ components: {
UsersSelect,
//在下面添加其它组件
},
- mounted() {
- this.$nextTick(() => {
- this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
+ mounted() {
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
if(this.autoSelect!==false){
this.initData();
this.hadInit=true;
}
-
- });
+
+ });
}
}
-
+
\ No newline at end of file
+
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 1c74e746..3022bb98 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -1,29 +1,29 @@
-
+
-
-
-
-
-
- 批量移出
+
+
+
+
+
+ 批量移出
-
+
-
-
-
+
+
+
-
+
-
+