From 78f9de4b08997bdd2274984514064a181f7a2beb 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, 29 Mar 2022 19:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmTaskWorkload/XmTaskWorkloadEdit.vue     |  3 +-
 .../xmTaskWorkload/XmTaskWorkloadList.vue     | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
index 31f091ff..79dcbe90 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
@@ -134,8 +134,9 @@
 							var func=addXmTaskWorkload
 							if(this.currOpType=='edit'){
 							    func=editXmTaskWorkload
+							}else{
+								params.id=null;
 							}
-
 							func(params).then((res) => {
                                 this.load.edit=false
                                 var tips=res.data.tips;
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue
index 71a50fc8..1dde91c2 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue
@@ -2,9 +2,9 @@
 	<section>
 		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
-			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskWorkloads" icon="el-icon-search">查询</el-button>
+			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskWorkloads" icon="el-icon-search">已登记工时查询</el-button>
 			<span style="float:right;">
-			<el-button type="primary" @click="showAdd" icon="el-icon-plus"> </el-button>
+			<el-button type="primary" @click="showAdd" icon="el-icon-plus"> 登记工时</el-button>
 			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>
 			</span>
 		</el-row>
@@ -13,16 +13,20 @@
 			<el-table ref="xmTaskWorkloadTable" :data="xmTaskWorkloads"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="55" show-overflow-tooltip></el-table-column>
  				<el-table-column prop="username" label="姓名" min-width="80" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="bizDate" label="业务日期" min-width="80" show-overflow-tooltip></el-table-column> 
- 				<el-table-column prop="wstatus" label="状态" min-width="80" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="bizDate" label="报送日期" min-width="80" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="workload" label="报送工时" min-width="80" show-overflow-tooltip></el-table-column>
+ 				<el-table-column prop="wstatus" label="状态" min-width="80" show-overflow-tooltip>
+					 <template slot-scope="scope">
+						 {{scope.row.wstatus==='1'?'已确认':'待确认'}}
+					 </template>
+				 </el-table-column>
 				<el-table-column prop="remark" label="备注" min-width="80" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="ttype" label="任务类型" min-width="80" show-overflow-tooltip :formatter="formatterOption"></el-table-column>
- 				<el-table-column prop="workload" label="实际工时" min-width="80" show-overflow-tooltip></el-table-column>
- 				<el-table-column prop="rworkload" label="剩余工时" min-width="80" show-overflow-tooltip></el-table-column> 
+
 			</el-table>
 			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
 		</el-row>
-		<el-row> 
+		<el-row>
 
 			<!--新增 XmTaskWorkload 工时登记表界面-->
 			<el-dialog :title="'任务【'+xmTask.name+'】新增工时'" :visible.sync="addFormVisible"  width="60%" top="20px"  append-to-body  :close-on-click-modal="false">
@@ -91,13 +95,13 @@
 			}
 		},//end data
 		methods: {
-			
+
 			formatterOption: function (row, column, cellValue, index) {
 				var columnName = column.property;
-				var key = columnName; 
+				var key = columnName;
 				if(columnName==='ttype'){
 					key="taskType"
-				} 
+				}
 				if (
 					this.dicts[key] == undefined ||
 					this.dicts[key] == null ||
@@ -163,7 +167,7 @@
 				if(!this.xmTask || !this.xmTask.id){
 					return;
 				}
-				
+
 				params.taskId=this.xmTask.id
 
 				this.load.list = true;
@@ -254,7 +258,7 @@
 		},//end methods
 		mounted() {
 			this.$nextTick(() => {
-			   
+
 				initSimpleDicts('all',[ 'taskType' ]).then(res=>{
 					this.dicts=res.data.data;
 				})