From f343f6be4f774bb8005c69f489b803f4f664f853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 18 Jun 2022 09:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dateRange/index.vue          |  2 +-
 src/views/xm/core/xmMenu/XmEpicFeatures.vue |  4 +-
 src/views/xm/core/xmMenu/XmMenuEdit.vue     | 25 +++---
 src/views/xm/core/xmMenu/XmMenuMng.vue      | 17 +++--
 src/views/xm/core/xmTask/XmTaskEdit.vue     | 17 +++--
 src/views/xm/core/xmTask/XmTaskMng.vue      | 84 ++++++++++-----------
 6 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/src/components/dateRange/index.vue b/src/components/dateRange/index.vue
index eef95eaf..c9e16ffe 100644
--- a/src/components/dateRange/index.vue
+++ b/src/components/dateRange/index.vue
@@ -80,7 +80,7 @@ export default {
     }, 
     rangeSepaSrator:{ 
       type: String,
-      default: '至'
+      default: '-'
     },
     pickerOptions:{
         typeof:Object,
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 1e116881..8d08876c 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -68,9 +68,9 @@
 									<span>{{scope.row.seqNo}} &nbsp; {{scope.row.menuName}} </span>
 									
 									<span  
-										:style="{borderRadius: '30px',color:scope.row.rate >= 100 ? 'green' : 'blue'}" 
+										:style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue'}" 
 									>
-										{{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
+										{{ (scope.row.finishRate != null ? scope.row.finishRate : 0) + "%" }}
 									</span>  
 									<div class="tool-bar" v-if="!disabledMng">
 									<span class="u-btn">
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 36094cb7..4cc2b7aa 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -2,7 +2,7 @@
 	<section>
 		<el-row class="page-main ">
 			<el-form :model="editForm"  label-width="100px" label-position="left" :rules="editFormRules" ref="editForm">
-						<el-row :gutter="10">
+						<el-row>
 							<el-col :span="6">
 								<el-form-item label="序号名称" prop="seqNo" >
 									<template slot="label">
@@ -21,7 +21,7 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-row :gutter="10">
+						<el-row>
 							<el-col :span="8">
 								<el-form-item label="归属产品" prop="productId">
 									<font v-if="editForm.productId">{{editForm.productName?editForm.productName:editForm.productId}}</font>
@@ -50,7 +50,7 @@
 								</el-col>
 						</el-row>
 
-						<el-row :gutter="10">
+						<el-row>
 							<el-col :span="8">
 								<el-form-item label="需求状态" prop="status">
 									<el-select style="display:block;width:100px;" v-model="editForm.status"  @change="editXmMenuSomeFields(editForm,'status',$event)">
@@ -58,13 +58,16 @@
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :span="16">  
-								<el-form-item label="时间进度" prop="startTime" >
-										<date-range type="daterange" :auto-default="false" :style-object="{display:'inline'}"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="editForm" start-key="startTime" end-key="endTime"  @change="editXmMenuSomeFields(editForm,'startTime',editForm)"></date-range>
-										{{editForm.finishRate?editForm.finishRate:0}}% 
-
-								</el-form-item>    
-									
+							<el-col :span="8">  
+								<el-form-item label="进度" prop="finishRate" >
+ 										 {{editForm.finishRate?editForm.finishRate:0}}%  
+								</el-form-item>   
+							</el-col>  
+							<el-col :span="8">  
+								<el-form-item label="起止时间" prop="startTime,endTime" >
+										<date-range type="daterange" :style-obj="{maxWidth:'100%'}" :auto-default="false"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="editForm" start-key="startTime" end-key="endTime"  @change="editXmMenuSomeFields(editForm,'startTime',editForm)"></date-range>
+ 
+								</el-form-item> 
 							</el-col>
 						</el-row>
 					<el-tabs  v-model="activateTabPaneName" >
@@ -325,7 +328,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 				},
 				tagSelectVisible:false, 
 				subWorkItemNum:-1,
-				activateTabPaneName:'1'
+				activateTabPaneName:'4'
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 
 				/**end 在上面加自定义属性**/
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index eed0084c..f6626450 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -212,6 +212,16 @@
 							<template>
 							<el-table-column prop="productId" label="产品" width="100" show-overflow-tooltip sortable>
 							</el-table-column>
+							
+							<el-table-column prop="finishRate" label="进度" width="100" show-overflow-tooltip sortable>
+								<template slot-scope="scope">
+									<span  
+										:style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue'}" 
+									>
+										{{ (scope.row.finishRate != null ? scope.row.finishRate : 0) + "%" }}
+									</span>  
+								</template>
+							</el-table-column>
 							<el-table-column prop="status" label="状态"  min-width="80"  sortable>
 								<template slot-scope="scope">
 									<div class="cell-text">
@@ -296,12 +306,7 @@
 								<template slot-scope="scope"> 
 									<span title="实际工时 / 预算工时 或者 (剩余工时+实际工时)">{{scope.row.mactWorkload}} &nbsp;/ &nbsp;{{scope.row.rworkload?parseInt(scope.row.mactWorkload)+parseInt(scope.row.rworkload):scope.row.budgetWorkload}}h </span>
 								</template> 
-							</el-table-column>
-							<el-table-column prop="mactRate" label="进度"  min-width="80" show-overflow-tooltip sortable>
-								<template slot-scope="scope"> 
-										 <span v-if="scope.row.mactRate"><el-tag :type="scope.row.mactRate>=100?'success':'warning'">{{scope.row.mactRate}}%</el-tag></span> 
-								</template> 
-							</el-table-column>
+							</el-table-column> 
 							<el-table-column prop="bugs" label="缺陷"  min-width="100" show-overflow-tooltip sortable>
 
 								<template slot="header">
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 5011fb15..42111368 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -63,9 +63,15 @@
 									</el-select>    
 								</el-form-item> 
 							</el-col> 
-							<el-col :span="16"> 
-								<el-form-item label="时间进度">  
+							<el-col :span="8"> 
+								<el-form-item label="进度">   
+										{{editForm.rate?editForm.rate:0}}%
+								</el-form-item>  
+							</el-col> 
+							<el-col :span="8"> 
+								<el-form-item label="起止时间">  
 										<date-range 
+											:style-obj="{maxWidth:'100%'}"
 											v-model="editForm"
 											start-key="startTime"
 											end-key="endTime"
@@ -79,8 +85,7 @@
 											value-format="yyyy-MM-dd HH:mm:ss"
 											:default-time="['00:00:00','23:59:59']"
 											:picker-options="pickerOptions"
-										></date-range>
-										{{editForm.rate?editForm.rate:0}}%
+										></date-range> 
 								</el-form-item>  
 							</el-col> 
 
@@ -323,7 +328,7 @@
 					this.editForm=Object.assign(this.editForm, this.xmTask);      
 					this.editFormBak=Object.assign({},this.editForm)
 					this.setSkills()
-					this.activateTabPaneName="1"
+					this.activateTabPaneName="2"
 					//从新打开页面时某些数据需要重新加载，可以在这里添加
 				}
 			}, 
@@ -376,7 +381,7 @@
 				pickerOptions:  util.getPickerOptions('datarange'),
 				tagSelectVisible:false,
 				subWorkItemNum:0,
-				activateTabPaneName:'1'
+				activateTabPaneName:'2'
 				 /**end 在上面加自定义属性**/
 			}//end return
 		},//end data
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index f5f2e0dd..ab79db92 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -370,34 +370,6 @@
 									</span>
 								</template>
               </el-table-column>
-              
-              <el-table-column
-                label="优先级"
-                type="level"
-                width="100"
-              >  
-								<template slot-scope="scope">
-									<div class="cell-text">
-										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterPriorityDicts(scope.row.level)" :key="index">{{item.name}}</el-button>
-									</div>
-									<span class="cell-bar">
-										 <el-select @visible-change="selectVisible(scope.row,$event)"  v-model="scope.row.level" placeholder="优先级"  style="display:block;"  @change="editXmTaskSomeFields(scope.row,'level',$event)">
-												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"></el-option>
-										 </el-select>
-									</span>
-								</template>
-              </el-table-column>
-              <el-table-column
-                sortable
-                prop="budgetWorkload"
-                label="工时"
-                width="150"
-              >
-
-                <template slot-scope="scope">
-                  	<span title="实际工时 / 预算工时 或者 (剩余工时+实际工时)">{{scope.row.actWorkload}} &nbsp;/ &nbsp;{{scope.row.rworkload?parseInt(scope.row.actWorkload)+parseInt(scope.row.rworkload):scope.row.budgetWorkload}}h </span>
-                </template>
-              </el-table-column>
               <el-table-column sortable prop="rate" label="进度" width="100">
                 <template slot-scope="scope">
                   <el-link v-if="scope.row.ntype=='0'"
@@ -424,21 +396,16 @@
                   </div>
                 </template>
               </el-table-column>
+              <el-table-column
+                sortable
+                prop="budgetWorkload"
+                label="工时"
+                width="150"
+              >
 
-              <el-table-column sortable prop="productId" label="产品" width="100" show-overflow-tooltip>
-              </el-table-column>
-              <el-table-column sortable prop="projectId" label="项目" width="100" show-overflow-tooltip>
-              </el-table-column>
-
-              <el-table-column sortable prop="tagNames" label="标签" width="100" show-overflow-tooltip>
-								<template slot-scope="scope">
-									<div class="cell-text"> 
-										{{scope.row.tagNames}}
-									</div>
-									<span class="cell-bar">
-										 <el-button @click="$refs.tagDialog.open({data:scope.row,action:'editTagIds'})">选标签</el-button>
-									</span>
-								</template>
+                <template slot-scope="scope">
+                  	<span title="实际工时 / 预算工时 或者 (剩余工时+实际工时)">{{scope.row.actWorkload}} &nbsp;/ &nbsp;{{scope.row.rworkload?parseInt(scope.row.actWorkload)+parseInt(scope.row.rworkload):scope.row.budgetWorkload}}h </span>
+                </template>
               </el-table-column>
               <el-table-column
                 sortable
@@ -478,6 +445,39 @@
                   </span>
                 </template>
               </el-table-column>
+              <el-table-column sortable prop="productId" label="产品" width="100" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column sortable prop="projectId" label="项目" width="100" show-overflow-tooltip>
+              </el-table-column>
+
+              <el-table-column sortable prop="tagNames" label="标签" width="100" show-overflow-tooltip>
+								<template slot-scope="scope">
+									<div class="cell-text"> 
+										{{scope.row.tagNames}}
+									</div>
+									<span class="cell-bar">
+										 <el-button @click="$refs.tagDialog.open({data:scope.row,action:'editTagIds'})">选标签</el-button>
+									</span>
+								</template>
+              </el-table-column>
+              
+              <el-table-column
+                label="优先级"
+                type="level"
+                width="100"
+              >  
+								<template slot-scope="scope">
+									<div class="cell-text">
+										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterPriorityDicts(scope.row.level)" :key="index">{{item.name}}</el-button>
+									</div>
+									<span class="cell-bar">
+										 <el-select @visible-change="selectVisible(scope.row,$event)"  v-model="scope.row.level" placeholder="优先级"  style="display:block;"  @change="editXmTaskSomeFields(scope.row,'level',$event)">
+												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"></el-option>
+										 </el-select>
+									</span>
+								</template>
+              </el-table-column>
+              
               <el-table-column
                 sortable
                 prop="startTime"