From 7027848250ace0c7c968bd9559dfd4cc58c29fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 12 Jul 2022 23:27:04 +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

---
 .../xm/core/xmIteration/XmIterationMng.vue     |  2 +-
 .../XmProductProjectLinkMng.vue                | 18 +++++++++++++-----
 .../core/xmProject/XmProjectForLinkComplex.vue |  2 +-
 src/views/xm/core/xmProject/XmProjectInfo.vue  |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index da0a218b..e3cd2367 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -259,7 +259,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'
 					params.productId=this.xmProduct.id
 				}
 				if(this.selProject){
-					params.projectId=this.selProject.id
+					params.linkProjectId=this.selProject.id
 				}
 				if(this.menuId){
 					params.menuId=this.menuId
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
index 8a2a4281..ff598692 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="app-container">
+	<section>
 		<el-row> 
 			<span style="float:right;">
 				<xm-product-select @row-click="onProductSelect" :autoSelect="false" v-if="selProject && selProject.id">
@@ -12,14 +12,22 @@
 				</xm-project-select> 
  			</span>
 		</el-row>
-		<el-row style="padding-top:10px;">
+		<el-row>
 			<!--列表 XmProductProjectLink 产品与项目的关联关系表，一般由产品经理挂接项目到产品上-->
 			<el-table ref="xmProductProjectLink" :data="xmProductProjectLinks" :height="maxTableHeight" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
- 				<el-table-column prop="name" v-if="xmProduct" label="包含的项目名称" min-width="150" ></el-table-column>
-				<el-table-column prop="productName" v-if="selProject" label="包含的产品名称" min-width="150" ></el-table-column>
+ 				<el-table-column prop="name" v-if="xmProduct" label="包含的项目名称" min-width="150" >
+					<template scope="scope">
+						<el-link type="primary" @click="goToProject(scope.row,scope.$index)">{{scope.row.name}}</el-link>
+					</template>
+				</el-table-column>
+				<el-table-column prop="productName" v-if="selProject" label="包含的产品名称" min-width="150" >
+					<template scope="scope"> 
+						<el-link type="primary" @click="goToProduct(scope.row,scope.$index)">{{scope.row.productName}}</el-link>
+					</template>
+				</el-table-column>
 				<el-table-column prop="seq" label="顺序" min-width="80" sortable>
 					<template scope="scope">
-				     <span class="cell-text">  {{scope.row.seq}}  </span>
+				       {{scope.row.seq}}   
                      <span class="cell-bar"><el-input style="display:inline;" title="0-999之间，数值越小越靠前" v-model="scope.row.seq" placeholder="" @change="editSomeFields(scope.row,'seq',$event)" :maxlength="22"></el-input></span>
 					</template>
 				</el-table-column>  
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index f98fa250..b1a2c0c1 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -184,7 +184,7 @@
             name="productProjectLink"
             v-if="selProject && selProject.id && !xmProduct"
           >
-            <xm-product-project-link-mng
+            <xm-product-project-link-mng class="padding-top"
               v-if="showPanel == 'productProjectLink'"
               :sel-project="selProject"
             ></xm-product-project-link-mng>
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 94782586..50f54ff0 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -271,7 +271,7 @@
           :sel-project="selProject"
         ></xm-iteration-for-link-complex>
         <xm-product-for-link-complex
-          v-if="infotype == '产品'"
+          v-if="infotype == '产品'" class="padding-top"
           ref="xmProductComplex"
           :sel-project="selProject" 
         ></xm-product-for-link-complex>