Merge branch 'fine_music_score' into 11/24SAAS

src/views/newCourseList/orderList.vue

@@ -45,11 +45,11 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="courseType"
+            prop="orderType"
             label="订单类型"
           >
             <template slot-scope="scope">
-              课包销售
+             {{getOrderType(scope.row.orderType)}}
             </template>
           </el-table-column>
           <el-table-column
@@ -103,6 +103,13 @@ import { getOrderPage } from "@/api/businessManager";
 import { getInstrument } from "@/api/buildTeam";
 import {  getTimes } from "@/utils";
 import load from "@/utils/loading";
+
+const orderType = {
+  COURSE_SALE:'课包销售',
+  MUSICAL_SALE:'乐器销售',
+  REPAIR:'维修订单',
+  "":'--'
+}
 export default {
   components: { pagination },
   data() {
@@ -168,7 +175,9 @@ export default {
       console.log(e)
      }
     },
-
+    getOrderType(type){
+      return type?orderType[type]:'--'
+    }
   },
 };
 </script>