11

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -29,8 +29,6 @@ create.Page({
     organizer: ''
   },
   onLoad(event) {
-
-    console.log(this.selectedelRequired([1, 2, 4, 5], [1, 2, 4, 6]))
     let index = new Date().getDay()
     this.data.repeatWeek = this.data.repeatWeek[index - 1]
     this.store.data.remark = ''
@@ -171,16 +169,14 @@ create.Page({
         }
       })
     } else {
-      select = this.store.data.participatorUserId
-      require = this.data.requireUsers
-      console.log(require)
-      console.log(_that.selectedelRequired(require, select).pickedUsers)
+      select = [...this.store.data.participatorUserId]
+      require = [...this.data.requireUsers]
     }
+    select = _that.selectedelRequired(require, select).pickedUsers
     dd.complexChoose({
-      limitTips: "超出了",          //超过限定人数返回提示
       title: "选择参会人",            //标题
       multiple: true,            //是否多选
-      pickedUsers: _that.selectedelRequired(require, select).pickedUsers, //已选用户
+      pickedUsers: select, //已选用户
       requiredUsers: require,            //必选用户（不可取消选中状态）
       responseUserOnly: true,        //返回人，或者返回人和部门
       success: function (res) {
@@ -191,7 +187,6 @@ create.Page({
             _that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.headUrl })
             _that.store.data.participatorUserId.push(item.userId)
           })
-
           _that.store.data.participatorList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar })
           _that.store.data.participatorUserId.push(getApp().globalData.userid)
         } else {
@@ -202,7 +197,7 @@ create.Page({
             _that.store.data.participatorUserId.push(item.userId)
           })
           _that.data.requireUsersInfo.forEach((item, index) => {
-            _that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.headUrl })
+            _that.store.data.participatorList.push({ userId: item.userId, username: item.username, headUrl: item.headUrl })
             _that.store.data.participatorUserId.push(item.userId)
           })
         }
@@ -264,9 +259,6 @@ create.Page({
         this.store.data.recurrenceModel.terminateTime = this.getTwoYearToday();
         this.update()
       }
-      console.log(1111111)
-      console.log(JSON.stringify(this.data.addUserList))
-      console.log(1111111)
       let data = {
         shcheduleType: 'common',
         deleteUserList: this.data.deleteUserList,
@@ -431,11 +423,15 @@ create.Page({
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           success: (success) => {
+            console.log(JSON.stringify(success))
             deleteSchedule(data).then(res => {
               dd.navigateBack({
                 delta: 2
               })
             })
+          },
+          error: (err) => {
+             console.log(JSON.stringify(err))
           }
         })
 
@@ -537,18 +533,18 @@ create.Page({
 
   },
   // 已选用户去中去掉必选用户
-  selectedelRequired(requiredUsers, pickedUsers) {
-    for (let i = 0; i < requiredUsers.length; i++) {
-      for (let m = 0; m < pickedUsers.length; m++) {
-        if (requiredUsers[i] == pickedUsers[m]) {
-          pickedUsers.splice(m, 1)
+  selectedelRequired(req, pic) {
+    for (let i = 0; i < req.length; i++) {
+      for (let m = 0; m < pic.length; m++) {
+        if (req[i] == pic[m]) {
+          pic.splice(m, 1)
           m--;
         }
       }
     }
     return {
-      requiredUsers: requiredUsers,
-      pickedUsers: pickedUsers
+      requiredUsers: req,
+      pickedUsers: pic
     }
   }
 });