xcx

src/pages/system/cardAndCouponManager/vipManager/index.vue

@@ -53,6 +53,7 @@
         <div class="flex-item flex-h" style="margin-top: 20px;">
           <el-button size="mini" type="success" @click='addVIP'>新增VIP</el-button>
           <el-button size="mini" type="success" @click='activateVip'>激活VIP</el-button>
+          <el-button size="mini" type="warning" @click='exportExcel'>导出Excel</el-button>
         </div>
       </div>
     </div>
@@ -178,6 +179,9 @@ export default {
     activateVip () {
       this.$router.push({ name: 'activateVip' })
     },
+    exportExcel () {
+      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')
+    }
   }
 }
 </script>

src/pages/system/courseManager/scheduleManager/index.vue

@@ -83,7 +83,7 @@
                 <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
               </div>
             </div> -->
-            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
+            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm:ss')}}</span>
           </li>
           <li class="flex-h">
             <span>结束时间：</span>
@@ -98,7 +98,7 @@
                 <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
               </div>
             </div> -->
-            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
+            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm:ss')}}</span>
           </li>
         </ul>
       </div>

src/util/api.js

@@ -649,6 +649,10 @@ const $api = {
       method: 'post',
       url: `${baseUrl}${common}/card/:id/to/:users`
     },
+    vipcardExcel: {
+      method: 'get',
+      url: `${baseUrl}${common}/vipcard/excel`
+    },
   },
   couponManager: {
     couponList: {