From 11a2a87b70cf8ef701d85ee27382c08b40eedca2 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, 17 Jan 2023 22:55:55 +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

---
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  2 +-
 .../xmProduct/XmProductForLinkComplex.vue     | 12 ++++-------
 .../xmProject/XmProjectForLinkComplex.vue     | 20 +++++++++----------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index a2405050..e5733c91 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -3,7 +3,7 @@
 		<el-row class="padding-left padding-right">
 			<el-col :span="24">
 					<el-row>
-						<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct&&!xmProduct.id && !xmIteration && !xmIteration.id"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select>
+						<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="(!xmProduct||!xmProduct.id)&&(!xmIteration||!xmIteration.id)"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select>
 
 						<el-select   v-model="filters.priority" placeholder="优先级"  clearable style="width: 100px;">
 								<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
index 0cb8f0a9..8d59083f 100644
--- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
@@ -42,8 +42,7 @@
                       >需求管理</el-button
                     > 
                     <el-button
-                      class="step-btn"
-                      type="warning"
+                      class="step-btn" type="danger" icon="el-icon-d-caret"
                       size="mini"
                       plain
                       @click="
@@ -83,8 +82,7 @@
                       >缺陷管理</el-button
                     >  
                     <el-button
-                      class="step-btn"
-                      type="warning"
+                      class="step-btn" type="danger" icon="el-icon-d-caret"
                       size="mini"
                       plain
                       @click="
@@ -116,8 +114,7 @@
                   ><!--已完成-->
                   <span v-if="xmProduct.pstatus == i.id">
                     <el-button
-                      class="step-btn"
-                      type="warning"
+                      class="step-btn" type="danger" icon="el-icon-d-caret"
                       size="mini"
                       plain
                       @click="
@@ -132,8 +129,7 @@
                   ><!--已关闭-->
                   <span v-if="xmProduct.pstatus == i.id">
                     <el-button
-                      class="step-btn"
-                      type="warning"
+                      class="step-btn" type="danger" icon="el-icon-d-caret"
                       size="mini"
                       plain
                       @click="
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index 3e69f534..e6db17ea 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -2,7 +2,7 @@
   <section>
     <el-row>
       <el-col :span="4" class="padding-left">
-        <el-row> 
+        <el-row v-if=" (xmProduct&&xmProduct.id) || (xmIteration && xmIteration.id)"> 
             <xm-project-select
               ref="xmProjectSelect"
               :auto-select="true"
@@ -36,7 +36,7 @@
 				<el-row v-else-if="i.id=='1'"><!--售前-->
 						<span v-if="selProject.status==i.id">
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showMenusPage">需求管理</el-button>
-							<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','2')">设为立项中</el-button>
+							<el-button class="step-btn" type="danger" icon="el-icon-d-caret" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','2')">设为立项中</el-button>
 						</span>
 						<span v-if="selProject.status!=i.id">
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showMenusPage">需求管理</el-button> 
@@ -48,7 +48,7 @@
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showPanel='plan'">创建计划</el-button> 
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showProjectGaiSuan()">项目估算</el-button>
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showProjectShouYi()">项目收益</el-button>
-							<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','3')">设为立项中</el-button>
+							<el-button class="step-btn" type="danger" icon="el-icon-d-caret" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','3')">设为立项中</el-button>
 						</span>
 						<span v-if="selProject.status!=i.id">
  							<el-button class="step-btn" type="warning" size="mini"   plain @click="showPanel='group'">团队管理</el-button>  
@@ -61,20 +61,20 @@
 						<span v-if="selProject.status==i.id"> 
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showPanel='tasks'">任务管理</el-button>
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showPanel='bugs'">缺陷管理</el-button> 
- 							<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','4')">暂停项目</el-button>
+ 							<el-button class="step-btn" type="danger" icon="el-icon-d-caret" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','4')">暂停项目</el-button>
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="projectChangeRequire()">变更申请</el-button>
-							<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','5')">设为结项中</el-button>
+							<el-button class="step-btn" type="danger" icon="el-icon-d-caret"   plain @click="editXmProjectSomeFields(selProject,'status','5')">设为结项中</el-button>
 						</span>
 						<span v-if="selProject.status!=i.id"> 
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showPanel='tasks'">任务管理</el-button>
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="showPanel='bugs'">缺陷管理</el-button> 
- 							<el-button v-if="selProject.status<i.id" class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','5')">结项申请</el-button>
+ 							<el-button v-if="selProject.status<i.id" class="step-btn" type="danger" icon="el-icon-d-caret" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','5')">结项申请</el-button>
 							<el-button class="step-btn" type="warning" size="mini"   plain @click="projectChangeRequire()">变更申请</el-button>
 						</span> 
 				</el-row>
 				<el-row v-else-if="i.id=='4'"><!--暂停中-->
 						<span v-if="selProject.status==i.id"> 
-							<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','3')">重新激活</el-button>
+							<el-button class="step-btn" type="danger" icon="el-icon-d-caret" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','3')">重新激活</el-button>
 						</span>  
 				</el-row>
 			<el-row v-else-if="i.id=='5'"><!--结项中-->
@@ -86,19 +86,19 @@
 				</el-row>
 				<el-row v-else-if="i.id=='6'"><!--已结项--> 
 						<span v-if="selProject.status==i.id"> 
-							<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','7')">转入售后</el-button>
+							<el-button class="step-btn" type="danger" icon="el-icon-d-caret" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','7')">转入售后</el-button>
 						</span> 
 						<span v-if="selProject.status!=i.id">
 						</span>  
 				</el-row>
 				<el-row v-else-if="i.id=='7'"><!--售后-->
 						<span v-if="selProject.status==i.id"> 
-							<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','8')">设为已完成</el-button>
+							<el-button class="step-btn" type="danger" icon="el-icon-d-caret" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','8')">设为已完成</el-button>
 						</span> 
 				</el-row>
 				<el-row v-else-if="i.id=='8'"><!--已完成-->
 						<span v-if="selProject.status==i.id"> 
-							<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','9')">关闭项目</el-button>
+							<el-button class="step-btn" type="danger" icon="el-icon-d-caret" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','9')">关闭项目</el-button>
 						</span> 
 						
 				</el-row>