瀏覽代碼

提交一下 课程团进行中加学员调整

1
mo 3 年之前
父節點
當前提交
4289f32dc8

+ 87 - 11
src/layout/components/AppMain.vue

@@ -17,20 +17,26 @@
       </div>
     </transition>
     <serviceRemind />
-    <div style="z-index:5000">
+    <div style="z-index: 5000">
       <el-dialog
         :visible.sync="guideVisible"
-        title="您需要完成以下设置"
-        width="800px"
+        width="680px"
         :modal="false"
         v-if="guideList.length > 0"
         append-to-body
+        class="dialogGuide"
       >
+        <template #title>
+          <div class="dialogHead"></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>
               <el-button
+                class="guideSet"
                 type="text"
                 @click="gotoSet(guide)"
                 v-if="permission(guide.permission)"
@@ -38,8 +44,14 @@
               >
               <span v-else>您暂无此设置权限,请联系机构管理员</span>
             </p>
-            <p>{{ guide.desc }}</p>
+            <p class="guideDesc">{{ guide.desc }}</p>
           </div>
+          <el-button
+            type="primary"
+            style="width: 100%"
+            @click="guideVisible = false"
+            >暂不设置</el-button
+          >
         </div>
       </el-dialog>
     </div>
@@ -53,9 +65,10 @@
     <el-drawer
       title="操作手册"
       :visible.sync="outOptionvisible"
-      size="400px"
+      size="410px"
       :append-to-body="true"
     >
+      <el-divider class="outOptionLine"></el-divider>
       <div class="drawerWrap">
         <el-form :model="form" :inline="true">
           <el-form-item>
@@ -71,7 +84,7 @@
             <el-button @click="getMUal()" type="danger">搜索</el-button>
           </el-form-item>
           <br />
-          <div class="topline"></div>
+          <!-- <div class="topline"></div> -->
           <div
             v-for="(item, index) in optionList"
             :key="index"
@@ -79,7 +92,8 @@
             @click="openDetail(item)"
           >
             <el-row>
-              {{ item.name }}
+              <el-col :span="23">{{ item.name }}</el-col>
+              <el-col :span="1"><i class="el-icon-arrow-right"></i></el-col>
             </el-row>
           </div>
         </el-form>
@@ -90,7 +104,7 @@
       :append-to-body="true"
       v-if="activeRow"
       :visible.sync="innerDrawer"
-      size="400px"
+      size="410px"
       custom-class="innerDrawer"
     >
       <p class="submitTitle">更新时间: {{ activeRow.updateTime }}</p>
@@ -250,10 +264,15 @@ export default {
 .previewImg {
 }
 /deep/.el-drawer__header {
+  font-size: 20px;
   margin-bottom: 0px;
-  color: #000;
+  line-height: 24px;
+  color: rgba(0, 0, 0, 0.9);
   font-weight: bold;
 }
+.outOptionLine {
+  margin: 20px 0 0 0;
+}
 .innerDrawer {
   .submitTitle {
     margin: 10px 0;
@@ -261,6 +280,7 @@ export default {
     padding: 0 20px;
     color: #999;
   }
+
   .optionWrap {
     box-sizing: border-box;
     width: 100%;
@@ -292,11 +312,28 @@ export default {
   z-index: 3999;
 }
 /deep/.line {
-  border-bottom: 1px solid #dcdfe6;
   height: 40px;
   line-height: 40px;
-  color: var(--color-primary);
+  color:rgba(#212121,.9) ;
+  padding: 0 17px;
+  background-color:#F9F9F9;
   cursor: pointer;
+  margin-bottom: 10px;
+  position: relative;
+  border-radius: 2px;
+  &:hover {
+    color: var(--color-primary);
+    &::after {
+      content: "";
+      width: 100%;
+      height: 100%;
+      background-color: var(--color-primary);
+      opacity: 0.1;
+      position: absolute;
+      left: 0;
+      top: 0;
+    }
+  }
 }
 .drawerWrap {
   padding: 20px;
@@ -305,6 +342,15 @@ export default {
   }
 }
 .guideWrap {
+  .guideH2 {
+    font-size: 20px;
+    font-weight: 600;
+    color: #212121;
+    line-height: 28px;
+  }
+  .guideLine {
+    margin: 18px 0 24px;
+  }
   .guideItem {
     margin-bottom: 30px;
     .guideTitle {
@@ -312,8 +358,38 @@ export default {
       text-align: left;
       font-weight: bold;
       display: inline-block;
+      font-size: 16px;
+      font-weight: 600;
+      color: #212121;
+      line-height: 22px;
+      margin-bottom: 10px;
+    }
+    .guideDesc {
+      color: #666666;
+      line-height: 20px;
+      font-size: 14px;
+    }
+    .guideSet {
+      font-size: 16px;
+    }
+  }
+}
+.dialogGuide {
+  border-radius: 6px;
+  /deep/.el-dialog__header {
+    background-color: #fff;
+    padding-top: 15px;
+    .el-dialog__headerbtn {
+      .el-icon {
+        color: #999;
+        font-size: 20px;
+        font-weight: bold;
+      }
     }
   }
+  .dialogHead {
+    background-color: #fff;
+  }
 }
 
 /*设置字体的大小*/

+ 1 - 0
src/views/resetTeaming/components/payInfoDetail.vue

@@ -882,6 +882,7 @@ export default {
       if (!val) {
         this.$set(this.form, "eclass", [{}]);
         this.$set(this.form, "leixing", "1");
+        this.$set(this.form, "musicGroupOrganizationCourseSettingId", null);
       }
     },
     member(val) {

+ 7 - 3
src/views/resetTeaming/components/resetPayList.vue

@@ -187,7 +187,9 @@
                 v-if="
                   teamStatus &&
                   scope.row.paymentType != 'ADD_STUDENT' &&
-                  scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
+                  scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST' &&
+                  (scope.row.auditStatus == 'DRAFT' ||
+                    scope.row.auditStatus == 'REJECT')
                 "
               >
                 <el-button type="text" @click="removeBatchNo(scope.row)"
@@ -213,7 +215,9 @@
                 v-if="
                   !isNewGropu &&
                   teamStatus &&
-                  scope.row.paymentType != 'MUSIC_APPLY'
+                  scope.row.paymentType != 'MUSIC_APPLY' &&
+                  (scope.row.auditStatus == 'DRAFT' ||
+                    scope.row.auditStatus == 'REJECT')
                 "
                 @click="onCreateQRCode(scope.row)"
                 >续费二维码</el-button
@@ -497,7 +501,7 @@
           v-for="(subject, index) in dialogSubjectList"
           :key="index"
           :name="subject.subjectId.toString()"
-          style="max-height: 500px;overflow-y: auto;"
+          style="max-height: 500px; overflow-y: auto"
         >
           <subject-preview
             :subjectId="subject.subjectId"

+ 8 - 0
src/views/resetTeaming/components/strudentPayInfo.vue

@@ -42,6 +42,14 @@
           >
             {{ "已结束" }}
           </p>
+              <p
+            class="status"
+            style="color: #5ccdb8"
+            v-if="info.paymentStatus == 'REJECT'"
+          >
+            {{ "已拒绝" }}
+          </p>
+
         </span>
       </statistic-item>
       <statistic-item>

+ 10 - 7
src/views/resetTeaming/modals/user-pay-form.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show='isShow'>
     <el-alert
       title="课程信息设置"
       :closable="false"
@@ -11,10 +11,11 @@
     >
     </el-alert>
     <!-- && courseViewType != 2 -->
+
     <userBaseinfo
       :form.sync="form"
       :isCommon="isCommon"
-      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'"
+      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'&&paymentTypeString !== 'ADD_STUDENT'"
       :isUserType="isUserType"
       @getCharges="getCharges"
       @changeActive="changeActive"
@@ -342,6 +343,7 @@ export default {
       },
       money: "",
       isSetCourseSettingsId: false,
+      isShow:false
     };
   },
   computed: {
@@ -522,27 +524,27 @@ export default {
             this.$set(
               this.memberForm,
               "memberRankSettingId",
-              this.viewDetail.member.memberRankSettingId || null
+              this.viewDetail.member?.memberRankSettingId || null
             );
             this.$set(
               this.memberForm,
               "num",
-              this.viewDetail.member.num || null
+              this.viewDetail.member?.num || null
             );
             this.$set(
               this.memberForm,
               "period",
-              this.viewDetail.member.period || null
+              this.viewDetail.member?.period || null
             );
             this.$set(
               this.memberForm,
               "memberPaymentAmount",
-              this.viewDetail.member.actualAmount || null
+              this.viewDetail.member?.actualAmount || null
             );
             this.$set(
               this.memberForm,
               "originalMemberPaymentAmount",
-              this.viewDetail.member.originalAmount || null
+              this.viewDetail.member?.originalAmount || null
             );
 
             this.$set(this.memberForm, "memberValidDate", [
@@ -628,6 +630,7 @@ export default {
             this.syncAllMoney();
           } catch (error) {}
         }
+        this.isShow=true;
       }
     },
     formatCourse() {