Merge branch '03/03GRADE' into 11/24SAAS

src/views/businessManager/orderManager/income.vue

@@ -16,7 +16,7 @@
       <div class="btnList">
         <ExportChiose
           v-permission="{ child: 'export/orderList', parent: '/income' }"
-          style="margin-bottom: 20px;margin-right:20px;"
+          style="margin-bottom: 20px;margin-right:10px;"
           name="订单汇总导出"
           ExportEnum="ORDER_LIST_SUM"
           :exportData="onOrderExport"
@@ -26,7 +26,7 @@
         />
         <ExportChiose
           v-permission="{ child: 'export/orderList', parent: '/income' }"
-          style="margin-bottom: 20px"
+          style="margin-bottom: 20px;margin-right:10px;"
           name="报表导出"
           ExportEnum="ORDER_LIST1"
           :exportData="onOrderExport"
@@ -34,6 +34,8 @@
           errorMsg="请选择月份"
           :isDownList="true"
         />
+
+
       </div>
 
       <!-- 搜索类型 -->
@@ -642,7 +644,8 @@ export default {
         data.orderEndDate = null;
       }
       return data;
-    }
+    },
+
   }
 };
 </script>

src/views/smallStudentManager/components/tableList.vue

@@ -386,7 +386,7 @@
         </el-table-column>
         <el-table-column align="center" prop="subCourseNum" label="剩余课时">
           <template slot-scope="scope">
-            {{ scope.row.subCourseNum }}节
+            {{ scope.row.subTotalCourse }}节
           </template>
         </el-table-column>
         <el-table-column align="center" prop="preCourseFee" label="预收金额">
@@ -528,6 +528,7 @@ export default {
       this.visitVisiable = true;
     },
     smallStudentExport() {
+
       const { timer, ...rest } = this.searchForm;
       let str = "";
       if (this.groupType === "PRACTICE") {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -1316,7 +1316,7 @@ export default {
         ownershipType: "OWN", // 合作机构类型
         feeType: null,
         homeworkPushFlag: 1,
-        isGiveAccessories: 0,
+        isGiveAccessories: false,
         memberCourseShowFlag: 0,
         extracurricularTeacher: "NORMAL",
         musicGroupPlanMakingId: '',
@@ -1564,9 +1564,8 @@ export default {
       this.topFrom.transactionTeacherId =
         res.data.musicGroup.transactionTeacherId || "";
       this.topFrom.homeworkPushFlag = res.data.musicGroup.homeworkPushFlag;
-      this.topFrom.isGiveAccessories = res.data.musicGroup.isGiveAccessories
-        ? 1
-        : 0;
+      this.topFrom.isGiveAccessories = res.data.musicGroup.isGiveAccessories+''
+      console.log(this.topFrom.isGiveAccessories,'isGiveAccessories')
       this.topFrom.memberCourseShowFlag = res.data.musicGroup
         .memberCourseShowFlag
         ? 1