From ace2ad87658bdbeb670645ae3145a938b9626e00 Mon Sep 17 00:00:00 2001
From: chentaiyu <chentaiyu@xx.com>
Date: Tue, 29 Mar 2022 15:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=93=E7=AE=97-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4sbill=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0workload?=
 =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTaskSbill/SelectTaskWorkload.vue | 10 +---------
 src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue     |  3 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmTaskSbill/SelectTaskWorkload.vue b/src/views/xm/core/xmTaskSbill/SelectTaskWorkload.vue
index 27a5ab63..84264715 100644
--- a/src/views/xm/core/xmTaskSbill/SelectTaskWorkload.vue
+++ b/src/views/xm/core/xmTaskSbill/SelectTaskWorkload.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="page-container border padding">
     <el-row>
-      <el-input v-model="filters.key" style="width: 30%;" placeholder="模糊查询任务ID/名称"></el-input>
+      <el-input v-model="filters.key" style="width: 30%;" placeholder="模糊查询任务ID/名称/员工ID/员工名称"></el-input>
       <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskWorkloads" icon="el-icon-search">查询</el-button>
     </el-row>
     <el-row class="padding-top">
@@ -52,15 +52,7 @@
       <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>
-      <!--编辑 XmTaskWorkload 工时登记表界面-->
-      <el-drawer title="编辑工时登记表" :visible.sync="editFormVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
-        <xm-task-workload-edit op-type="edit" :xm-task-workload="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-task-workload-edit>
-      </el-drawer>
 
-      <!--新增 XmTaskWorkload 工时登记表界面-->
-      <el-drawer title="新增工时登记表" :visible.sync="addFormVisible"  size="60%"  append-to-body  :close-on-click-modal="false">
-        <xm-task-workload-edit op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-task-workload-edit>
-      </el-drawer>
     </el-row>
   </section>
 </template>
diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
index b130969d..fdaff609 100644
--- a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
+++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
@@ -319,11 +319,12 @@
           this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
         }).catch( err =>{});
       },
+      //添加到结算的要修改工时登记的状态
       changeXmTaskWorkload(data,sbill){
         let params={
           id:data.id,
           sstatus:'2',//2为已提交结算
-          stime:this.formatDate("YYYY-mm-dd HH:MM",new Date()),
+          stime:this.dateFormat("YYYY-mm-dd HH:MM:SS",new Date()),
           sbillId:sbill.id
         }
         editXmTaskWorkload(params).then((res) => {