From 51ada2b0065205576f10bb1fc9c07cb3dd21c72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 15 Nov 2023 15:20:33 +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/components/XmIterationSelect.vue  |  6 ++++-
 .../xm/core/components/XmProductSelect.vue    | 26 ++++++++++++++++---
 .../xm/core/components/XmProjectSelect.vue    |  6 ++++-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  3 +--
 .../xmProduct/XmProductForLinkComplex.vue     | 17 ++++--------
 .../xm/core/xmProduct/XmProductSetting.vue    | 21 +++++++--------
 .../XmProductProjectLinkMng.vue               | 15 +++++------
 .../xmProject/XmProjectForLinkComplex.vue     | 13 +++-------
 8 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index 8625d1cd..3dcd63e5 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -1,6 +1,6 @@
 <template> 
 <span>
-   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" placeholder="选择迭代" :props="{id:'id',name:'iterationName'}" :load-fun="listXmIterationWithState" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
+   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" :placeholder="placeholder" :props="{id:'id',name:'iterationName'}" :load-fun="listXmIterationWithState" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
       <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建迭代</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多迭代</el-button></el-row>
    </mdp-select-table> 
    
@@ -36,6 +36,10 @@ export default {
     productId:{
       type:String,
       default:null,
+    }, 
+    placeholder:{
+      type:String,
+      default:"选择产迭代"
     }
     
   },
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index ae3a98b0..ffcf9d7b 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -1,6 +1,6 @@
 <template> 
 <span>
-   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" placeholder="选择产品" :props="{id:'id',name:'productName'}" :load-fun="listXmProductWithState" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
+   <mdp-select-table v-model="myVal" ref="selectTableRef" :init-name="initName" show-style="showStyle" :placeholder="placeholder" :props="{id:'id',name:'productName'}" :load-fun="listXmProductWithState" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick" :disabled="disabled">
       <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建产品</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多产品</el-button></el-row>
    </mdp-select-table> 
    
@@ -24,7 +24,7 @@ import XmProductAdd from "../xmProduct/XmProductEdit.vue";
 export default {
   components: { XmProductAdd },
   name: 'xm-product-select',
-    props:{ 
+  props:{ 
     /**
      * 项目编号
      */
@@ -32,6 +32,26 @@ export default {
       type:String,
       default:null,
     }, 
+    placeholder:{
+      type:String,
+      default:"选择/创建产品"
+    },
+    value:{
+      type:String,
+      default:null,
+    },
+    initName:{
+      type:String,
+      default:null
+    },
+    disabled:{
+      type:Boolean,
+      default:false
+    },
+    showStyle:{
+      type:String,
+      default:'origin'
+    }
   },
   data(){
     return { 
@@ -60,7 +80,7 @@ export default {
     }
   },
   mounted(){
-       
+       this.myVal=this.value
   }, 
 }
 </script>
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index bccc982d..659171a6 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -1,6 +1,6 @@
 <template> 
 <span>
-   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" placeholder="选择项目" :props="{id:'id',name:'projectName'}" :load-fun="listXmProject" :params="{linkProductId:linkProductId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
+   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" :placeholder="placeholder" :props="{id:'id',name:'projectName'}" :load-fun="listXmProject" :params="{linkProductId:linkProductId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
       <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建项目</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多项目</el-button></el-row>
    </mdp-select-table> 
    
@@ -35,6 +35,10 @@ export default {
       type:String,
       default:null,
     }, 
+    placeholder:{
+      type:String,
+      default:"选择项目"
+    }
   },
   data(){
     return { 
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 05c9294d..300823d0 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -212,8 +212,7 @@
 					<el-button class="hidden-md-and-down" @click="showParentMenu" icon="el-icon-top" title="更换上级"></el-button>
 					<el-button class="hidden-md-and-down"  v-if="!disabledMng "  type="danger" @click="batchDel" icon="el-icon-delete" title="删除"></el-button>
 
-					<xm-table-config class="hidden-lg-and-down" ref="tableConfig" style="display:inline;" :table="$refs.table"></xm-table-config>
-
+ 
 					</span>
 					</el-row>
 					<el-row v-if="displayType=='table'" class="padding-top">
diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
index 8e5042e4..12f7a468 100644
--- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
@@ -1,22 +1,16 @@
 <template>
   <section>
     <el-row>
-      <el-col :xl="4" :lg="4" :md="5" :sm="5" :xs="5" class="padding"> 
-        <div class="border">
-        <el-row>
+      <el-col :xl="4" :lg="4" :md="5" :sm="5" :xs="5" class="padding">  
+        <el-row class="padding">
             <xm-product-select
               ref="xmProductSelect"
               :auto-select="false"
               :link-project-id="projectInfo ? projectInfo.id : null"
               :iterationId="xmIteration ? xmIteration.id : null"
-              @row-click="onProductRowClick"
+              @change2="onProductRowClick"
               @clear="onProductClearSelect"
-            >
-            <template v-slot:title="{product}">
-               <h4 href="#"><div style="max-width:15vw;" class="res-text hidden-md-and-down"><i style="font-size:16px;" class="el-icon-sort"></i> {{product && product.id?product.productName:'请选择一个产品'}}</div></h4>
-               <h4 href="#"><div style="max-width:19vw;" class="res-text hidden-lg-and-up"><i style="font-size:16px;" class="el-icon-sort"></i> {{product && product.id?product.productName:'请选择一个产品'}}</div></h4>
-            </template>
-           
+            >  
           </xm-product-select> 
           </el-row>
         <el-row
@@ -130,8 +124,7 @@
               </el-row>
             </el-step>
           </el-steps>
-        </el-row>
-        </div>
+        </el-row> 
       </el-col>
       <el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right">
         <el-tabs :value="showPanel" @tab-click="tabClick" v-if="xmProduct && xmProduct.id"> 
diff --git a/src/views/xm/core/xmProduct/XmProductSetting.vue b/src/views/xm/core/xmProduct/XmProductSetting.vue
index c687bb02..88e08402 100644
--- a/src/views/xm/core/xmProduct/XmProductSetting.vue
+++ b/src/views/xm/core/xmProduct/XmProductSetting.vue
@@ -28,10 +28,9 @@
           <el-col :span="8">
             <el-form-item prop="admUserid" label-width="0px">
               <mdp-select-user show-style="x" size="medium"
-                label=" 产品总控"
-                userid-key="admUserid"
-                username-key="admUsername"
-                v-model="editForm"
+                label=" 产品总控" 
+                v-model="editForm.admUserid"
+                :init-name="editForm.admUsername"
                 @change="editSomeFields(editForm, 'admUserid', $event)"
               ></mdp-select-user>
             </el-form-item>
@@ -39,10 +38,9 @@
           <el-col :span="8">
             <el-form-item prop="pmUserid" label-width="0px">
               <mdp-select-user show-style="x" size="medium"
-                label=" 产品经理"
-                userid-key="pmUserid"
-                username-key="pmUsername"
-                v-model="editForm"
+                label=" 产品经理" 
+                v-model="editForm.pmUserid"
+                :init-name="editForm.pmUsername"
                 @change="editSomeFields(editForm, 'pmUserid', $event)"
               ></mdp-select-user>
             </el-form-item>
@@ -50,10 +48,9 @@
           <el-col :span="8">
             <el-form-item prop="assUserid" label-width="0px">
               <mdp-select-user show-style="x" size="medium"
-                label=" 副经理、助理"
-                userid-key="assUserid"
-                username-key="assUsername"
-                v-model="editForm"
+                label=" 副经理、助理" 
+                v-model="editForm.assUserid"
+                :init-name="editForm.assUsername"
                 @change="editSomeFields(editForm, 'assUserid', $event)"
               ></mdp-select-user>
             </el-form-item>
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
index 6a4af04b..9a2de566 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
@@ -2,13 +2,10 @@
 	<section>
 		<el-row>
 			<div style="float:right;padding-right:40px;">
-				<xm-product-select @change2="onProductSelect" :autoSelect="false" v-if="selProject && selProject.id">
-					<el-link type="primary" slot="title">选择更多产品加入项目</el-link>
-				</xm-product-select>
- 				<xm-project-select :autoSelect="false" @change2="onProjectSelect" v-if="xmProduct && xmProduct.id">
-					 <el-link type="primary" slot="title">
-						 选择更多项目加入产品
-					 </el-link>
+				<xm-product-select placeholder="选择更多产品加入项目" @change2="onProductSelect" :autoSelect="false" v-if="selProject && selProject.id">
+ 				</xm-product-select>
+ 				<xm-project-select placeholder="选择更多产品加入项目" :autoSelect="false" @change2="onProjectSelect" v-if="xmProduct && xmProduct.id">
+					  
 				</xm-project-select>
  			</div>
 		</el-row>
@@ -17,12 +14,12 @@
 			<el-table ref="xmProductProjectLink" :data="xmProductProjectLinks" height="100px" v-adaptive="{bottomOffset:50}" @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" >
 					<template scope="scope">
-						<el-link type="primary" @click="goToProject(scope.row,scope.$index)">{{scope.row.name}}</el-link>
+						<xm-project-select show-style="tag" v-model="scope.row.projectId" :disabled="true"/>
 					</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>
+						<xm-product-select show-style="tag" v-model="scope.row.productId" :disabled="true"/>
 					</template>
 				</el-table-column>
 				<el-table-column prop="seq" label="顺序" min-width="80" sortable>
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index ec92e962..5b207d80 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -2,8 +2,7 @@
   <section>
     <el-row>
       <el-col :xl="4" :lg="4" :md="5" :sm="5" :xs="5" class="padding">
-        <div class="border">
-          <el-row v-if="    (xmProduct&&xmProduct.id) || (xmIteration && xmIteration.id)"> 
+           <el-row class="padding" v-if="    (xmProduct&&xmProduct.id) || (xmIteration && xmIteration.id)"> 
               <xm-project-select
                 ref="xmProjectSelect"
                 :auto-select="false "
@@ -11,11 +10,7 @@
                 :link-product-id="xmProduct ? xmProduct.id : null"
                 @change2="onProjectRowClick"
                 @clear="onProjectClearSelect"
-              >
-              <template v-slot:title="{project}">
-                <h4 href="#"><div style="max-width:15vw;" class="res-text hidden-md-and-down"><i style="font-size:16px;" class="el-icon-sort"></i> {{project && project.id?project.name:'请选择一个项目'}}</div></h4>
-                <h4 href="#"><div style="max-width:19vw;" class="res-text hidden-lg-and-up"><i style="font-size:16px;" class="el-icon-sort"></i> {{project && project.id ?project.name:'请选择一个项目'}}</div></h4>
-              </template>
+              > 
             </xm-project-select> 
           </el-row> 
           <el-row
@@ -139,9 +134,7 @@
           </el-row>
         </el-step>
         </el-steps>
-          </el-row>
-        
-        </div>
+          </el-row> 
       </el-col>
       <el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right">
         <el-tabs :value="showPanel" @tab-click="tabClick" v-if="selProject && selProject.id">