Merge branch '02/23reviewBUG' into 11/24SAAS

src/constant/index.js

@@ -293,7 +293,8 @@ export const downListType = {
   4: '网管课学员课程',
   5: 'VIP课学员课程',
   6: 'VIP学员课程管理',
-  7: '学员小课数据统计'
+  7: '学员小课数据统计',
+  8: '订单汇总'
 }
 
 export const withdrawalStatus = {

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -912,8 +912,12 @@ export default {
             form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
           if (this.insertOrderType == 1) {
             form.calenderId = null;
+            form.type='PERSONAL'
           } else if (this.insertOrderType == 2) {
             form.userId = null;
+                form.type='SCHOOL'
+          }else{
+                form.type='OTHER'
           }
           routeOrderAdd(form).then((res) => {
             if (res.code == 200) {

src/views/businessManager/orderManager/financeManager.vue

@@ -911,10 +911,14 @@ export default {
           }
           form.goodsJson =
             form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
-          if (this.insertOrderType == 1) {
+                 if (this.insertOrderType == 1) {
             form.calenderId = null;
+            form.type='PERSONAL'
           } else if (this.insertOrderType == 2) {
             form.userId = null;
+                form.type='SCHOOL'
+          }else{
+                form.type='OTHER'
           }
           routeOrderAdd(form).then((res) => {
             if (res.code == 200) {

src/views/businessManager/orderManager/income.vue

@@ -13,16 +13,29 @@
       >
         报表导出
       </el-button> -->
+      <div class="btnList">
+              <ExportChiose
+        v-permission="{ child: 'export/orderList', parent: '/income' }"
+        style="margin-bottom: 20px;margin-right:20px;"
+        name="订单汇总导出"
+        ExportEnum="ORDER_LIST_SUM"
+        :exportData="onOrderExport"
+        fileName="订单汇总"
+        errorMsg="请选择月份"
+        :isDownList="true"
+      />
       <ExportChiose
         v-permission="{ child: 'export/orderList', parent: '/income' }"
         style="margin-bottom: 20px"
-        name='报表导出'
+        name="报表导出"
         ExportEnum="ORDER_LIST1"
         :exportData="onOrderExport"
-        fileName="问卷调查"
+        fileName="订单报表导出"
         errorMsg="请选择月份"
         :isDownList="true"
       />
+      </div>
+
       <!-- 搜索类型 -->
       <save-form
         :inline="true"
@@ -621,7 +634,7 @@ export default {
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
       };
-            if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
+      if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         data.orderStartDate = this.searchForm.orderDate[0];
         data.orderEndDate = this.searchForm.orderDate[1];
       } else {
@@ -633,5 +646,10 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
+.btnList {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
 </style>