Merge branch '0601Action' into 07/06musicArchives

src/constant/index.js

@@ -295,8 +295,9 @@ export const downListType = {
   9: "乐团课表详情",
   10: "乐团数据导出",
   11: "活动资格导出",
-  12: "乐团学生指标导出",
-  13: "训练统计导出"
+  12: "训练统计导出",
+  13: "商城订单列表",
+  14: "商城财务管理",
 };
 
 export const withdrawalStatus = {

src/views/businessManager/orderManager/financeManager.vue

@@ -62,6 +62,18 @@
           !(this.searchForm.orderDate && this.searchForm.orderDate.length > 0)
         "
       />
+
+      <ExportChiose
+          v-permission="{ child: 'export/MALL_ROUTE_ORDER_LIST', parent: '/financeManager' }"
+          style="margin-bottom: 20px;display: inline-block "
+          name="商城财务导出"
+          ExportEnum="MALL_ROUTE_ORDER_LIST"
+          :exportData="onOrderExport"
+          fileName="商城财务导出"
+          errorMsg="请选择月份"
+          :isDownList="true"
+        />
+
       <el-button
         @click="onDownload"
         v-permission="'import/downloadTemplate?financeManager'"

src/views/businessManager/orderManager/income.vue

@@ -35,7 +35,16 @@
           :isDownList="true"
         />
 
-
+        <ExportChiose
+          v-permission="{ child: 'export/MALL_ORDER_LIST', parent: '/income' }"
+          style="margin-bottom: 20px"
+          name="商城订单导出"
+          ExportEnum="MALL_ORDER_LIST"
+          :exportData="onOrderExport"
+          fileName="商城订单导出"
+          errorMsg="请选择月份"
+          :isDownList="true"
+        />
       </div>
 
       <!-- 搜索类型 -->