提交测试

src/views/businessManager/orderManager/payRecord.vue

@@ -479,6 +479,7 @@ export default {
     onReSet() {
       // this.orderDate = [];
       this.searchForm = {
+        organId:[],
         startTime: null,
         endTime: null,
         orderDate: [],

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -156,7 +156,7 @@
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.offlineClassesSalary"
                         placeholder="请输入内容">
-                <template slot="append"> 节/元</template>
+                <template slot="append"> 元/节</template>
                 <!-- <template slot="append" v-else>节/人</template>  v-if="scope.row.musicTheory" -->
               </el-input>
               </div>
@@ -632,8 +632,8 @@ export default {
       //   this.$message.error("请填写生效日期");
       //   return;
       // }
-      
-      
+
+
     }
   }
 };

src/views/vipClass/vipDetail/index.vue

@@ -1,99 +1,113 @@
 <template>
-  <div class='m-container'>
-
+  <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel"
-                      :content="className"></el-page-header>
+      <el-page-header @back="onCancel" :content="className"></el-page-header>
     </h2>
     <div class="m-core">
       <!-- navMenu -->
-      <tab-router v-model.trim="activeName"
-               type="card"
-               @tab-click="handleClick">
-        <el-tab-pane label="基本信息"
-        lazy
-                     v-if="permissionList.vipBase"
-                     name="1">
-          <vipBase  />
+      <tab-router
+        v-model.trim="activeName"
+        type="card"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane
+          label="基本信息"
+          lazy
+          v-if="permissionList.vipBase"
+          name="1"
+        >
+          <vipBase />
         </el-tab-pane>
-        <el-tab-pane label="教学记录"
-                     v-if="permissionList.teacherRecord"
-                     lazy
-                     name="2">
+        <el-tab-pane
+          label="教学记录"
+          v-if="permissionList.teacherRecord"
+          lazy
+          name="2"
+        >
           <teacherRecord v-if="activeName == 2" />
         </el-tab-pane>
-        <el-tab-pane label="VIP课程财务"
-                     v-if="permissionList.fnanceInfo"
-                     lazy
-                     name="3">
+        <el-tab-pane
+          label="VIP课程财务"
+          v-if="permissionList.fnanceInfo"
+          lazy
+          name="3"
+        >
           <fnanceInfo v-if="activeName == 3" />
         </el-tab-pane>
-        <el-tab-pane label="VIP学生列表"
-                     v-if="permissionList.vipStudentList"
-                     lazy
-                     name="4">
-          <vipStudentList v-if="activeName == 4"  :vipDetail='vipDetail'/>
+        <el-tab-pane
+          label="VIP学生列表"
+          v-if="permissionList.vipStudentList"
+          lazy
+          name="4"
+        >
+          <vipStudentList v-if="activeName == 4" :vipDetail="vipDetail" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="VIP调整"
+          v-if="permissionList.vipReset"
+          lazy
+          name="5"
+        >
+          <vipReset v-if="activeName == 5" :vipDetail="vipDetail" />
         </el-tab-pane>
       </tab-router>
     </div>
   </div>
 </template>
 <script>
-import vipBase from '@/views/vipClass/vipDetail/components/vipBaseInfo'
-import teacherRecord from '@/views/vipClass/vipDetail/components/teacherRecord'
-import fnanceInfo from '@/views/vipClass/vipDetail/components/fnanceInfo'
-import vipStudentList from '@/views/vipClass/vipDetail/components/vipStudentList'
-import { permission } from '@/utils/directivePage' // 权限
-import {
-  getVipGroupDetail,
-} from "@/api/vipSeting";
+import vipBase from "@/views/vipClass/vipDetail/components/vipBaseInfo";
+import teacherRecord from "@/views/vipClass/vipDetail/components/teacherRecord";
+import fnanceInfo from "@/views/vipClass/vipDetail/components/fnanceInfo";
+import vipStudentList from "@/views/vipClass/vipDetail/components/vipStudentList";
+import vipReset from "../vipReset.vue";
+import { permission } from "@/utils/directivePage"; // 权限
+import { getVipGroupDetail } from "@/api/vipSeting";
 export default {
-  components: { teacherRecord, vipBase, fnanceInfo, vipStudentList },
-  name: 'vipDetail',
-  data () {
+  components: { teacherRecord, vipBase, fnanceInfo, vipStudentList, vipReset },
+  name: "vipDetail",
+  data() {
     return {
-      activeName: '1',
-      className: '',
+      activeName: "1",
+      className: "",
       rules: null,
       searchForm: null,
-      vipDetail:null,
+      vipDetail: null,
       permissionList: {
-        vipBase: permission('/vipDetail/vipBase'),
-        teacherRecord: permission('/vipDetail/teacherRecord'),
-        fnanceInfo: permission('/vipDetail/fnanceInfo'),
-        vipStudentList: permission('/vipDetail/vipStudentList')
-      }
-    }
+        vipBase: permission("/vipDetail/vipBase"),
+        teacherRecord: permission("/vipDetail/teacherRecord"),
+        fnanceInfo: permission("/vipDetail/fnanceInfo"),
+        vipStudentList: permission("/vipDetail/vipStudentList"),
+        vipReset: permission("/vipReset"),
+      },
+    };
   },
-  mounted () {
-    this.__init()
+  mounted() {
+    this.__init();
   },
   methods: {
-    __init () {
-      let querys = this.$route.query
+    __init() {
+      let querys = this.$route.query;
       if (querys.rules) {
-        this.rules = querys.rules
+        this.rules = querys.rules;
       }
       if (querys.searchForm) {
-        this.searchForm = querys.searchForm
+        this.searchForm = querys.searchForm;
       }
-      this.className = querys.name
+      this.className = querys.name;
       // 获取vip基本信息
-        let id = this.$route.query.id;
+      let id = this.$route.query.id;
       // 根据id 获取vip详情
-
     },
 
-    handleClick (val, event) {
+    handleClick(val, event) {
       this.activeName = val.name;
-
     },
-    onCancel () {
-       this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/vipManager/vipList' })
-    }
-  }
-}
+    onCancel() {
+      this.$store.dispatch("delVisitedViews", this.$route);
+      this.$router.push({ path: "/vipManager/vipList" });
+    },
+  },
+};
 </script>
 <style lang="scss">
 </style>

src/views/vipClass/vipList.vue

@@ -88,7 +88,7 @@
               :label="item.realName"
             ></el-option>
           </el-select> -->
-               <remote-search
+          <remote-search
             :commit="'setTeachers'"
             v-model="searchForm.teacherId"
           />
@@ -203,7 +203,10 @@
             label="活动方案"
           >
             <template slot-scope="scope">
-               <overflow-text :text="scope.row.vipGroupActivityName" width="100%" />
+              <overflow-text
+                :text="scope.row.vipGroupActivityName"
+                width="100%"
+              />
             </template>
           </el-table-column>
           <el-table-column align="center" label="当前课次">
@@ -286,7 +289,7 @@
                   type="text"
                   v-if="permission('/vipDetail')"
                   @click="gotoVipDetail(scope.row)"
-                  >查看</el-button
+                  >详情</el-button
                 >
                 <!--
                 <el-button type="text">启动</el-button>-->
@@ -333,7 +336,7 @@
                   "
                   >删除</el-button
                 >
-                <el-button
+                <!-- <el-button
                   type="text"
                   v-if="
                     scope.row.status > 1 &&
@@ -342,10 +345,17 @@
                   "
                   @click="resetVip(scope.row)"
                   >修改</el-button
+                > -->
+                <el-button
+                  type="text"
+                  v-if="
+                    scope.row.vipGroupCategoryName == '乐理课' &&
+                    permission('vipGroupManage/update') &&
+                    scope.row.status == 1
+                  "
+                  @click="isStartCourse(scope.row)"
+                  >确认成课</el-button
                 >
-                <el-button type='text'  v-if="
-                    scope.row.vipGroupCategoryName =='乐理课' &&
-                    permission('vipGroupManage/update')&&scope.row.status==1" @click="isStartCourse(scope.row)">确认成课</el-button>
               </div>
             </template>
           </el-table-column>
@@ -415,13 +425,11 @@ export default {
       stopReason: null, // 停止原因
     };
   },
-  created() {
-
-  },
+  created() {},
   mounted() {
-       const { query } = this.$route;
-      if(query.search){
-      this.searchForm.search = query.search
+    const { query } = this.$route;
+    if (query.search) {
+      this.searchForm.search = query.search;
     }
     this.init();
   },
@@ -484,13 +492,24 @@ export default {
     },
     // 跳转到vip详情
     gotoVipDetail(row) {
+      let id = row.id;
+      let organId = row.organId;
+      let educationalTeacherId = row.educationalTeacherId;
+      let userId = row.userId; // 课程组上指导老师
       let rules = JSON.stringify(this.rules);
       let searchForm = JSON.stringify(this.searchForm);
-      let id = row.id;
       let name = row.name;
+      let endTimeStr = row.coursesExpireDate;
+      let startTimeStr = row.courseStartDate;
       this.$router.push({
         path: "/business/vipDetail",
-        query: { id, name },
+        query: {  id,
+          educationalTeacherId,
+          organId,
+          userId,
+          name,
+          endTimeStr,
+          startTimeStr,},
       });
     },
     closeVip(scope) {
@@ -556,7 +575,7 @@ export default {
                 } else {
                   let objectUrl = URL.createObjectURL(blob);
                   let link = document.createElement("a");
-                  let fname = "VIP列表" + new Date().getTime() + '.xls'; //下载文件的名字
+                  let fname = "VIP列表" + new Date().getTime() + ".xls"; //下载文件的名字
                   link.href = objectUrl;
                   link.setAttribute("download", fname);
                   document.body.appendChild(link);
@@ -610,8 +629,7 @@ export default {
                 } else {
                   let objectUrl = URL.createObjectURL(blob);
                   let link = document.createElement("a");
-                  let fname =
-                    "VIP课程续费提醒" + new Date().getTime() + ".xls"; //下载文件的名字
+                  let fname = "VIP课程续费提醒" + new Date().getTime() + ".xls"; //下载文件的名字
                   link.href = objectUrl;
                   link.setAttribute("download", fname);
                   document.body.appendChild(link);
@@ -671,25 +689,25 @@ export default {
     permission(str) {
       return permission(str);
     },
-    isStartCourse(row){
+    isStartCourse(row) {
       // row.id
-        this.$confirm("确定开启乐理课", "提示", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning"
-    })
-      .then(() => {
-            vipGroupManageUpdate({id:row.id,status:'PROGRESS'}).then(res=>{
-        if(res.code == 200){
-          this.$message.success('提交成功')
-          this.getList()
-        }
-      })
+      this.$confirm("确定开启乐理课", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-      .catch(() => { });
-
-
-    }
+        .then(() => {
+          vipGroupManageUpdate({ id: row.id, status: "PROGRESS" }).then(
+            (res) => {
+              if (res.code == 200) {
+                this.$message.success("提交成功");
+                this.getList();
+              }
+            }
+          );
+        })
+        .catch(() => {});
+    },
   },
   filters: {
     formatterTime(val) {

src/views/vipClass/vipReset.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="m-container">
+  <div >
     <div class="titlewrap">
-      <h2>
+      <!-- <h2> class="m-container"
         <el-page-header @back="goBack"
                         :content="name"></el-page-header>
-      </h2>
+      </h2> -->
       <!-- <p style="margin-bottom:10px; margin-left:30px;">课程有效期:{{ startClassTime|dayjsFormat }} ~ {{endTime |dayjsFormat}}</p> -->
     </div>
     <div class="vipwrap">
@@ -492,6 +492,7 @@ import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
 import dayjs from 'dayjs'
 let that;
 export default {
+  props:['vipDetail'],
   components: {
     pagination
   },
@@ -605,6 +606,7 @@ export default {
   },
   methods: {
     __init () {
+      console.log(this.vipDetail)
       this.vipid = this.$route.query.id;
       let query = this.$route.query
       let addrForm = this.addrForm