Merge branch 'master' of http://www.qingqinkj.com/gitlab/qqkj/mmcloud/xm/xm-ui-web

src/api/xm/core/xmTask.js

@@ -29,6 +29,7 @@ export const editXmTask = params => { return axios.post(`${base}/xm/core/xmTask/
 export const addXmTask = params => { return axios.post(`${base}/xm/core/xmTask/add`, params); };
 
 export const getTask = params => { return axios.get(`${base}/xm/core/xmTask/getTask`, { params: params }); };
+export const getOutTask = params => { return axios.get(`${base}/xm/core/xmTask/getOutTask`, { params: params }); };
 
 export const addTask = params => { return axios.post(`${base}/xm/core/xmTask/addTask`, params ); };
 

src/router/routes_xm.js

@@ -69,8 +69,22 @@ export default {
 
         { path: 'xmTask/XmTaskCenter', component: _import('xm/core/xmTask/XmTaskCenter'), name: 'xmTaskCenter', meta: { title: '任务大厅' }},
         { path: 'xmTask/XmMyTaskCenter', component: _import('xm/core/xmTask/XmMyTaskCenter'), name: 'xmMyTaskCenter', meta: { title: '任务(我的)' }},
-        { path: 'xmTaskExecuser/XmTaskExecuserMng', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserMng'), name: 'XmTaskExecuserMng', meta: { title: '竞标管理' }},
-        { path: 'xmTaskExecuser/XmTaskExecuserForMy', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserForMy'), name: 'XmTaskExecuserForMy', meta: { title: '竞标(我的)' }},
+      ]
+    },
+    {
+      path: '/xm/core',
+      component: Layout,
+      name: '众包任务',
+      iconCls: 'fa el-icon-menu',
+      meta: {
+        title: '众包任务',
+        icon: 'task'
+      },
+      // leaf: true,//只有一个节点
+      children: [ 
+        { path: 'crowd/XmTaskCrowdMng', component: _import('xm/core/crowd/XmTaskCrowdMng'), name: 'XmTaskCrowdMng', meta: { title: '众包大厅' }}, 
+        { path: 'xmTaskExecuser/XmTaskExecuserMng', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserMng'), name: 'XmTaskExecuserMng', meta: { title: '候选人管理' }},
+        { path: 'xmTaskExecuser/XmTaskExecuserForMy', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserForMy'), name: 'XmTaskExecuserForMy', meta: { title: '候选人(我的)' }},
  
       ]
     },

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

@@ -406,14 +406,14 @@
 									<div class="tool-bar">
                     <span class="u-btn">
                       <el-tooltip  v-if="scope.row.ntype==='1'" :content=" '新建任务'">    
-                          <el-button :style="{backgroundColor:'#409EFF'}"  @click="showSubAdd( scope.row,scope.$index,'0')" icon="el-icon-plus" title="新建任务" circle plain size="mini"> </el-button>     
+                          <el-button    @click="showSubAdd( scope.row,scope.$index,'0')" icon="el-icon-plus" title="新建任务" circle plain size="mini"> </el-button>     
                       </el-tooltip> 
                       <el-tooltip  v-if="scope.row.ntype==='1'" :content=" '新建计划'">    
                           <el-button :style="{backgroundColor:  '#E6A23C'}"  @click="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建计划" circle plain size="mini"> </el-button>     
                       </el-tooltip> 
                       
                       <el-tooltip  v-if="scope.row.ntype==='0'" :content=" '编辑任务'">    
-                          <el-button :style="{backgroundColor:  '#409EFF'}"  @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑任务" circle plain size="mini"> </el-button>     
+                          <el-button    @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑任务" circle plain size="mini"> </el-button>     
                       </el-tooltip> 
                     </span>
 									</div>
@@ -1256,12 +1256,12 @@ export default {
         params.ntype="0"
       }
       
-      if(this.ptype==='1'){
+      if(this.ptype==='1' && !this.isTaskCenter){
         if(!params.productId){
           this.$notify.warning("请先选中产品")
           return;
         }
-      }else if(this.ptype==='0'){
+      }else if(this.ptype==='0' && !this.isTaskCenter){
         if(!params.projectId){
           this.$notify.warning("请先选中项目")
           return;