From e3388482a906d7e34245e80193878cd5ef43d1d6 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, 31 Mar 2022 07:06:41 +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

---
 .../xm/core/components/XmMenuWorkload.vue     |  9 +++----
 src/views/xm/core/xmMenu/XmMenuEdit.vue       | 11 ++-------
 src/views/xm/core/xmMenu/XmMenuMng.vue        | 24 ++++++++-----------
 src/views/xm/core/xmTask/XmTaskMng.vue        |  6 ++---
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/views/xm/core/components/XmMenuWorkload.vue b/src/views/xm/core/components/XmMenuWorkload.vue
index 8863920f..171bbf66 100644
--- a/src/views/xm/core/components/XmMenuWorkload.vue
+++ b/src/views/xm/core/components/XmMenuWorkload.vue
@@ -9,9 +9,6 @@
 					<el-form-item label="工时进度" prop="mactRate" >
 						<el-progress style="width:50%;" :stroke-width="15" :percentage="editForm.mactRate?editForm.mactRate:0"></el-progress>
 					</el-form-item>  
-					<el-form-item label="预估工期" prop="budgetHours">
-						{{editForm.budgetHours}}&nbsp;小时
-					</el-form-item> 
 					<el-form-item label="预估工时" prop="budgetWorkload">
 						 {{editForm.budgetWorkload}}&nbsp;小时
 					</el-form-item> 
@@ -19,8 +16,12 @@
 						 {{editForm.mactWorkload}}&nbsp;小时
 					</el-form-item>  
 					
+					<el-form-item label="剩余工时" prop="rworkload">
+						 {{editForm.rworkload}}&nbsp;小时
+					</el-form-item>  
+					
 					<el-form-item label="" class="padding">
-						<el-button   type="text" @click="cancel">关闭</el-button>
+						<el-button   @click="cancel">关闭</el-button>
 						 
 					</el-form-item> 
 				</el-form> 
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 32761dfe..238b3d76 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -124,7 +124,7 @@
 								<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.remark" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
 							</el-form-item>
 							<el-row class="padding">
- 								<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'remark',editForm.remark)" :disabled="load.edit==true">提交</el-button>
+ 								<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'remark',editForm.remark)" :disabled="load.edit==true">提交概述</el-button>
 							</el-row>
 						</el-tab-pane>
 						<el-tab-pane :label="'子工作项'+(subWorkItemNum>=0?'('+subWorkItemNum+')':'')" name="6">
@@ -144,9 +144,6 @@
 							<el-form-item label="实际工时" prop="mactWorkload">
 								<el-input-number :disabled="editForm.calcType!=='2'  " style="width:200px;"  v-model="editForm.mactWorkload" :precision="2" :step="8" :min="0" placeholder="实际工时(小时)"></el-input-number> &nbsp;h
 							</el-form-item>  
-							<el-row class="padding">
- 								<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'workload',{mactWorkload:editForm.mactWorkload,budgetWorkload:editForm.budgetWorkload,mactRate:editForm.mactRate,budgetHours:editForm.budgetHours})" :disabled="load.edit==true">提交</el-button>
-							</el-row>
 						</el-tab-pane>
 						<el-tab-pane label="成本" name="3">
 							<el-form-item label="预估金额" prop="budgetAmount">
@@ -155,10 +152,6 @@
 							<el-form-item label="实际金额" prop="mactAmount">
 								<el-input-number :disabled="editForm.calcType!=='2'  "  style="width:200px;"  v-model="editForm.mactAmount" :precision="2" :step="100" :min="0" placeholder="实际金额"></el-input-number>   元
 							</el-form-item>
-
-							<el-row class="padding">
- 								<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'budgetAmount',{budgetAmount:editForm.budgetAmount,mactAmount:editForm.mactAmount })" :disabled="load.edit==true">提交</el-button>
-							</el-row>
 						</el-tab-pane>
 					<el-tab-pane label="链接" name="5">
 						<el-form-item label="需求链接" prop="demandUrl">
@@ -175,7 +168,7 @@
 						</el-form-item>
 
 							<el-row class="padding">
- 								<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'link',{demandUrl:editForm.demandUrl,codeUrl:editForm.codeUrl,designUrl:editForm.designUrl,operDocUrl:editForm.operDocUrl})" :disabled="load.edit==true">提交</el-button>
+ 								<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'link',{demandUrl:editForm.demandUrl,codeUrl:editForm.codeUrl,designUrl:editForm.designUrl,operDocUrl:editForm.operDocUrl})" :disabled="load.edit==true">提交链接</el-button>
 							</el-row>
 					</el-tab-pane>
 					<el-tab-pane label="wiki" name="7">
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index bdc16e33..310d70f6 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -288,20 +288,16 @@
 										<div>{{scope.row.finishTaskCnt}}/{{scope.row.taskCnt}}</div>
 								</template>
 							</el-table-column>
-							<el-table-column prop="finishRate" label="进度"  min-width="80" show-overflow-tooltip sortable>
-								<template slot-scope="scope">
-									<div class="cell-text" v-if="scope.row.calcType!=='2'">
-										 <span v-if="scope.row.finishRate"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag></span>
-									</div>
-									<div class="cell-text" v-else>
-										 <span v-if="scope.row.mactRate"><el-tag :type="scope.row.mactRate>=100?'success':'warning'">{{scope.row.mactRate}}%</el-tag></span>
-									</div>
-									<span class="cell-bar">
-										<xm-menu-workload :menu="scope.row"  placeholder="工时"  style="display:block;" @submit="editXmMenuSomeFields(scope.row,'workload',$event)">
-										</xm-menu-workload>
-									</span>
-								</template>
-
+							
+							<el-table-column prop="mactWorkload" label="工时"  min-width="100" show-overflow-tooltip sortable>
+								<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 prop="bugs" label="缺陷"  min-width="100" show-overflow-tooltip sortable>
 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index a51e5e78..afe62c46 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -478,9 +478,9 @@
                 label="工时"
                 width="150"
               >
-                <template slot-scope="scope"> {{scope.row.actWorkload}}&nbsp;/&nbsp;{{
-                    scope.row.budgetWorkload
-                  }}&nbsp;h
+
+                <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">