diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index f68b4bea..9fe981a5 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -13,11 +13,16 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -51,18 +56,6 @@
标签
{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个
-
-
-
-
-
-
-
-
-
-
-
-
创建日期:
diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue
index 6dc6d129..098b54a2 100644
--- a/src/views/xm/core/xmProject/XmProjectAdd.vue
+++ b/src/views/xm/core/xmProject/XmProjectAdd.vue
@@ -272,7 +272,7 @@
return this.addForm.totalReceivables
}
},
- props:['visible'],
+ props:['visible','xmProduct'],
watch: {
'visible':function(visible) {
if(visible==true){
@@ -372,11 +372,7 @@
this.$emit('cancel');
},
//编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit"
- addSubmit: function () {
- if(!this.roles.some(i=>i.roleid=='projectAdmin')){
- this.$notify({showClose: true, message: "只有项目经理可以建立项目", type: 'error' });
- return;
- }
+ addSubmit: function () {
if (
this.dateRanger != null &&
this.dateRanger.length == 2
@@ -391,17 +387,18 @@
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.load.add=true
- let params = Object.assign({}, this.addForm);
- params.groups=this.xmGroups;
- params.planIuserWorkload=this.autoParams.planIuserWorkload
-
+ let params = Object.assign({}, this.addForm);
+ if(this.xmProduct && this.xmProduct.id){
+ params.links=[{productId:this.xmProduct.id}]
+ }
+ params.planIuserWorkload=this.autoParams.planIuserWorkload
params.planOuserWorkload=this.autoParams.planOuserWorkload
params.planWorkload=this.autoParams.planWorkload
addXmProject(params).then((res) => {
this.load.add=false;
var tips=res.data.tips;
if(tips.isOk){
- this.$emit('submit',params);// @submit="afterEditSubmit"
+ this.$emit('submit',res.data.data);// @submit="afterEditSubmit"
}
this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err =>this.load.add=false);
diff --git a/src/views/xm/core/xmProject/XmProjectComplex.vue b/src/views/xm/core/xmProject/XmProjectComplex.vue
index bc90bc84..3994b153 100644
--- a/src/views/xm/core/xmProject/XmProjectComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectComplex.vue
@@ -9,10 +9,24 @@
placement="right"
width="400"
trigger="click">
-
+
{{selProject?selProject.name:'选择项目'}}
+
+
+
+
+
+
+
+ 项目
+
+
@@ -65,6 +79,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
import XmProductProjectForLink from '../xmProduct/XmProductProjectForLink.vue';
import XmProjectOverview from "./XmProjectOverview";
+ import XmProjectAdd from './XmProjectAdd';//新增界面
export default {
computed: {
@@ -134,7 +149,7 @@ import XmProjectOverview from "./XmProjectOverview";
moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
}
],
- projectVisible:true,
+ projectAddVisible:false,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -149,12 +164,13 @@ import XmProjectOverview from "./XmProjectOverview";
onProjectClearSelect(){
this.selProject=null;
},
- tabClick(tab){
- if(this.selProject==null || !this.selProject.id){
- this.projectVisible=true;
- this.$notify({showClose: true, message:"请先选中左边项目", type: 'warning'});
- }
+ tabClick(tab){
this.showPanel=tab.name
+ },
+ afterProjectAddSubmit(project){
+ this.$refs.xmProjectSelect.xmProjects.push(project)
+ this.$refs.xmProjectSelect.rowClick(project);
+ this.projectAddVisible=false;
}
},//end methods
components: {
@@ -169,6 +185,7 @@ import XmProjectOverview from "./XmProjectOverview";
XmProjectSelect,
XmProjectForLink,
XmProductProjectForLink,
+ XmProjectAdd,
XmProjectOverview,
},
mounted() {