修复和班和课程团进行中加学员加会员

1

src/layout/components/AppMain.vue

@@ -27,11 +27,12 @@
         class="dialogGuide"
       >
         <template #title>
-          <div class="dialogHead"></div>
+          <div class="dialogHead">
+            <h2 class="guideH2">您需要完成以下设置</h2>
+            <el-divider class="guideLine"></el-divider>
+          </div>
         </template>
         <div class="guideWrap">
-          <h2 class="guideH2">您需要完成以下设置</h2>
-          <el-divider class="guideLine"></el-divider>
           <div class="guideItem" v-for="guide in guideList" :key="guide.name">
             <p>
               <span class="guideTitle">{{ guide.name }}</span>
@@ -314,9 +315,9 @@ export default {
 /deep/.line {
   height: 40px;
   line-height: 40px;
-  color:rgba(#212121,.9) ;
+  color: rgba(#212121, 0.9);
   padding: 0 17px;
-  background-color:#F9F9F9;
+  background-color: #f9f9f9;
   cursor: pointer;
   margin-bottom: 10px;
   position: relative;
@@ -341,6 +342,9 @@ export default {
     border-top: 1px solid #dcdfe6;
   }
 }
+.guideLine {
+  margin: 18px 0 0px;
+}
 .guideWrap {
   .guideH2 {
     font-size: 20px;
@@ -348,9 +352,7 @@ export default {
     color: #212121;
     line-height: 28px;
   }
-  .guideLine {
-    margin: 18px 0 24px;
-  }
+
   .guideItem {
     margin-bottom: 30px;
     .guideTitle {
@@ -380,6 +382,7 @@ export default {
     background-color: #fff;
     padding-top: 15px;
     .el-dialog__headerbtn {
+      top:28px;
       .el-icon {
         color: #999;
         font-size: 20px;
@@ -389,6 +392,7 @@ export default {
   }
   .dialogHead {
     background-color: #fff;
+    padding-top: 10px;
   }
 }
 

src/views/reportForm/index.vue

@@ -5,6 +5,19 @@
       报表中心
     </h2>
     <div class="m-core">
+      <el-collapse v-model="activeName" accordion class="formCollapse">
+        <template slot="title">
+          一致性 Consistency<i class="header-icon el-icon-info"></i>
+        </template>
+        <el-collapse-item title="一致性 Consistency" name="1">
+          <div>
+            与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；
+          </div>
+          <div>
+            在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。
+          </div>
+        </el-collapse-item>
+      </el-collapse>
       <div class="m-wrap">
         <div class="title">课酬导出：</div>
         <el-date-picker
@@ -494,22 +507,28 @@
       <el-divider></el-divider>
       <div class="m-core">
         <div class="m-wrap">
-        <div class="title">异常处理数据导出：</div>
-        <el-select
-          clearable
-          filterable
-          v-model="Abnormal.organId"
-          placeholder="请选择分部"
-        >
-          <el-option
-            v-for="(item, index) in selects.branchs"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
+          <div class="title">异常处理数据导出：</div>
+          <el-select
+            clearable
+            filterable
+            v-model="Abnormal.organId"
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
 
-        <el-button type="primary"  style="margin-left: 10px"  v-permission="'export/exportIndexErrData'" @click="exportAbnormal">导出</el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            v-permission="'export/exportIndexErrData'"
+            @click="exportAbnormal"
+            >导出</el-button
+          >
         </div>
       </div>
     </div>
@@ -554,6 +573,7 @@ export default {
       Abnormal: {
         organId: null,
       },
+      activeName:[]
     };
   },
   mounted() {
@@ -1169,7 +1189,7 @@ export default {
 <style lang="scss" scoped>
 .m-container {
   .m-core {
-    margin-top: 20px;
+    // margin-top: 20px;
     .m-wrap {
       display: flex;
       flex-direction: row;
@@ -1197,6 +1217,13 @@ export default {
       }
     }
   }
+  .formCollapse {
+    border:none;
+    /deep/.el-collapse-item__header{
+      border-bottom: none;
+      background-color: #F8F8F8;
+    }
+  }
 }
 /deep/.el-input__icon.el-icon-date {
   height: 40px !important;

src/views/resetTeaming/components/resetPayList.vue

@@ -172,7 +172,7 @@
                 auths="musicGroupPaymentCalender/revoke"
                 v-if="
                   (team_status == 'FEE_AUDIT' || team_status == 'PROGRESS') &&
-                  scope.row.auditStatus === 'AUDITING' &&
+                  scope.row.status === 'AUDITING' &&
                   scope.row.paymentType != 'ADD_STUDENT' &&
                   scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
                 "
@@ -188,8 +188,8 @@
                   teamStatus &&
                   scope.row.paymentType != 'ADD_STUDENT' &&
                   scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST' &&
-                  (scope.row.auditStatus == 'DRAFT' ||
-                    scope.row.auditStatus == 'REJECT')
+                  (scope.row.status == 'DRAFT' ||
+                    scope.row.status == 'REJECT')
                 "
               >
                 <el-button type="text" @click="removeBatchNo(scope.row)"
@@ -201,8 +201,8 @@
                 v-if="
                   teamStatus &&
                   scope.row.paymentType == 'ADD_STUDENT' &&
-                  (scope.row.auditStatus == 'DRAFT' ||
-                    scope.row.auditStatus == 'REJECT')
+                  (scope.row.status == 'DRAFT' ||
+                    scope.row.status == 'REJECT')
                 "
               >
                 <el-button type="text" @click="removeBatchNo(scope.row)"
@@ -216,8 +216,7 @@
                   !isNewGropu &&
                   teamStatus &&
                   scope.row.paymentType != 'MUSIC_APPLY' &&
-                  (scope.row.auditStatus == 'DRAFT' ||
-                    scope.row.auditStatus == 'REJECT')
+                  scope.row.status == 'OPEN'
                 "
                 @click="onCreateQRCode(scope.row)"
                 >续费二维码</el-button

src/views/resetTeaming/modals/user-pay-form.vue

@@ -103,7 +103,6 @@
         style="margin-top: 20px"
         type="info"
         v-if="
-          courseViewType == 2 &&
           paymentType &&
           paymentType != 2 &&
           form.leixing != 2
@@ -113,7 +112,6 @@
       <memberSetting
         ref="memberSetting"
         v-if="
-          courseViewType == 2 &&
           paymentType &&
           paymentType != 2 &&
           form.leixing != 2
@@ -582,7 +580,7 @@ export default {
                 if (this.paymentTypeString === "SPAN_GROUP_CLASS_ADJUST") {
                   return {
                     ...item,
-                    courseOriginalPrice: item.masterSubCoursePrice,
+                    // courseOriginalPrice: item.masterSubCoursePrice,
                   };
                 }
                 return item;

src/views/studentManager/studentList.vue

@@ -465,7 +465,7 @@
                 是否是新用户
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    没有有效的VIP课程或未参与2020年双十一活动的用户为新用户
+                    未购买VIP课程的学员为新用户
                   </div>
 
                   <i
@@ -722,12 +722,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="是否是新用户" prop="isNewUser">
-          <!-- <template #label>
+          <template #label>
             <p style="position: relative; display: inline-block">
               是否是新用户
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">
-                  没有有效的VIP课程或未参与2020年双十一活动的用户为新用户
+                   未购买VIP课程的学员为新用户
                 </div>
                 <i
                   class="el-icon-question"
@@ -735,7 +735,7 @@
                 ></i>
               </el-tooltip>
             </p>
-          </template> -->
+          </template>
           <el-select
             class="multiple"
             v-model.trim="studentForm.isNewUser"

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -101,11 +101,9 @@
       class="alert"
       style="margin-top: 20px"
       type="info"
-      v-if="courseViewType == 2"
     >
     </el-alert>
     <memberSetting
-      v-if="courseViewType == 2"
       :addStudent="true"
       :form="memberForm"
       :isUserType="isUserType"