合并

src/utils/searchArray.js

@@ -87,6 +87,7 @@ export const orderStatus = [
   { value: 'GOODS_SELL', label: '商品销售' },
   { value: 'SUBJECT_CHANGE', label: '声部更换' },
   { value: 'MAINTENANCE', label: '乐器保养' },
+  { value: 'ADD_STUDENT', label: '进行中乐团加学员' },
   { value: 'REPLACEMENT', label: '乐器置换' },
   { value: "OTHER", label: "其他" },
 

src/utils/vueFilter.js

@@ -276,6 +276,7 @@ Vue.filter('orderType', value => {
     DEGREE_REGISTRATION: '考级报名',
     MAINTENANCE: '乐器保养',
     REPLACEMENT: '乐器置换',
+    ADD_STUDENT: '进行中乐团加学员',
     OTHER: "其他",
   }
   return template[value]

src/views/studentManager/studentList.vue

@@ -260,7 +260,10 @@
             label="会员截止日期"
           >
           <template slot-scope="scope">
-            <div v-if="scope.row.membershipEndTime" :class="checkDate(scope.row.membershipEndTime)?'':'red'">
+            <div v-if="scope.row.membershipEndTime && memberRankSettingId == 0" class="red">
+              会员未生效
+            </div>
+            <div v-else-if="scope.row.membershipEndTime && memberRankSettingId != 0" :class="checkDate(scope.row.membershipEndTime)?'':'red'">
               {{scope.row.membershipEndTime|dayjsFormat}}
             </div>
             <div v-else class="red">