From 09300d743f8b2d915fe2d225ba5da0656cdfacc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 12 Mar 2022 10:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmProduct/XmProductForProjectComplex.vue    |  2 +-
 .../XmProductProjectLinkMng.vue                 |  2 +-
 .../xm/core/xmProject/XmProjectComplex.vue      |  2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue          | 17 +++++++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
index 191ad533..823e8a0a 100644
--- a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
@@ -10,7 +10,7 @@
 								width="400"
 								trigger="click"> 
 								<xm-product-select :auto-select="true" :sel-project="selProject" :xm-iteration="xmIteration"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select>
- 								 <el-link type="warning" slot="reference" @click.stop="showProjectSelect" icon="el-icon-search"><font style="font-size:14px;">{{xmProduct?xmProduct.productName:'选择产品'}}</font></el-link> 
+ 								 <el-link type="warning" slot="reference"  icon="el-icon-search"><font style="font-size:14px;">{{xmProduct?xmProduct.productName:'选择产品'}}</font></el-link> 
 							</el-popover> 
 						</div>
 					</el-tab-pane>
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
index 3a68bd84..43f8c592 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
@@ -232,7 +232,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
 					type: 'warning'
 				}).then(() => { 
 					this.load.add=true;
-					this.addForm.iterationId=this.xmIteration.id;
+					this.addForm.projectId=this.selProject.id;
 					this.addForm.productId= product.id;
 					addXmProductProjectLink(this.addForm).then((res) => {
 						this.load.del=false;
diff --git a/src/views/xm/core/xmProject/XmProjectComplex.vue b/src/views/xm/core/xmProject/XmProjectComplex.vue
index ceaa421e..bc90bc84 100644
--- a/src/views/xm/core/xmProject/XmProjectComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectComplex.vue
@@ -10,7 +10,7 @@
 								width="400"
 								trigger="click"> 
 								<xm-project-select :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
- 								 <el-link type="warning" slot="reference" @click.stop="showProjectSelect" icon="el-icon-search"><font style="font-size:14px;">{{selProject?selProject.name:'选择项目'}}</font></el-link> 
+ 								 <el-link type="warning" slot="reference"  icon="el-icon-search"><font style="font-size:14px;">{{selProject?selProject.name:'选择项目'}}</font></el-link> 
 							</el-popover>
 							
 						</div>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 725499d2..370e35f0 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -144,7 +144,7 @@
             icon="el-icon-del"
             >删除</el-button
           >
-          <el-popover v-if="workItemType=='projectPlan'"
+          <el-popover v-if="workItemType=='projectPlan'|| workItemType=='productPlan'"
             placement="top-start"
             title="选择创建计划/任务的方式"
             width="300"
@@ -179,7 +179,7 @@
             <el-button
               slot="reference"
               v-if="
-                isTaskCenter != '1' && isMy != '1' && !xmProduct && !xmIteration
+                isTaskCenter != '1' && isMy != '1' && !xmIteration
               "
               type="primary"
               icon="el-icon-plus"
@@ -503,7 +503,7 @@
                 <template slot-scope="scope">
                   <el-dropdown 
                     @command="handleCommand"
-                    v-if="isTaskCenter != '1' && isMy != '1' && scope.row.ntype=='1' && workItemType=='projectPlan'"
+                    v-if="isTaskCenter != '1' && isMy != '1' && scope.row.ntype=='1' && (workItemType=='projectPlan' || workItemType=='productPlan')"
                     :disabled="scope.row.ntype!='1'"
                   >
                     <span class="el-dropdown-link">
@@ -1560,11 +1560,20 @@ export default {
            this.$notify({
               showClose: true,
               message: "当前为任务节点，任务节点下不能再创建新的子项",
-              type: "error",
+              type: "warning",
             });
             return false;
         }
         return true;
+      }else{
+        if(!this.filters.selProject || !this.filters.selProject.id){
+          this.$notify({
+              showClose: true,
+              message: "请先选择项目",
+              type: "warning",
+            });
+            return false;
+        }
       }
       return true;