update: update

src/main.js

@@ -18,6 +18,9 @@ Vue.use(VueAxios, axios);
 
 Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
 Vue.config.productionTip = false;
+if (process.env.NODE_ENV === 'development') {
+  Vue.config.devtools = true;
+}
 /* eslint-disable no-new */
 /* eslint-disable no-new */
 window.getLimit(router, 'integral-mall').then(() => {

src/views/activities/flashSale/list.vue

@@ -54,6 +54,22 @@
           </div>
           <div class="fr">
             <el-button
+              size="small"
+              v-if="$getButtonLimit($buttonCode.flashSaleExport)"
+              :limit-code="$buttonCode.flashSaleExport"
+              @click="exportExcel"
+            >
+              导出订单
+            </el-button>
+            <!-- <el-button
+              @click="exportExcel"
+              v-if="$getButtonLimit($buttonCode.flashSaleExport)"
+              :limit-code="$buttonCode.flashSaleExport"
+              type="primary"
+            >
+              <i class="iconfont icon-icon_yunxiazai" style="margin-right:5px" />导出订单
+            </el-button> -->
+            <el-button
               type="primary"
               @click="addActivity"
               :limit-code="$buttonCode.flashSaleAdd"
@@ -77,11 +93,16 @@
                 <span :class="[row.activityStatus === 0 ? 'dm-status--warning' : row.activityStatus === 1 ? 'dm-status--primary--flash' : 'dm-status--info']" />{{ row.activityStatus === 0 ? '未开始' : row.activityStatus === 1 ? '进行中' : '已结束' }}
               </template>
             </el-table-column>
-            <el-table-column label="商品数量">
+            <el-table-column label="商品种类">
               <template slot-scope="{ row }">
                 {{ row.activityProList ? row.activityProList.length : '--' }}
               </template>
             </el-table-column>
+            <el-table-column label="上架/售卖/剩余库存">
+              <template slot-scope="{ row }">
+                {{ row.activityTotalStock || 0 }}/{{ row|stock }}/{{ row.activityStock || 0 }}
+              </template>
+            </el-table-column>
             <el-table-column label="适用会员" :render-header="renderHeader">
               <template slot-scope="{ row }">
                 {{ row.memberSearchType === 1 ? '所有会员' : row.memberSearchType === 2 ? row.memberSearchParams.split(',').length + '个会员分组' : '部分会员' }}
@@ -143,6 +164,14 @@
         </div>
       </div>
     </div>
+    <vue-gic-export-excel
+      :dataArr="tableData"
+      :dialogVisible.sync="dialogVisible"
+      :type="2"
+      :excelUrl="excelUrl"
+      :params="query"
+      :projectName="projectName"
+    />
   </div>
 </template>
 
@@ -151,6 +180,13 @@ import qs from 'qs';
 import request from '../../../service/request.js';
 import getInputVal from '../../../utils/common.js';
 export default {
+  filters: {
+    stock: ({ activityTotalStock, activityStock }) => {
+      activityTotalStock = activityTotalStock || 0;
+      activityStock = activityStock || 0;
+      return parseFloat((activityTotalStock - activityStock).toFixed(2));
+    },
+  },
   data () {
     return {
       query: {
@@ -166,6 +202,9 @@ export default {
       getTimeAll: getInputVal.formatDate,
       loading: false,
       tableData: [],
+      dialogVisible: false,
+      projectName: 'integral-mall',
+      excelUrl: '/api-integral-mall/download-integral-activity-excel ', // 下载数据的地址
     };
   },
   computed: {
@@ -252,6 +291,11 @@ export default {
     edit (item) {
       this.$router.push({ name: 'flashSaleInfo', query: { activityId: item.activityId, edit: true, canEdit: '' } });
     },
+    // 导出发货单
+    exportExcel () {
+      this.dialogVisible = true;
+      // window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
+    },
   },
 };
 </script>

src/views/order/couponExchange.vue

@@ -88,6 +88,14 @@
                 <i class="iconfont icon-icon_yunxiazai" style="margin-right:5px" />导出订单
               </el-button>
               <el-button
+                @click="exportExcel"
+                v-if="integralMallProId && $getButtonLimit($buttonCode.couponExchangeExport)"
+                type="primary"
+                :limit-code="$buttonCode.couponExchangeExport"
+              >
+                <i class="iconfont icon-icon_yunxiazai" style="margin-right:5px" />导出订单
+              </el-button>
+              <el-button
                 @click="exportExcelAll"
                 v-if="!integralMallProId && $getButtonLimit($buttonCode.couponExchangeExport)"
                 type="primary"