fix:文件重复修改

pages/meetingDetail/constant.js

@@ -17,4 +17,5 @@ export const centerPopupList = [
     { id: "Y", text: '发送通知' }
 ]
 export const editSaveList = [{ text: '仅保存此会议', id: 'only' }, { text: '保存此次及以后会议', id: 'future' }]
+export const delSheudleList = [{ text: '仅删除此会议', id: 'only' }, { text: '删除此次及以后会议', id: 'future' }]
 

pages/meetingDetail/meetingDetail.axml

@@ -163,10 +163,13 @@
       <view class="tabBarBottom" a:if="{{isIPX}}">
       </view>
     </view>
-    <selectpopup showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectParticipateStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
+    <!--<selectpopup showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectParticipateStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup> -->
     <selectpopup a:if="{{selectPopup.type === 'participateState'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectParticipateStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
-    <selectpopup a:if="{{selectPopup.type === 'modify_location'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectSavePlaceStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
+    <selectpopup a:if="{{selectPopup.type === 'deleteState'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectDeleteStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
+    <selectpopup a:if="{{selectPopup.type === 'modify_location'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectSavePlaceStatus" onSelectPopupCancel="handleSelectPopupPlaceCancel"></selectpopup>
+    <selectpopup a:if="{{selectPopup.type === 'modify_time'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectSaveTimeStatus" onSelectPopupCancel="handleSelectPopupTimeCancel"></selectpopup>
     <centerpopup a:if="{{centerPopup.type === 'modify_location'}}" centerPopup="{{centerPopup.show}}" centerPopupList="{{centerPopup.list}}" onSelectSend="selectPlaceNeedNotice"></centerpopup>
+    <centerpopup a:if="{{centerPopup.type === 'modify_time'}}" centerPopup="{{centerPopup.show}}" centerPopupList="{{centerPopup.list}}" onSelectSend="selectTimeNeedNotice"></centerpopup>
     <toast showToast="{{conToastData.showToast}}" title="{{conToastData.title}}" onToastHidden="onToastHidden"></toast>
     <!-- 动态列表 -->
     <import src="../../template/avater/index.axml"/>

pages/meetingDetail/meetingDetail.js

@@ -8,7 +8,7 @@ import { observer } from '/utils/observer.js'
 import { resolve } from 'path';
 import { getFileInfo, aheadTimesList, getFileInfoFromOss } from './uploadFile.js';
 import { repeatList } from '../createMeeting/constant';
-import { aheadTimeList, participateStatusList, noParticipateStatusList, centerPopupList, editSaveList } from './constant';
+import { delSheudleList, aheadTimeList, participateStatusList, noParticipateStatusList, centerPopupList, editSaveList } from './constant';
 import { getSelectRepeatId, getInitialPsarticipants, handleChangePeople } from './utils'
 create.Page({
   store: pageStore,
@@ -46,7 +46,7 @@ create.Page({
       selectType: 'common',
       selectPopupId: '',
       // editSaveList: [{ text: '仅保存此会议', id: 'only' }, { text: '保存此次及以后会议', id: 'future' }],
-      delSheudleList: [{ text: '仅删除此会议', id: 'only' }, { text: '删除此次及以后会议', id: 'future' }],
+      // delSheudleList: [{ text: '仅删除此会议', id: 'only' }, { text: '删除此次及以后会议', id: 'future' }],
       // participateStatusList: [{ text: '仅参加此次会议', id: 'only' }, { text: '参加所有会议', id: 'all' }],
       // noParticipateStatusList: [{ text: '不参加此次会议', id: 'only' }, { text: '不参加所有会议', id: 'all' }]
     },
@@ -323,7 +323,16 @@ create.Page({
     if (this.data.repeat.repeatable) {
       dataTitle.modifyModel = "future"
     }
-    this.modifySchedule(dataTitle)
+    this.modifySchedule(dataTitle).then(res => {
+      if (res.data.code !== 0) {
+        this.setData({
+          title: this.$store.data.originalData.title
+        })
+        return
+      }
+      this.$store.data.originalData.title = this.data.title
+      this.update()
+    })
   },
 
 
@@ -350,7 +359,16 @@ create.Page({
     if (this.data.repeat.repeatable) {
       dataRemark.modifyModel = "future"
     }
-    this.modifySchedule(dataRemark)
+    this.modifySchedule(dataRemark).then(res => {
+      if (res.data.code !== 0) {
+        this.setData({
+          remark: this.$store.data.originUsers.remark
+        })
+        return
+      }
+      this.$store.data.originUsers.remark = this.data.remark
+      this, update()
+    })
 
   },
 
@@ -396,7 +414,7 @@ create.Page({
     this.handlePlaceSave(modifyModel, this.data.needNotice)
   },
   // 保存地点
-  handlePlaceSave(modifyModel = "only", needNotice = "Y") {
+  handlePlaceSave(modifyModel = "only", needNotice = "N") {
     let dataLocation = {
       modifyModel: modifyModel,
       needNotice: needNotice,
@@ -413,19 +431,38 @@ create.Page({
         updateType: '',
         isUpate: false
       }
+      if (res.data.code !== 0) {
+        this.reSetPlace()
+        return
+      }
+      this.$store.data.originalData.location = {
+        latitude: "-999",
+        locationName: this.$store.data.locationName,
+        longitude: '-999'
+      }
+      this.$store.data.originalData.meetingRoomId = this.$store.data.roomId
+      this.update()
     })
   },
-
-  // 关闭centerPopup
-  handleCloseCenterPopup() {
+  // 取消修改地点
+  handleSelectPopupPlaceCancel() {
     this.setData({
-      centerPopup: {
+      selectPopup: {
         show: false,
-        list: centerPopupList,
-        type: ''
+        list: "",
+        type: ""
       }
     })
+    this.reSetPlace()
   },
+  //重置地点
+  reSetPlace() {
+    this.$store.data.locationName = this.$store.data.originalData.location.locationName
+    this.$store.data.roomId = this.$store.data.originalData.meetingRoomId < 0 ? "" : this.$store.data.originalData.meetingRoomId
+    this.update()
+  },
+
+
 
 
   // 选择时间 打开popup
@@ -448,34 +485,76 @@ create.Page({
       showTime: getShowTime(this.$store.data.startTime, this.$store.data.endTime)
     })
     this.closePopup()
-    this.handleTimeSave()
+    this.setData({
+      'centerPopup.show': true,
+      'centerPopup.type': "modify_time"
+    })
 
-    /* 
-    改时间 改掉重复规则
-    先选重复规则 再改时间 重复规则也要改变
-    暂时修改每周 每月重复问题
-     */
-    if (this.data.repeat.repeatable !== 0) {
-      let recurrenceModel = modifyTimeImpactRepeat(this.data.repeat.recurrenceModel)
-      this.setData({
-        'repeat.recurrenceModel': recurrenceModel
-      })
+  },
+  // 选择时间是否发送通知
+  selectTimeNeedNotice(event) {
+    this.handleCloseCenterPopup()
+    const needNotice = event.currentTarget.dataset.item.id
+    if (this.data.repeat.repeatable == 0) {
+      this.handleTimeSave('only', needNotice)
+      return
     }
-
+    this.setData({
+      needNotice: needNotice,
+      selectPopup: {
+        show: true,
+        list: editSaveList,
+        type: 'modify_time'
+      }
+    })
+  },
+  // 时间 保存此次还是以后
+  selectSaveTimeStatus(event) {
+    this.handleSelectPopupCancel()
+    const modifyModel = event.currentTarget.dataset.item.id
+    this.handleTimeSave(modifyModel, this.data.needNotice)
   },
   // 保存时间
-  handleTimeSave() {
-    const modifyModel = "only"
+  handleTimeSave(modifyModel = "only", needNotice = "N") {
     let data = {
+      needNotice: needNotice,
       modifyModel: modifyModel,
       startTime: this.$store.data.startTime.replace(/\//g, "-"),
       endTime: this.$store.data.endTime.replace(/\//g, "-"),
       modifyContent: 'modify_time'
     }
-    if (this.data.repeat.repeatable === 0) {
-      this.modifySchedule(data)
-    }
+    this.modifySchedule(data).then(res => {
+      if (res.data.code !== 0) {
+        this.resetTime()
+        return
+      }
+      /* 
+   改时间 改掉重复规则
+   先选重复规则 再改时间 重复规则也要改变
+   暂时修改每周 每月重复问题
+    */
+      if (this.data.repeat.repeatable !== 0) {
+        let recurrenceModel = modifyTimeImpactRepeat(this.data.repeat.recurrenceModel)
+        this.setData({
+          'repeat.recurrenceModel': recurrenceModel
+        })
+      }
+      this.$store.data.originalData.startTime = this.$store.data.startTime
+      this.$store.data.originalData.endTime = this.$store.data.endTime
+      this.update()
+    })
+  },
+  // 取消修改时间
+  handleSelectPopupTimeCancel() {
+    this.handleSelectPopupCancel()
+    this.resetTime()
+  },
+  // 重置时间
+  resetTime() {
 
+    this.$store.data.startTime = this.$store.data.originalData.startTime.replace(/-/g, "/")
+    this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/-/g, "/")
+    this.update()
   },
 
   // 选择重复规则 打开popup
@@ -612,7 +691,6 @@ create.Page({
   // 删除 日程
   handleDelete() {
     const _that = this
-    const modifyModel = "only"
     if (this.data.repeat.repeatable === 0) {
       dd.confirm({
         title: '删除会议',
@@ -621,36 +699,53 @@ create.Page({
         cancelButtonText: '取消',
         success: (success) => {
           if (!!success.confirm) {
-            dd.showLoading({
-              content: '正在删除...',
-            });
-            let data = {
-              scheduleId: this.data.scheduleItem.id,
-              identify: this.data.organizer === getApp().globalData.userid ? 'major' : 'identify',
-              deleteModel: 'only'
-            }
-            deleteSchedule(data).then(async () => {
-              if (this.$store.modifyErpeatMeeting) {
-                await this.$store.modifyErpeatMeeting()
-              }
-              _that.$store.data.isIndexAffairListNeedUpdate = true;
-              _that.update()
-              dd.hideLoading()
-              dd.navigateBack({
-                delta: 1
-              })
-            })
+            _that.deleteSave("only")
           }
         }
       })
+    } else {
+      this.setData({
+        selectPopup: {
+          show: true,
+          list: delSheudleList,
+          type: "deleteState"
+        }
+      })
     }
-    // if (this.data.repeatable) {
-    //   this.setData({
-    //     'conSelectPopupData.selectType': 'delSheudle',
-    //     'conSelectPopupData.showSelectPopup': true
-    //   })
-    // }
   },
+  // 删除此次还是以后
+  selectDeleteStatus(event) {
+    this.handleSelectPopupCancel()
+    const modifyModel = event.currentTarget.dataset.item.id
+    this.deleteSave(modifyModel)
+
+  },
+  // 删除
+  deleteSave(modifyModel = "only") {
+    dd.showLoading({
+      content: '正在删除...',
+    });
+    let data = {
+      scheduleId: this.data.scheduleItem.id,
+      identify: this.data.organizer === getApp().globalData.userid ? 'major' : 'identify',
+      deleteModel: modifyModel,
+      templateId: this.data.scheduleItem.scheduleTemplateId,
+      planDate: this.data.scheduleItem.planDate
+    }
+    deleteSchedule(data).then(async () => {
+      if (this.$store.modifyErpeatMeeting) {
+        await this.$store.modifyErpeatMeeting()
+      }
+      this.$store.data.isIndexAffairListNeedUpdate = true;
+      this.update()
+      dd.hideLoading()
+      dd.navigateBack({
+        delta: 1
+      })
+    })
+
+  },
+
 
   //选择会前题醒打开popup
   handleAheadTime() {
@@ -813,6 +908,16 @@ create.Page({
       }
     })
   },
+  // 关闭centerPopup
+  handleCloseCenterPopup() {
+    this.setData({
+      centerPopup: {
+        show: false,
+        list: centerPopupList,
+        type: ''
+      }
+    })
+  },
 
 
 

pages/meetingDetail/utils.js

@@ -37,5 +37,5 @@ export function handleChangePeople(originUsers, nowUsers) {
         del: del
     }
 }
-// 重置地点
+// 保存成功以后 修改地点