wangfei пре 6 година
родитељ
комит
1f187de442
2 измењених фајлова са 24 додато и 12 уклоњено
  1. 14
    5
      src/pages/system/courseManager/scheduleManager/index.vue
  2. 10
    7
      src/store/course/schedule.js

+ 14
- 5
src/pages/system/courseManager/scheduleManager/index.vue Прегледај датотеку

@@ -125,6 +125,7 @@ export default {
125 125
       courseid: '',
126 126
       currentCourseItem: {},
127 127
       centerDialogVisible: false,
128
+      loaded: false,
128 129
     }
129 130
   },
130 131
   computed: {
@@ -141,11 +142,13 @@ export default {
141 142
       },
142 143
       set (val) {
143 144
         this.caseid = val
144
-        this.getList()
145
+        if (this.loaded) {
146
+          this.getList()
147
+        }
145 148
       }
146 149
     },
147 150
     fcEvents () {
148
-      return this.details.map(x => {
151
+      return this.loaded ? this.details.map(x => {
149 152
         return {
150 153
           title: x.DetailName,
151 154
           start: x.BeginDate,
@@ -153,7 +156,7 @@ export default {
153 156
           id: x.DetailId,
154 157
           detail: x,
155 158
         }
156
-      })
159
+      }) : []
157 160
     },
158 161
     CurrentMonth: {
159 162
       get () {
@@ -184,10 +187,14 @@ export default {
184 187
     },
185 188
     changeMonth (start, end, current) {
186 189
       this.CurrentMonth = this.toolClass.dateFormat(current, 'yyyy-MM')
187
-      this.getList()
190
+      if (this.loaded) {
191
+        this.getList()
192
+      }
188 193
     },
189 194
     search () { // 搜索
190
-      this.getList()
195
+      if (this.loaded) {
196
+        this.getList()
197
+      }
191 198
     },
192 199
     getList () {
193 200
       if (this.CaseId !== '' || this.courseid !== '') {
@@ -195,6 +202,8 @@ export default {
195 202
           caseid: this.CaseId,
196 203
           date: this.CurrentMonth,
197 204
           courseid: this.courseid,
205
+        }).then(res => {
206
+          this.loaded = true
198 207
         })
199 208
       } else {
200 209
         this.SetListNull()

+ 10
- 7
src/store/course/schedule.js Прегледај датотеку

@@ -21,13 +21,16 @@ export default {
21 21
   },
22 22
   actions: {
23 23
     GetDetailList ({ commit }, payload) {
24
-      ajax(api.course.detail.url, {
25
-        method: api.course.detail.method,
26
-        queryData: {
27
-          ...payload,
28
-        }
29
-      }).then(res => {
30
-        commit('updateList', res)
24
+      return new Promise((resolve, reject) => {
25
+        ajax(api.course.detail.url, {
26
+          method: api.course.detail.method,
27
+          queryData: {
28
+            ...payload,
29
+          }
30
+        }).then(res => {
31
+          commit('updateList', res)
32
+          resolve(res)
33
+        }).catch(reject)
31 34
       })
32 35
     },
33 36
     GetScheduleList ({ commit }, payload) {