2 次代码提交

作者 SHA1 备注 提交日期
  Lene 768655ec05 Merge branch 'master' of http://provision-sa.co.za:3000/Provision/UnivateProperties 4 年前
  Lene 5280488034 Timeshare Admin Page 4 年前

+ 11
- 5
src/components/admin/status/editTimeShareAdminPage.vue 查看文件

@@ -72,8 +72,7 @@
72 72
                   <select
73 73
                     id="weekInfoRegionSelect"
74 74
                     class="form-control uniSelect"
75
-                    v-model="sellItem.region"
76
-                    @change="regionChange()"
75
+                    v-model="week.region"
77 76
                     style="font-size: 15px"
78 77
                   >
79 78
                     <option v-for="(region, r) in regions" :key="r" :value="region">{{
@@ -504,12 +503,12 @@
504 503
               </div>
505 504
             </div>
506 505
             <div class="text-center col-12" v-if="CanSave">
507
-              <button class="btn-solid-blue" v-if="!sellItem.id" @click="submitSale()">
506
+              <button class="btn-solid-blue">
508 507
                 Save
509 508
               </button>
510 509
             </div>
511 510
             <div class="text-center col-12">
512
-              <button class="btn-solid-blue" @click="paygateRedirect()">Back</button>
511
+              <button class="btn-solid-blue" v-on:click="backToListView()">Back</button>
513 512
             </div>
514 513
             <br />
515 514
             <br />
@@ -544,7 +543,8 @@ export default {
544 543
     return {
545 544
       wait: false,
546 545
       userLoggedIn: Log.isLoggedIn(),
547
-      listedWeekId: this.$route.params.id
546
+      listedWeekId: this.$route.params.id,
547
+      selectedItems: [],
548 548
     };
549 549
   },
550 550
   components: {
@@ -558,6 +558,7 @@ export default {
558 558
     this.initTimeshare(0);
559 559
     this.getIndividual(Log.getUser().id);
560 560
     this.getBanks();
561
+    this.getWeek(this.$route.params.id)
561 562
   },
562 563
   created() {
563 564
     this.initTimeshare(this.weekId);
@@ -579,6 +580,7 @@ export default {
579 580
     ]),
580 581
     ...mapState("individual", ["indiv"]),
581 582
     ...mapState("authentication", ["isLoggedIn"]),
583
+    ...mapState("myWeeks", ["items", "week"]),
582 584
     ...mapGetters({
583 585
       user: "authentication/getUser",
584 586
       person: "authentication/getPerson"
@@ -630,6 +632,7 @@ export default {
630 632
     ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
631 633
     ...mapActions("payment", ["addPayment"]),
632 634
     ...mapActions("bank", ["getBanks"]),
635
+    ...mapActions("myWeeks", ["getItems", "getWeek"]),
633 636
     newSale() {
634 637
       this.weekId = 0;
635 638
       this.getBlankWeek();
@@ -712,6 +715,9 @@ export default {
712 715
       } else {
713 716
         this.sellItem.mandateDate = undefined;
714 717
       }
718
+    },
719
+    backToListView() {
720
+      this.$router.push("/status/timeshareAdmin");
715 721
     }
716 722
   }
717 723
 };

+ 1
- 1
src/components/shared/navBar.vue 查看文件

@@ -199,7 +199,7 @@
199 199
                         <router-link to="/property/list">List My Property</router-link>
200 200
                       </li>
201 201
 
202
-                      <li>
202
+                      <li v-if="ROLE === 'Super Admin'">
203 203
                         <router-link to="/status/timeshareAdmin">Timeshare Week Admin</router-link>
204 204
                       </li>
205 205
                       <li v-if="ROLE === 'Super Admin'">

+ 0
- 1
src/components/timeshare/myWeeksPage.vue 查看文件

@@ -32,7 +32,6 @@
32 32
       <div class="offset-1 col-md-10">
33 33
         <ListView
34 34
           :items="items"
35
-          :editable="true"
36 35
           @onNew="onNew"
37 36
           @onRowClick="onRowClick"
38 37
           @onClearSelected="onClearSelected"

+ 12
- 0
src/store/modules/timeshare/myWeeks.js 查看文件

@@ -11,6 +11,9 @@ export default {
11 11
     setItems(state, list) {
12 12
       state.items = list;
13 13
     },
14
+    setItem(state, item) {
15
+      state.week = item;
16
+    }
14 17
   },
15 18
   getters: {
16 19
     getNeedsVerify(state) {
@@ -47,5 +50,14 @@ export default {
47 50
     //   .then(result => commit('removeListing', id))
48 51
     //   .catch(console.error);
49 52
     // }
53
+    getWeek({ commit }, id) {
54
+      axios
55
+      .get(`/api/timeshareweek/${id}`)
56
+      .then(r => {
57
+        console.log(JSON.stringify(r));
58
+        commit('setItem', r.data);
59
+      })
60
+      .catch(console.error);
61
+    },
50 62
   },
51 63
 };

正在加载...
取消
保存