From 41c0c2cb87cd10d9f8ee6552b404927724b679b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 18 Sep 2022 11:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BA=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTask/XmTaskMng.vue        | 95 +++++--------------
 .../xmTaskExecuser/XmTaskExecuserEdit.vue     |  4 +-
 .../xmTaskExecuser/XmTaskExecuserForTask.vue  |  8 +-
 3 files changed, 32 insertions(+), 75 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 20f4deb9..0ee13f68 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -59,7 +59,7 @@
           </el-select>
           <el-input
             style="width: 120px"
-            v-model="filters.key"
+            v-model="filters.key" clearable
             placeholder="计划/任务名称"
           >
           </el-input>
@@ -574,48 +574,12 @@
       <el-row class="padding">
         <el-row style="font-size: 12px; overflow-x: hidden">
           <div class="task-header extra">
-            <div class="title">
-              {{ editForm.name }}
-              <el-tag style="border-radius: 30px">{{
-                taskStateList[parseInt(editForm.taskState)]
-              }}</el-tag>
-              <el-link
-                v-if="isTaskCenter == '1' && selkey == 'myFocus'"
-                type="warning"
-                @click.stop="focusOrUnfocus(editForm)"
-                >去取关</el-link
-              >
-              <el-link
-                v-if="isTaskCenter == '1' && selkey != 'myFocus'"
-                type="success"
-                @click.stop="focusOrUnfocus(editForm)"
-                >去关注</el-link
-              >
-            </div>
-            <div class="compact">
-              <el-tag
-                v-if="editForm.level != '' && editForm.level != null"
-                style="border-radius: 30px"
-                >{{ formatDicts(dicts,"priority", editForm.level) }}</el-tag
-              >
-              [{{ formatDicts(dicts,"taskType", editForm.taskType) }}]
-              <span> {{ editForm.projectName }} </span>
-              -
-              <span> {{ editForm.createUsername }} </span>
-              创建于 {{ editForm.createTime }}
-            </div>
-            <div class="remarks">
-              {{ editForm.remarks }}
-            </div>
-          </div>
-
-          <div class="exector extra">
-            <div class="field-label">需求</div>
-            <el-tag
-              v-if="editForm.menuName"
-              style="margin-left: 10px; border-radius: 30px"
-              >{{ editForm.menuName }}</el-tag
-            >
+            <div class="title" v-if="sels.length==0">
+              {{ editForm.name }}   
+            </div>  
+            <div class="title" v-if="sels.length>0">
+              {{ editForm.name }} <font color="red">等{{sels.length}}个任务</font>
+            </div>  
           </div>
 
           <div class="exector extra">
@@ -631,7 +595,7 @@
               end-placeholder="计划完成日期"
               value-format="yyyy-MM-dd HH:mm:ss"
               :default-time="['00:00:00', '23:59:59']" 
-              @change="editTime(editForm)"
+              @change="editTime(editForm,'startTime')"
               :auto-default="false"
             ></mdp-date-range>
             共{{ taskTime }}天
@@ -649,7 +613,7 @@
               end-placeholder="实际完成日期"
               value-format="yyyy-MM-dd HH:mm:ss"
               :default-time="['00:00:00', '23:59:59']" 
-              @change="editTime(editForm)"
+              @change="editTime(editForm,'actStartTime')"
               :auto-default="false"
             ></mdp-date-range> 
           </div>
@@ -1914,30 +1878,17 @@ export default {
       }
       return respons;
     },
-    editTime(row) {
-      var params = {
-        id: row.id,
-        projectId: row.projectId,
-        startTime: row.startTime,
-        endTime: row.endTime,
-        actStartTime: row.actStartTime,
-        actEndTime: row.actEndTime,
-      };
-      this.load.edit = true;
-      editTime(params)
-        .then((res) => {
-          var tips = res.data.tips;
-          this.$notify({
-            showClose: true,
-            message: tips.msg,
-            type: tips.isOk ? "success" : "error",
-          }); 
-          this.load.edit = false;
-        })
-        .catch((err) => {
-          this.load.edit = false; 
-          this.timeVisible = false;
-        });
+    editTime(row,fieldName) {
+      var params={}
+      if(fieldName=='startTime'){
+        params.startTime=row.startTime
+        params.endTime=row.endTime
+      }
+      if(fieldName=='actStartTime'){
+        params.actStartTime=row.actStartTime
+        params.actEndTime=row.actEndTime
+      }
+      this.editXmTaskSomeFields( row,fieldName,params) 
     },
     clearFiltersTag(tag){
       var index=this.filters.tags.findIndex(i=>i.tagId==tag.tagId)
@@ -2114,6 +2065,12 @@ export default {
 				}else if(fieldName==='createUserid'){
 					params.createUserid=$event.userid
 					params.createUsername=$event.username
+				}else if(fieldName==='startTime'){
+					params.startTime=$event.startTime
+					params.endTime=$event.endTime
+				}else if(fieldName==='actStartTime'){
+					params.actStartTime=$event.actStartTime
+					params.actEndTime=$event.actEndTime
 				}else{
 					params[fieldName]=$event
 				}
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
index fc20b8e4..12bad78e 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
@@ -1,6 +1,6 @@
 <template>
-	<section class="page-container  padding border">
-		<el-row> 
+	<section>
+		<el-row  class="padding border"> 
 		<!--编辑界面 XmTaskExecuser xm_task_execuser--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="执行人姓名" prop="username">
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
index b70ccff6..7b9356b1 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
@@ -1,13 +1,13 @@
 <template>
-	<section>
-		<div class="exec-navbar">
+	<section class="padding">
+		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button>
 			<el-button type="primary"  @click="toJoin">我要加入</el-button>
 			<el-button type="primary"  @click="showAdd">邀请他人加入</el-button>
 			<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  -->
-		</div>
-		<el-row class="page-main ">
+		</el-row>
+		<el-row>
 			<!--列表 XmTaskExecuser xm_task_execuser-->
 			<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				 <el-table-column type="expand">