许成详 6 years ago
parent
commit
4c964ab4b0

+ 4
- 0
src/pages/system/cardAndCouponManager/vipManager/index.vue View File

53
         <div class="flex-item flex-h" style="margin-top: 20px;">
53
         <div class="flex-item flex-h" style="margin-top: 20px;">
54
           <el-button size="mini" type="success" @click='addVIP'>新增VIP</el-button>
54
           <el-button size="mini" type="success" @click='addVIP'>新增VIP</el-button>
55
           <el-button size="mini" type="success" @click='activateVip'>激活VIP</el-button>
55
           <el-button size="mini" type="success" @click='activateVip'>激活VIP</el-button>
56
+          <el-button size="mini" type="warning" @click='exportExcel'>导出Excel</el-button>
56
         </div>
57
         </div>
57
       </div>
58
       </div>
58
     </div>
59
     </div>
178
     activateVip () {
179
     activateVip () {
179
       this.$router.push({ name: 'activateVip' })
180
       this.$router.push({ name: 'activateVip' })
180
     },
181
     },
182
+    exportExcel () {
183
+      window.open(`${this.toolClass.ReplaceOrg(this.$api.cardManager.vipcardExcel.url)}?token=${localStorage.getItem('JWT')}&cardNo=${this.$data.postData.cardNo}&sellerName=${this.$data.postData.sellerName}&userName=${this.$data.postData.userName}&caseid=${this.CaseId === 'all' ? '' : this.CaseId}`, '_blank')
184
+    }
181
   }
185
   }
182
 }
186
 }
183
 </script>
187
 </script>

+ 2
- 2
src/pages/system/courseManager/scheduleManager/index.vue View File

83
                 <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
83
                 <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
84
               </div>
84
               </div>
85
             </div> -->
85
             </div> -->
86
-            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
86
+            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm:ss')}}</span>
87
           </li>
87
           </li>
88
           <li class="flex-h">
88
           <li class="flex-h">
89
             <span>结束时间:</span>
89
             <span>结束时间:</span>
98
                 <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
98
                 <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
99
               </div>
99
               </div>
100
             </div> -->
100
             </div> -->
101
-            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
101
+            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm:ss')}}</span>
102
           </li>
102
           </li>
103
         </ul>
103
         </ul>
104
       </div>
104
       </div>

+ 4
- 0
src/util/api.js View File

649
       method: 'post',
649
       method: 'post',
650
       url: `${baseUrl}${common}/card/:id/to/:users`
650
       url: `${baseUrl}${common}/card/:id/to/:users`
651
     },
651
     },
652
+    vipcardExcel: {
653
+      method: 'get',
654
+      url: `${baseUrl}${common}/vipcard/excel`
655
+    },
652
   },
656
   },
653
   couponManager: {
657
   couponManager: {
654
     couponList: {
658
     couponList: {