From b87e61b4e0f84db9bb82e03ec719d5df846b7890 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, 1 Feb 2023 17:34:11 +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/components/MdpSelectDict/index.vue        |  5 +++-
 src/views/xm/core/xmMenu/XmMenuEdit.vue       |  6 ++--
 src/views/xm/core/xmMenu/XmMenuMng.vue        | 10 +++----
 src/views/xm/core/xmMenu/XmMenuSelect.vue     | 10 +++----
 .../xm/core/xmQuestion/XmQuestionMng.vue      | 28 ++++++-------------
 5 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/components/MdpSelectDict/index.vue b/src/components/MdpSelectDict/index.vue
index 0a164f6b..70f90479 100644
--- a/src/components/MdpSelectDict/index.vue
+++ b/src/components/MdpSelectDict/index.vue
@@ -40,7 +40,10 @@
         }
     },
     props: {
-      placeholder:'请选择',
+      placeholder:{
+        type:String,
+            default:"请选择",
+      },
         clearable:{
             type:Boolean,
             default:false,
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 1d77b6c0..54f2e34a 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -192,13 +192,13 @@
 								<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.remark"  @change="editXmMenuSomeFields(editForm,'remark',editForm.remark)" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
 							</el-form-item> 
 						</el-tab-pane>
-						<el-tab-pane :label="'子工作项( '+subWorkitemCpd+' )'" name="6">
+						<el-tab-pane :label="'子工作项( '+(subWorkitemCpd?subWorkitemCpd:0)+' )'" name="6">
 							 <xm-sub-work-item v-if="this.activateTabPaneName=='6'" :parent-xm-menu="editForm" :link-project-id="selProject?selProject.id:null" @sub-work-item-num="setSubWorkItemNum" @add-sub-menu="onAddSubMenu"></xm-sub-work-item>
 						</el-tab-pane> 
-						<el-tab-pane :label="'测试用例('+editForm.testCases+')'" name="62">
+						<el-tab-pane :label="'测试用例('+(editForm.testCases?editForm.testCases:0)+')'" name="62">
 							 <xm-test-case-mng  v-if="activateTabPaneName=='62'" :xm-product="{id:editForm.productId,productName:editForm.productName}" :xm-menu="editForm"></xm-test-case-mng>
 						</el-tab-pane>
-						<el-tab-pane :label="'缺陷('+editForm.bugCnt+')'" name="63"> 
+						<el-tab-pane :label="'缺陷('+(editForm.bugCnt?editForm.bugCnt:0)+')'" name="63"> 
 							<xm-question-mng v-if="activateTabPaneName=='63'" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:null" :xm-menu="editForm"></xm-question-mng>
 						</el-tab-pane>
 						<el-tab-pane label="成本" name="3">
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 9b985afb..86cd6f31 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -5,12 +5,10 @@
 					<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>
 
-						<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>
-						</el-select>
-						<el-select v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
-							<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option>
-						</el-select>
+						<mdp-select-dict v-model="filters.priority" placeholder="优先级"  clearable style="width: 100px;" :dict="dicts['priority']">
+ 						</mdp-select-dict>
+						<mdp-select-dict v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;" :dict="dicts['menuStatus']">
+ 						</mdp-select-dict>
 						<el-input v-model="filters.key" style="max-width: 200px;" placeholder="需求名称查询" clearable>
 						</el-input>
 						<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 18edaaa6..e60aef8a 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -20,12 +20,10 @@
 							<el-option   value="not-join-curr-iteration"  :label="'未加入迭代【'+filters.iteration.iterationName+'】'"  v-if="filters.iteration && filters.iteration.id"></el-option>  
 							<el-option   value="join-curr-iteration"  :label="'已加入本迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>  
 						</el-select>  	    
-					 <el-select v-model="filters.priority" placeholder="优先级" class="hidden-md-and-down" clearable style="width: 90px;">
-							<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
-					</el-select>      
-					<el-select  v-model="filters.status" placeholder="需求状态" class="hidden-md-and-down" clearable style="width: 90px;">
-						<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option> 
-					</el-select> 
+					 <mdp-select-dict v-model="filters.priority" placeholder="优先级" class="hidden-md-and-down" clearable style="width: 90px;" :dict="dicts['priority']">
+ 					</mdp-select-dict>      
+					<mdp-select-dict  v-model="filters.status" placeholder="需求状态" class="hidden-md-and-down" clearable style="width: 90px;" :dict="dicts['menuStatus']">
+ 					</mdp-select-dict> 
 					<el-input v-model="filters.key" style="width: 100px;" placeholder="需求名称查询" clearable> 
 					</el-input> 
 					<el-button  v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search">查询</el-button>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 02f50168..2dd63666 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -4,18 +4,12 @@
 				<xm-product-select v-if="!xmProduct&&!xmIteration" style="display:inline;" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="clearProduct"></xm-product-select>
 			  	<xm-project-select v-if="!selProject" style="display:inline;" ref="xmProjectSelect" :auto-select="false" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectConfirm" @clear="clearProject"></xm-project-select>
 
-				  <el-select v-model="filters.bugStatus" placeholder="状态" style="width:100px;"  clearable @change="changeBugStatus">
-					<el-option v-for="(b,index) in dicts['bugStatus']" :value="b.id"  :key="index" :label="b.name">{{b.name}}
-					</el-option>
-				</el-select>
-				<el-select class="hidden-md-and-down" v-model="filters.priority" placeholder="优先级"  style="width:120px;"  clearable @change="changePriority">
-					<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
-					</el-option>
-				</el-select>
-				<el-select class="hidden-md-and-down" v-model="filters.bugSeverity" placeholder="严重程度"  style="width:120px;" clearable @change="changeBugSeverity">
-					<el-option v-for="(b,index) in dicts['bugSeverity']" :value="b.id" :key="index" :label="b.name">{{b.name}}
-					</el-option>
-				</el-select>
+				<mdp-select-dict v-model="filters.bugStatus" placeholder="状态" style="width:120px;"  clearable :dict="dicts['bugStatus']"/> 
+ 
+				<mdp-select-dict class="hidden-md-and-down" v-model="filters.priority" placeholder="优先级"  style="width:120px;"  clearable  :dict="dicts['priority']"/>
+ 
+				<mdp-select-dict class="hidden-md-and-down" v-model="filters.bugSeverity" placeholder="严重程度"  style="width:120px;" clearable  :dict="dicts['bugSeverity']"/>
+ 
 				
 				<el-button v-if="!filters.tags||filters.tags.length==0" @click.native="$refs.tagDialog.open()">标签</el-button>
 				<el-tag v-else @click="$refs.tagDialog.open()"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
@@ -64,17 +58,11 @@
 						<el-row>
 							<el-col :span="12">
 							<font class="more-label-font">优先级:</font>  
-							<el-select   v-model="filters.priority" placeholder="请选择优先级" clearable style="width:200px;">
-								<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
-								</el-option>
-							</el-select>
+								<mdp-select-dict   v-model="filters.priority" placeholder="请选择优先级" clearable style="width:200px;" :dict="dicts['priority']"/> 
 							</el-col>  
 							<el-col :span="12">
 							<font class="more-label-font">解决方案:</font>  
-							<el-select  v-model="filters.solution" placeholder="请选择解决方案" clearable style="width:200px;">
-								<el-option v-for="(b,index) in dicts['bugSolution']" :value="b.id" :key="index" :label="b.name">{{b.name}}
-								</el-option>
-							</el-select>
+								<mdp-select-dict  v-model="filters.solution" placeholder="请选择解决方案" clearable style="width:200px;" :dict="dicts['bugSolution']"/> 
 							</el-col>  
 						</el-row>
 						<el-row>