From c46478d0eeed61f0e89620a32a8534e69b80d778 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, 15 Mar 2022 11:40:31 +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     | 21 +++++++++++---
 src/views/xm/core/xmMenu/XmMenuOverview.vue | 32 ++++++++++++++-------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 972d6c8b..6ef569c6 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -5,7 +5,7 @@
 				<el-tab-pane  label="需求详情">
 					<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
 						<el-row class="padding-bottom"> 
-						<el-steps :active="parseInt(editForm.status)+1" simple finish-status="success" align-center>
+						<el-steps :active="calcMenuCurrStep" simple finish-status="success" align-center>
 							<el-step v-for="(item,index) in dicts.menuStatus" @click.native="on_click(item.id)" :title="item.name" :key="index"></el-step> 
 						</el-steps>
 						</el-row> 
@@ -168,7 +168,20 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 		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;
+					}
+				}
+			}
 		},
 		props:['xmMenu','visible','parentMenu','product'],
 		watch: {
@@ -183,7 +196,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 	    },
 		data() {
 			return {
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				//dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 				load:{ list: false, add: false, del: false, edit: false },//查询中...
 				editFormRules: {
 					menuId: [
@@ -318,7 +331,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 		mounted() {
 			
 			
- 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority'] ).then(res=>{
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
 				this.dicts=res.data.data;
 			})
 			this.editForm=Object.assign(this.editForm, this.xmMenu);
diff --git a/src/views/xm/core/xmMenu/XmMenuOverview.vue b/src/views/xm/core/xmMenu/XmMenuOverview.vue
index 0545b004..9c96146e 100644
--- a/src/views/xm/core/xmMenu/XmMenuOverview.vue
+++ b/src/views/xm/core/xmMenu/XmMenuOverview.vue
@@ -5,15 +5,8 @@
         <el-card class="box-card" style="padding:0px ;height:100px">
           <div>
             <el-row style="padding:10px">
-              <el-steps :active="this.xmMenu.menuStatus" finish-status="success" align-center>
-                <el-step title="初始"></el-step>
-                <el-step title="设计中"></el-step>
-                <el-step title="开发中"></el-step>
-                <el-step title="测试中"></el-step>
-                <el-step title="uat测试"></el-step>
-                <el-step title="已上线"></el-step>
-                <el-step title="已下线"></el-step>
-                <el-step title="已删除"></el-step>
+              <el-steps :active="calcMenuCurrStep" finish-status="success" align-center>
+                <el-step :title="item.name" v-for="(item,index) in dicts['menuStatus']" :key="index"></el-step> 
               </el-steps>
             </el-row>
           </div>
@@ -237,7 +230,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { mapGetters } from 'vuex'
 
 
@@ -305,6 +298,20 @@
       xmMenuCpd(){
         return this.xmMenu
       },
+      
+			calcMenuCurrStep(){
+				var menuStatus= this.dicts.menuStatus
+				if(!menuStatus){
+					return 1;
+				}else{
+					var status=menuStatus.findIndex(i=>this.xmMenu.status==i.id)
+					if(status>=0){
+						return status+1;
+					}else{
+						return 1;
+					}
+				}
+			}
 
     },
 
@@ -319,6 +326,7 @@
     data() {
       return {
         isActive:true,
+        dicts:{},
       };
     },
 
@@ -533,6 +541,10 @@
     },
 
     mounted() {
+      
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
+				this.dicts=res.data.data;
+			})
       this.$nextTick(() => {
       });
       this.drawAllBar();