fix: 修改任务增加发送通知选项

pages/createTask/createTask.js

@@ -95,13 +95,14 @@ create.Page({
       taskCreateModel.taskId = task.taskId
       taskCreateModel.commentId = task.commentId
       if (excutor) {
-        if (task.originExcutorId !== excutor[0].id) {
-          taskCreateModel.userList = excutor;
-        }
         if (task.originExcutorId) {
-          taskCreateModel.removeUserList = [task.originExcutor]
+          if (task.originExcutorId !== excutor[0].userId) {
+            taskCreateModel.userList = excutor;
+            taskCreateModel.removeUserList = [task.originExcutor]
+          }
+        } else {
+          taskCreateModel.userList = excutor;
         }
-
       } else {
         if (task.originExcutorId) {
           taskCreateModel.removeUserList = [task.originExcutor]
@@ -115,33 +116,55 @@ create.Page({
 
     updateMeetingTask(data).then(res => {
       if (res.data.code == 0) {
-        //重置
-        this.store.data.currentTask = {};
-        this.update();
-        // const addData = res.data.data[0].commentListDataModelList[0];
-        // addData.updateTime = getCreateShowTime(addData.updateTime);
-
         if (this.data.type === 'edit') {
-          // 修改动态列表
-          if (res.data.data) {
-            const affairListIndex = this.store.data.affairList.findIndex(it => it.commentId === data.taskModifyModel.commentId)
-            const tasksIndex = this.store.data.tasks.findIndex(it => it.commentId === data.taskModifyModel.commentId)
-            this.store.data.affairList.splice(affairListIndex, 1)
-            this.store.data.tasks.splice(tasksIndex, 1)
-
-            const addData = res.data.data[0].commentListDataModelList[0];
-            addData.updateTime = getCreateShowTime(addData.updateTime);
-            this.store.data.affairList.unshift(addData);
-            this.store.data.tasks.unshift(addData);
-            this.store.data.isNeedReloadIndexList = true;
-
-            if (affairListIndex > this.store.data.separateIndex && this.store.data.separateIndex !== -1) {
-              this.store.data.separateIndex += 1;
-              this.store.data.separateIndex = fixSeperateIndex(this.store.data.separateIndex, this.store.data.affairList)
+          //是否发送通知
+          dd.confirm({
+            title: '通知',
+            content: '是否更新动态列表通知其他成员？',
+            confirmButtonText: '更新',
+            cancelButtonText: '不更新',
+            success: (ret) => {
+              if (ret.confirm) {
+                if (res.data.data) {
+                  const affairListIndex = this.store.data.affairList.findIndex(it => it.commentId === data.taskModifyModel.commentId)
+                  const tasksIndex = this.store.data.tasks.findIndex(it => it.commentId === data.taskModifyModel.commentId)
+                  const deleteData = this.store.data.affairList.splice(affairListIndex, 1);
+                  this.store.data.tasks.splice(tasksIndex, 1)
+
+                  const addData = res.data.data[0].commentListDataModelList[0];
+                  addData.replyCommentList = deleteData[0].replyCommentList;
+                  addData.updateTime = getCreateShowTime(addData.updateTime);
+                  this.store.data.affairList.unshift(addData);
+                  this.store.data.tasks.unshift(addData);
+                  this.store.data.isNeedReloadIndexList = true;
+
+                  if (affairListIndex > this.store.data.separateIndex && this.store.data.separateIndex !== -1) {
+                    this.store.data.separateIndex += 1;
+                    this.store.data.separateIndex = fixSeperateIndex(this.store.data.separateIndex, this.store.data.affairList)
+                  }
+
+                  //重置
+                  this.store.data.currentTask = {};
+                  this.update();
+
+                  dd.navigateBack();
+
+
+                }
+              } else {
+                const updateAffair = this.store.data.affairList.find(it => it.commentId === data.taskModifyModel.commentId);
+                const updateTask = this.store.data.tasks.find(it => it.commentId === data.taskModifyModel.commentId);
+                updateAffair.meetingTaskSimpleViewModel.title = updateTask.title = taskCreateModel.title;
+                updateAffair.meetingTaskSimpleViewModel.endTime = updateTask.endTime = taskCreateModel.endTime;
+                updateAffair.meetingTaskSimpleViewModel.executor = updateTask.excutor = excutor;
+
+                this.update();
+                dd.navigateBack();
+
+              }
             }
-            this.update();
+          })
 
-          }
         } else {
           // 修改动态列表
           if (res.data.data) {
@@ -154,10 +177,12 @@ create.Page({
             if (this.store.data.separateIndex !== -1) {
               this.store.data.separateIndex += 1;
             }
+            this.store.data.currentTask = {};
             this.update();
+            dd.navigateBack();
+
           }
         }
-        dd.navigateBack();
 
 
 

pages/index/index.js

@@ -102,6 +102,7 @@ create.Page({
         this.isNeverShowSchedulePage = false;
       }
     }
+    this.connect_start();
 
 
     //webSocket.connectSocket();
@@ -151,7 +152,6 @@ create.Page({
     }
     this.update();
 
-    this.connect_start();
 
     // 注意： 回调方法的注册在整个小程序启动阶段只要做一次，调多次会有多次回调
     dd.onSocketOpen((res) => {
@@ -286,7 +286,7 @@ create.Page({
     });
   },
   onHide() {
-
+    dd.closeSocket();
     clearInterval(this.timer);
     this.timer = null;
   },

pages/meetingDetail/meetingDetail.js

@@ -1050,7 +1050,6 @@ create.Page({
   },
   editTask(e) {
     const { task, commentId } = e.currentTarget.dataset;
-    console.log(task)
     const executor = (task.executor && task.executor.length > 0) ? task.executor[0] : {}
     this.store.data.currentTask = {
       endTime: task.endTime,