From 585dba33dc7b22a6adde88f944d008e13a3d2036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 6 May 2022 11:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=97=E5=8C=85=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/crowd/XmTaskCrowdMng.vue | 10 +++++++++-
 src/views/xm/core/xmTask/XmTaskMng.vue     |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
index 99540b64..07f24089 100644
--- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue
+++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
@@ -90,8 +90,11 @@
             style="width: 150px"
             v-model="filters.key"
             placeholder="计划/任务名称"
-          >
+          > 
           </el-input>
+          
+        <el-input v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input> 
+        <el-input v-model="filters.cbranchId" style="width: 150px;" placeholder="项目公司编号" clearable></el-input> 
           <el-button
             @click="searchXmTasks"
             type="primary"
@@ -682,6 +685,7 @@ export default {
         taskType: "",
         tags: [],
         taskState:'',//任务状态
+        cbranchId:'',//项目归属公司编号
       },
       xmTasks: [], //查询结果
       pageInfo: {
@@ -1271,6 +1275,10 @@ export default {
       if (this.filters.tags && this.filters.tags.length>0) {
         params.tagIdList = this.filters.tags.map(i=>i.tagId);
       }
+      
+      if (this.filters.cbranchId) {
+        params.cbranchId = this.filters.cbranchId;
+      }
       params.taskOut="1"
       params.crowd="1"
       params.ntype="0"
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index a863bc1f..e2eb6fd4 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -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;