From 4dd9a1b45a94445744b5aa2fbf3429afe61bc15f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 14 Jul 2022 00:31:18 +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/XmMenuEdit.vue | 90 +++++++++++++++----------
 src/views/xm/core/xmTask/XmTaskEdit.vue | 14 +++-
 2 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index d8e43487..75330440 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -1,16 +1,53 @@
 <template>
 	<section>
-		<el-row class="page-main ">
+		<el-row :gutter="20" > 
+			<el-col :span="4" class="border padding">
+				<h3 class="padding-bottom">
+					<div  class="icon" :style="{backgroundColor: calcMenuLabel.color }">
+						<i :class="calcMenuLabel.icon"></i>
+					</div>
+					{{calcMenuLabel.label}}
+				</h3> 
+				<el-steps :active="calcMenuCurrStep" align-center   finish-status="success" process-status="process" direction="vertical">
+					<el-step v-for="(item,index) in dicts.menuStatus" :title="item.name" :description="item.name" :key="index"> 
+						<span slot="description">
+								<span v-if="item.id=='0'"><!--待领取-->
+									<el-button class="step-btn"  type="primary" size="mini"  @click="activateTabPaneName='6'" plain>预算管理</el-button>
+									<el-button class="step-btn" type="primary" size="mini" v-if="editForm.ntype=='0' && !editForm.executorUserid" @click="activateTabPaneName='42'" plain>去指派执行人</el-button> 
+									<el-button class="step-btn" type="primary" size="mini" v-if="editForm.ntype=='0' && editForm.executorUserid" @click="activateTabPaneName='42'" plain>执行人管理</el-button>  
+								<el-button class="step-btn" type="primary" size="mini" v-if="editForm.taskState=='0'" @click="editXmTaskSomeFields(editForm,'taskState','1')" plain>设为执行中</el-button> 
+								</span> 
+								<span v-else-if="item.id=='1'"> <!--已领取执行中-->
+								<el-button class="step-btn"  type="primary" size="mini" v-if="editForm.ntype=='1'" @click="activateTabPaneName='4'" plain>子工作项管理</el-button>
+								<el-button class="step-btn"  type="primary" size="mini" v-if="editForm.ntype=='0'" @click="activateTabPaneName='41'" plain>缺陷跟踪</el-button>
+								<el-button class="step-btn"  type="primary" size="mini" v-if="editForm.ntype=='0'" @click="activateTabPaneName='5'" plain>报工、报进度</el-button>
+								<el-button class="step-btn" type="primary" size="mini" v-if="editForm.taskState=='1'" @click="editXmTaskSomeFields(editForm,'taskState','2')" plain>设为已完工、待验收</el-button> 
+								  
+
+								</span>
+								<span v-else-if="item.id=='2'"> <!--已完工-->
+									<el-button class="step-btn" type="primary" size="mini" v-if="  editForm.taskState=='2'" @click="editXmTaskSomeFields(editForm,'taskState','3')" plain>设为已验收、待结算</el-button> 
+									<el-button class="step-btn" type="primary" size="mini" v-if=" editForm.taskState=='2'" @click="editXmTaskSomeFields(editForm,'taskState','1')" plain>设为验收不过，待执行</el-button> 
+ 								</span>
+								<span v-else-if="item.id=='3'"> <!--已验收-->
+								
+								<el-button class="step-btn" type="primary" size="mini" v-if=" editForm.taskState=='3'" @click="editXmTaskSomeFields(editForm,'taskState','4')" plain>设为已结算</el-button> 
+ 								</span>
+								<span v-else-if="item.id=='4'"> <!--已结算-->
+								
+								<el-button class="step-btn" type="primary" size="mini" v-if=" editForm.taskState=='4'" @click="editXmTaskSomeFields(editForm,'taskState','9')" plain>设为已关闭</el-button> 
+								</span>
+								<span v-else-if="item.id=='9'"> <!--已关闭-->
+								</span>
+						</span>
+					</el-step> 
+				</el-steps> 
+			</el-col>
+			<el-col :span="20"> 
 			<el-form :model="editForm"  label-width="100px" label-position="left" :rules="editFormRules" ref="editForm">
 						<el-row>
 							<el-col :span="6">
-								<el-form-item label="序号名称" prop="seqNo" >
-									<template slot="label">
-										<div  class="icon" :style="{backgroundColor: calcMenuLabel.color }">
-											<i :class="calcMenuLabel.icon"></i>
-										</div>
-										{{calcMenuLabel.label}}
-									</template>
+								<el-form-item label="序号名称" prop="seqNo" > 
 										<el-input v-model="editForm.seqNo" title="序号 如 1.1，1.2.3，1.3.2等" style="width:100%;" placeholder="如1.0 ， 1.1 ， 1.1.1等"  @change="editXmMenuSomeFields(editForm,'seqNo',$event)"></el-input>
 
 								</el-form-item>
@@ -189,6 +226,8 @@
 					</el-tab-pane>
 				</el-tabs>
 			</el-form>
+			</el-col> 
+			</el-row>
 			<el-drawer title="选择提出人" :visible.sync="proposerSelectVisible" size="60%" append-to-body>
 				<users-select  @confirm="onProposerSelected" ref="usersSelect"></users-select>
 			</el-drawer>
@@ -196,7 +235,7 @@
 			<el-drawer title="选择跟进人" :visible.sync="mmUserSelectVisible" size="60%" append-to-body>
 				<users-select  @confirm="onMmUserSelected" ref="mmUsersSelect"></users-select>
 			</el-drawer>
-		</el-row>
+		
 
 			<el-drawer append-to-body title="标签" :visible.sync="tagSelectVisible" class="dialog-body" size="60%">
 				<tag-mng :tagIds="editForm.tagIds?editForm.tagIds.split(','):[]" :jump="true" @select-confirm="onTagSelected">
@@ -226,19 +265,10 @@
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
-		    ]),
-			calcMenuCurrStep(){
-				var menuStatus= this.dicts.menuStatus
-				if(!menuStatus){
-					return 1;
-				}else{
-					var status=menuStatus.findIndex(i=>this.editForm.status==i.id)
-					if(status>=0){
-						return status+1;
-					}else{
-						return 1;
-					}
-				}
+		    ]), 
+			calcMenuCurrStep(){ 
+				var status=this.dicts['menuStatus'].findIndex(i=>this.editForm.status==i.id) +1
+				return status; 
 			},
 			calcMenuLabel(){
 				var params={label:'工作项',icon:'',color:''};
@@ -324,18 +354,7 @@
 				proposerSelectVisible:false,
 				mmUserSelectVisible:false,
 				dicts:{
-					menuStatus:[
-
-							{id:"0", name:"初始"},
-							{id:"1", name:"待评审"},
-							{id:"2", name:"待设计"},
-							{id:"3", name:"待开发"},
-							{id:"4", name:"待SIT"},
-							{id:"5", name:"待UAT"},
-							{id:"6", name:"待上线"},
-							{id:"7", name:"运行中"},
-							{id:"8", name:"已下线"},
-							{id:"9", name:"已删除"},
+					menuStatus:[ 
 					]
 				},
 				tagSelectVisible:false, 
@@ -561,4 +580,7 @@
   display: inline-block;
   margin-right: 5px;
 }
+.step-btn{
+	margin-left:0px;margin-bottom: 5px;
+}
 </style>
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 209166f8..21613237 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -2,7 +2,12 @@
 	<section>  
 		<el-row :gutter="20" >
 			<el-col v-if="editForm.crowd==='1' && editForm.taskOut=='1'" :span="4" class="border padding">
-				 <h2 class="padding-top padding-bottom">众包{{editForm.ntype=='1'?'计划':'任务'}}</h2> 
+				 <h3 class="padding-bottom">
+					<div    class="icon" :style="{backgroundColor:   editForm.ntype==='0'?'#409EFF':'#E6A23C'}">
+						<i :class="  editForm.ntype==='0'?'el-icon-s-operation':'el-icon-odometer' " ></i>
+					</div>  
+					众包{{editForm.ntype=='1'?'计划':'任务'}}
+				</h3> 
 				<el-steps :active="calcTaskStep" align-center  finish-status="success" process-status="process" direction="vertical">
 					<el-step v-for="(item,index) in dicts.bidStep" :title="item.name" :description="item.name" :key="index"> 
 						<span slot="description">
@@ -55,7 +60,12 @@
 				</el-steps> 
 			</el-col>
 			<el-col v-if="editForm.crowd!='1' ||  editForm.taskOut!='1'" :span="4" class="border padding">
-				<h2 class="padding-top padding-bottom">普通{{editForm.ntype=='1'?'计划':'任务'}}</h2> 
+				<h3 class="padding-bottom">
+				<div    class="icon" :style="{backgroundColor:   editForm.ntype==='0'?'#409EFF':'#E6A23C'}">
+					<i :class="  editForm.ntype==='0'?'el-icon-s-operation':'el-icon-odometer' " ></i>
+				</div>  
+				普通{{editForm.ntype=='1'?'计划':'任务'}}
+			</h3> 
 				<el-steps :active="calcTaskStep" align-center   finish-status="success" process-status="process" direction="vertical">
 					<el-step v-for="(item,index) in dicts.taskState" :title="item.name" :description="item.name" :key="index"> 
 						<span slot="description">