Merge branch '02/24resetMain' into dev

src/utils/searchArray.js

@@ -79,6 +79,7 @@ export const orderStatus = [
   { value: "LUCK", label: "福袋活动" },
   { value: "DEGREE_REGISTRATION", label: "考级报名" },
   { value: "DOUBLE_ELEVEN2020", label: "双十一活动" },
+  { value: "DEGREE", label: "儿童节活动" },
   { value: "PRACTICE_GROUP_BUY", label: "网管课" },
   { value: 'PRACTICE_GROUP_RENEW', label: '网管课续费' },
   { value: 'REPAIR', label: '乐器维修' },

src/utils/vueFilter.js

@@ -264,6 +264,7 @@ Vue.filter('orderType', value => {
     GOODS_SELL: '商品销售',
     SUBJECT_CHANGE: '声部更换',
     DOUBLE_ELEVEN2020: '双十一活动',
+    DEGREE: '儿童节活动',
     DEGREE_REGISTRATION: '考级报名',
     MAINTENANCE: '乐器保养',
     REPLACEMENT: '乐器置换'

src/views/childrensDay/detail.vue

@@ -142,6 +142,11 @@
           ></el-table-column>
           <el-table-column
             align="center"
+            prop="phone"
+            label="手机号"
+          ></el-table-column>
+          <el-table-column
+            align="center"
             prop="subjectName"
             label="学员声部"
           ></el-table-column>
@@ -155,14 +160,14 @@
           <el-table-column align="center" prop="studentId" label="报考器乐等级">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.gradeLeave + "级" }}
+                {{ scope.row.gradeLeave ? scope.row.gradeLeave + "级" : "-" }}
               </div>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="studentId" label="乐理报考等级">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.theoryLevel + "级" }}
+                {{ scope.row.theoryLevel ? scope.row.theoryLeve + "级" : "-" }}
               </div>
             </template>
           </el-table-column>
@@ -184,14 +189,10 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="studentId"
-            label="支付金额"
-          >
+          <el-table-column align="center" prop="studentId" label="支付金额">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.totalAmount |moneyFormat }}
+                {{ scope.row.totalAmount | moneyFormat }}
               </div>
             </template>
           </el-table-column>
@@ -271,17 +272,21 @@ export default {
           rows: this.rules.limit,
           ...this.searchForm,
           musicGroupId: this.$route.query.musicGroupId,
+          cooperationOrganId:this.$route.query.cooperationOrganId || null,
+          organId: this.$route.query.organId || null,
         });
         this.tableList = res.data.rows;
         this.rules.total = res.data.total;
-      } catch {}
+      } catch(e) {
+        console.log(e)
+      }
     },
     search() {
       this.rules.page = 1;
       this.getList();
     },
     onReSet() {
-            this.rules = {
+      this.rules = {
         ...this.rules,
         page: 1,
       };

src/views/childrensDay/index.vue

@@ -366,6 +366,8 @@ export default {
         query: {
           musicGroupId: row.musicGroupId,
           musicGroupName: row.musicGroupName,
+          cooperationOrganId:row.cooperationOrganId,
+          organId:row.organId
         },
       });
     },