Merge branch 'main_master' into 03/03Lebao

dist/static/css/chunk-f1806e10.1b3a5dc4.css → dist/static/css/chunk-ebf07848.d453ff1c.css

@@ -1 +1 @@
-.computeMoney[data-v-5bc0e5ca]{margin-top:10px;float:right}.m-core[data-v-5bc0e5ca]{margin-top:30px}.m-core .el-input[data-v-5bc0e5ca]{width:180px}.m-core h4[data-v-5bc0e5ca]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-5bc0e5ca]{margin-bottom:20px}.planList[data-v-5bc0e5ca]{padding:0 25px}.planList .planTop[data-v-5bc0e5ca]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-5bc0e5ca]{font-size:14px}.planList .planCore .row[data-v-5bc0e5ca]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-5bc0e5ca]{width:87px}.okBtn[data-v-5bc0e5ca]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}.submitP[data-v-5bc0e5ca]{margin-bottom:20px;font-size:14px;padding-left:24px}
+.computeMoney[data-v-ca996b66]{margin-top:10px;float:right}.m-core[data-v-ca996b66]{margin-top:30px}.m-core .el-input[data-v-ca996b66]{width:180px}.m-core h4[data-v-ca996b66]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-ca996b66]{margin-bottom:20px}.planList[data-v-ca996b66]{padding:0 25px}.planList .planTop[data-v-ca996b66]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-ca996b66]{font-size:14px}.planList .planCore .row[data-v-ca996b66]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-ca996b66]{width:87px}.okBtn[data-v-ca996b66]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}.submitP[data-v-ca996b66]{margin-bottom:20px;font-size:14px;padding-left:24px}

src/views/arrearage-students/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>欠费学员列表 <filter-search @reload="reloadSearch" :keys="['visitFlag']" :moreKeys="['organId']"/>
+      <div class="squrt"></div>欠费学员列表
+      <!-- <filter-search @reload="reloadSearch" :keys="['visitFlag']" :moreKeys="['organId']"/> -->
     </h2>
     <div class="m-core">
       <save-form
@@ -32,16 +33,6 @@
               :value="item.id"
             ></el-option>
           </select-all>
-          <!-- <el-select
-            v-model.trim="searchForm.organIds"
-            clearable
-            filterable
-            multiple
-            collapse-tags
-            placeholder="请选择所属分部"
-          > -->
-
-          <!-- </el-select> -->
         </el-form-item>
         <el-form-item>
           <el-select
@@ -79,6 +70,15 @@
             v-model="searchForm.eduTeacherId"
           />
         </el-form-item>
+               <el-form-item
+                      >
+          <el-select v-model.trim="searchForm.noPaymentType" placeholder="未缴费类型">
+            <el-option label="已结束"
+                       :value="0"></el-option>
+            <el-option label="进行中"
+                       :value="1"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
@@ -200,6 +200,7 @@ const initSearch = {
   branchs: null,
   musicGroupId: null,
   cooperationOrganId: null,
+  noPaymentType:null
 }
 export default {
   components: {
@@ -233,6 +234,10 @@ export default {
     if(query.result) {
       this.searchForm.eduTeacherId = Number(query.result)
     }
+    if(query.noPaymentType){
+
+        this.searchForm.noPaymentType = Number(query.noPaymentType)
+    }
     getCooperation({ rows: 1000 }).then((res) => {
       this.cooperations = res.data.rows
     })

src/views/buildVip/index.vue

@@ -1532,7 +1532,7 @@ export default {
           if (res.code == 200) {
             if (res.data == "ING") {
               this.$confirm(
-                "课程提交成功，已提交运营主管审批,审批通过后，课程后创建成功！",
+                "课程提交成功，已提交运营主管审批,审批通过后，课程创建成功！",
                 "提示",
                 {
                   confirmButtonText: "确定",

src/views/main/abnormal/title.vue

@@ -1,109 +1,111 @@
 <template>
-  <div class="title" :class="{error: type === 'error', warning: type === 'warning'}">
+ <div
+    class="title"
+    :class="{ error: type === 'error', warning: type === 'warning' }"
+  >
     <div>
       <span v-for="(item, index) in data" :key="index">
-        <span v-html=titleFilter(item)></span>
-              <el-tooltip
-            v-if="descs[item.errorType]"
-            :content="descs[item.errorType]"
-            :open-delay="0.3"
-            placement="top"
-          >
-          <!-- color: #f56c6c -->
-            <i
-               class="el-icon-warning-outline"
-                style="font-size: 14px; "
-            />
-          </el-tooltip>
-        <b v-if="!(ignore.includes(item.errorType))">{{item.num}}</b>
+        <span v-html="titleFilter(item)"></span>
+        <el-tooltip
+          v-if="descs[item.errorType]"
+          :content="descs[item.errorType]"
+          :open-delay="0.3"
+          placement="top"
+        >
+          <i class="el-icon-warning-outline" style="font-size: 14px" />
+        </el-tooltip>
+        <b v-if="!ignore.includes(item.errorType)">{{ item.num }}</b>
       </span>
-
     </div>
-    <slot/>
+    <slot />
   </div>
 </template>
 <script>
-import { descs } from '../constant'
+import { descs } from "../constant";
 export default {
   props: {
     type: {
       type: String,
-      default: 'warning'
+      default: "warning",
     },
     data: {
       type: Array,
-      default: []
-    }
-  },
-  data(){
-    return{
-     descs,
-     ignore: ['NO_CLASS_MUSIC_GROUP_STUDENT_INFO'] // // 忽略类型
-    }
+      default: [],
+    },
   },
-  mounted(){
+  data() {
+    return {
+      descs,
+      ignore: ["NO_CLASS_MUSIC_GROUP_STUDENT_INFO"], // // 忽略类型
+    };
   },
+  mounted() {},
   methods: {
     titleFilter(item) {
-      if(this.ignore.includes(item.errorType)) {
-        let tempName = item.name
-        tempName = tempName.replace('{0}', `<b>${item.num}</b>`)
-        tempName = tempName.replace('{1}', `<b>${item.num2}</b>`)
-        return tempName
+      if (this.ignore.includes(item.errorType)) {
+
+        let tempName = item.name;
+        tempName = tempName.replace("{0}",`<b>${item.num}</b>`);
+        tempName = tempName.replace("{1}",`<b>${item.num2}</b>`);
+        return tempName;
       } else {
-        return item.name
+        return item.name;
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style lang="less" scoped>
-.title{
+.title {
   height: 48px;
   line-height: 48px;
-  background-color: rgba(0, 0, 0, .02);
+  background-color: rgba(0, 0, 0, 0.02);
   overflow: hidden;
   display: flex;
   justify-content: space-between;
   padding-right: 10px;
   font-weight: bold;
-  transition: all .3s;
+  transition: all 0.3s;
   width: 100%;
+  box-sizing: content-box;
   /deep/b {
     font-size: 18px;
   }
-  &:hover{
-    background-color: rgba(0, 0, 0, .06);
+  &:hover {
+    background-color: rgba(0, 0, 0, 0.06);
   }
   &.error {
-    /deep/b{
-      color: #ED6F62;
+    /deep/b {
+      color: #ed6f62;
     }
-    &:before{
-      background-color: #ED6F62;
+    &:before {
+      position: absolute;
+      background-color: #ed6f62;
+
     }
   }
   &.warning {
-    /deep/b{
-      color: #F2A24A;
+    /deep/b {
+      color: #f2a24a;
     }
-    &:before{
-      background-color: #F2A24A;
-    }
-  }
-  &:before{
-      content: '';
-      display: block;
+    &:before {
       position: absolute;
-      width: 7px;
-      height: 48px;
-      left: 0;
+      background-color: #f2a24a;
     }
-  >div{
+  }
+  &:before {
+    content: "";
+    display: block;
+    position: absolute;
+    width: 7px;
+    height: 48px;
+    left: 0;
+  }
+  > div {
     position: relative;
     padding-left: 20px;
     font-size: 14px;
-    >span{
+    > span {
       margin-right: 10px;
       display: inline-block;
     }

src/views/main/baseinfo/index.vue

@@ -52,12 +52,12 @@
       <el-col :xs="24" :sm="24" :md="24" :lg="9" :xl="9">
         <hrdata :data="dataInfo" />
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+      <!-- <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
         <surplusCourse :data="dataInfo" />
       </el-col>
       <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
         <useCourse :data="dataInfo" />
-      </el-col>
+      </el-col> -->
       <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
         <management
           ref="management"

src/views/main/constant.js

@@ -96,13 +96,21 @@ export const errorType = {
     permission: '/notClassStudent',
     always: true,
   },
+  STUDENT_ARREARAGE:{
+    name: '未缴费学员数',
+    isError: true,
+    url: '/studentManager/ArrearageStudents',
+    permission: '/ArrearageStudents',
+    always: true,
+    query: {noPaymentType:'0'}
+  },
   STUDENT_NOT_PAYMENT: {
     name: '未缴费学员数',
     isError: true,
     url: '/studentManager/ArrearageStudents',
     permission: '/ArrearageStudents',
     always: true,
-    query: {}
+    query: {noPaymentType:'1'}
   },
   STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP: {
     name: '申请退团学员数',

src/views/main/reminders/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="container">
-    <save-form inline :model="search" @submit="FetchList" @reset="reset" saveKey="/main/main/reminders">
+    <save-form
+      inline
+      :model="search"
+      @submit="FetchList"
+      @reset="reset"
+      saveKey="/main/main/reminders"
+    >
       <el-form-item prop="organIds">
         <el-select
           clearable
@@ -8,99 +14,147 @@
           placeholder="请选择分部"
           v-model="search.organId"
         >
-          <el-option v-for="(item,index) in selects.branchs"
+          <el-option
+            v-for="(item, index) in selects.branchs"
             :key="index"
             :label="item.name"
-            :value="item.id"></el-option>
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-button native-type="submit" type="primary">搜索</el-button>
       <el-button native-type="reset" type="danger">重置</el-button>
     </save-form>
-    <empty desc="暂无需要处理异常" v-if="!list.length"/>
-    <el-button @click="handle(item)"
-      style="width: 100%;color: #303133;"
-      v-else
-      v-for="(item, index) in list"
-      :key="index"
-      :disabled="item.result ?  !item.result.length : !item.result" type="text"
-    >
-      <title-item
-        type="warning"
-        :data="[{name: item.desc, num: item.num,errorType:item.errorType}]"
+    <empty desc="暂无需要处理异常" v-if="!list.length" />
+    <div v-else class="buttonWrap">
+      <el-button
+        @click="handle(item)"
+        style="width: 100%; color: #303133"
+        v-for="(item, index) in list"
+        :key="index"
+        :disabled="item.num ? false : true"
+        type="text"
       >
-        <span style="color: #14928A;" v-if='!errorType[item.errorType] || (errorType[item.errorType] && permission(errorType[item.errorType].permission))'>立即处理<i class="el-icon-d-arrow-right"/></span>
-      </title-item>
-    </el-button>
+        <title-item
+          type="warning"
+          :data="[
+            { name: item.desc, num: item.num, errorType: item.errorType },
+          ]"
+        >
+          <span
+            style="color: #14928a"
+            v-if="
+              !errorType[item.errorType] ||
+              (errorType[item.errorType] &&
+                permission(errorType[item.errorType].permission))
+            "
+            >立即处理<i class="el-icon-d-arrow-right"
+          /></span>
+        </title-item>
+      </el-button>
+    </div>
   </div>
 </template>
 <script>
-import { Searchs } from '@/helpers'
-import { getRemindMatterData } from '@/views/main/api'
-import title from '../abnormal/title'
-import { errorType } from '@/views/main/constant'
-import { permission } from '@/utils/directivePage'
+import { Searchs } from "@/helpers";
+import { getRemindMatterData } from "@/views/main/api";
+import title from "../abnormal/title";
+import { errorType } from "@/views/main/constant";
+import { permission } from "@/utils/directivePage";
 const initSearch = {
-  organId: null
-}
+  organId: null,
+};
 export default {
   components: {
-    'title-item': title
+    "title-item": title,
   },
   data() {
     return {
       search: {
-        ...initSearch
+        ...initSearch,
       },
       list: [],
       errorType: errorType,
-    }
+      listByType: {},
+    };
   },
   mounted() {
-    this.FetchList()
-    this.$store.dispatch('setBranchs')
+    this.FetchList();
+    this.$store.dispatch("setBranchs");
   },
   methods: {
     permission,
     handle(item) {
       // 添加判断权限
-      if(errorType[item.errorType] && !this.permission(errorType[item.errorType]?.permission)) {
-        return
+      if (
+        errorType[item.errorType] &&
+        !this.permission(errorType[item.errorType]?.permission)
+      ) {
+        return;
       }
-      new Searchs().removeByKey('/teamList')
+      new Searchs().removeByKey(item.url);
       this.$router.push({
-        path: '/teamList',
+        path: item.url,
         query: {
+          ...item.query,
           filter_type: item.errorType,
-          searchType: 'WAIT_CREATE_PAYMENT_CALENDER',
           organId: this.search.organId || undefined,
-          form: 'reminders'
-        }
-      })
+          [item.resultKey]: item.resultKey
+            ? (item.result || []).join(",")
+            : undefined,
+        },
+      });
+
+      // this.$router.push({
+      //   path: "/teamList",
+      //   query: {
+      //     filter_type: item.errorType,
+      //     searchType: "WAIT_CREATE_PAYMENT_CALENDER",
+      //     organId: this.search.organId || undefined,
+      //     form: "reminders",
+      //   },
+      // });
     },
     async FetchList() {
       try {
         const res = await getRemindMatterData({
-          ...this.search
-        })
-        this.list = res.data
-      } catch (error) {}
+          ...this.search,
+        });
+        this.list = this.formatData(res.data||[])
+      } catch (error) {
+        console.log(error);
+      }
     },
     reset() {
-      this.search = {...initSearch}
-      this.FetchList()
+      this.search = { ...initSearch };
+      this.FetchList();
     },
-  }
-}
+    formatData(data) {
+    let list =  data.map(item=>{
+        return {
+          ...item,
+          ...errorType[item.errorType] || {}
+        }
+      })
+
+      return list
+    },
+  },
+};
 </script>
 <style lang="less" scoped>
-  .container{
-    /deep/ .is-disabled {
-      .title{
-        >span{
-          color: #C0C4CC!important;
-        }
+.container {
+  /deep/ .is-disabled {
+    .title {
+      > span {
+        color: #c0c4cc !important;
       }
     }
   }
+  .buttonWrap {
+    .el-button + .el-button {
+      margin-left: 0;
+    }
+  }
+}
 </style>

src/views/resetTeaming/modals/subject-preview.vue

@@ -27,8 +27,8 @@
 
             <el-row class="title-row" v-if="courseViewType == 0">
 				<el-col :span="12">课程类型</el-col>
-				<el-col :span="5" :offset="1" style="text-align: right;">原价</el-col>
-				<el-col :span="6" style="text-align: right;">现价</el-col>
+				<!-- <el-col :span="5" :offset="1" style="text-align: right;">原价</el-col> -->
+				<el-col :span="11" :offset="1" style="text-align: right;">现价</el-col>
 			</el-row>
 			<!-- 可选课程信息集合 -->
 			<template v-for="(item, index) in courseInfo">
@@ -36,10 +36,10 @@
 					<el-col :span="12">
 						<i class="check_default" :class="[item.isStatus ? 'check_active' : '', !item.isStudentOptional ? 'disabled' : '']"></i><template v-if="item.courseType == 'PROJECT'">{{ item.name }}</template><template v-else>{{ item.courseType | coursesType }}</template>
 					</el-col>
-					<el-col :span="6">
+					<!-- <el-col :span="6">
 						<del style="color: #AAA; font-size: 12px;">￥{{ item.courseOriginalPrice | moneyFormat }}</del>
-					</el-col>
-					<el-col :span="6">
+					</el-col> -->
+					<el-col :span="11" :offset="1">
 						<span style="color: #1A1A1A">￥{{ item.courseCurrentPrice | moneyFormat }}</span>
 					</el-col>
 				</el-row>
@@ -50,8 +50,8 @@
 			<h2 class="title">{{ '乐团课程' }}</h2>
 			<el-row class="title-row">
 				<el-col :span="12">课程类型</el-col>
-				<el-col :span="5" :offset="1" style="text-align: right;">原价</el-col>
-				<el-col :span="6" style="text-align: right;">现价</el-col>
+				<!-- <el-col :span="5" :offset="1" style="text-align: right;">原价</el-col> -->
+				<el-col :span="11" :offset="1" style="text-align: right;">现价</el-col>
 			</el-row>
 			<!-- 可选课程信息集合 -->
 			<template v-for="(item, index) in courseInfo">
@@ -59,10 +59,10 @@
 					<el-col :span="12">
 						<i class="check_default" :class="[item.isStatus ? 'check_active' : '', !item.isStudentOptional ? 'disabled' : '']"></i><template v-if="item.courseType == 'PROJECT'">{{ item.name }}</template><template v-else>{{ item.courseType | coursesType }}</template>
 					</el-col>
-					<el-col :span="6">
+					<!-- <el-col :span="6">
 						<del style="color: #AAA; font-size: .12rem;">￥{{ item.courseOriginalPrice | moneyFormat }}</del>
-					</el-col>
-					<el-col :span="6">
+					</el-col> -->
+					<el-col :span="11" :offset="1">
 						<span style="color: #1A1A1A">￥{{ item.courseCurrentPrice | moneyFormat }}</span>
 					</el-col>
 				</el-row>
@@ -111,18 +111,18 @@
 
             <div v-if="leBaoStatus">
 				<el-row class="title-row">
-					<el-col :span="12">服务项目</el-col>
-					<el-col :span="5" :offset="1" style="text-align: right;">原价</el-col>
-					<el-col :span="6" style="text-align: right;">现价</el-col>
+					<el-col :span="12" :offset="1">服务项目</el-col>
+					<!-- <el-col :span="5" :offset="1" style="text-align: right;">原价</el-col> -->
+					<el-col :span="11" style="text-align: right;">现价</el-col>
 				</el-row>
-				<el-row class="option-row" @click="onLeBao">
+				<el-row class="option-row" @click.native="onLeBao">
 					<el-col :span="12">
-						<i class="check_default" :class="[ buyMaintenance ? 'check_active' : '' ]"></i>乐器保养（一年）<el-icon style="padding-left: 0;" name="question" @click.native="onQuestions('instrument')" />
+						<i class="check_default" :class="[ buyMaintenance ? 'check_active' : '' ]"></i>乐器保养（一年）<el-icon style="padding-left: 0;" name="question" @click.stop.native="onQuestions('instrument')" />
 					</el-col>
-					<el-col :span="6">
+					<!-- <el-col :span="6">
 						<del style="color: #AAA; font-size: .12rem;">￥{{ 500 | moneyFormat }}</del>
-					</el-col>
-					<el-col :span="6">
+					</el-col> -->
+					<el-col :span="11" :offset="1">
 						<span style="color: #1A1A1A">￥{{ 300 | moneyFormat }}</span>
 					</el-col>
 				</el-row>
@@ -334,7 +334,7 @@ export default {
                         }
                     })
 
-                    console.log(this.isClickStatus)
+                    // console.log(this.isClickStatus)
 
                     this.musicGroupSubject = tempResult.musicGroupSubjectPlan
                     let instrumentInfo = {}
@@ -617,11 +617,11 @@ export default {
                             if (!item.isStudentOptional) {
                                 tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
                             } else {
-                                marketPrice += parseFloat(item.courseOriginalPrice)
+                                marketPrice += parseFloat(item.courseCurrentPrice)
                             }
 
                             if(this.courseViewType == 0 && !item.isStudentOptional) {
-                                marketPrice += parseFloat(item.courseOriginalPrice)
+                                marketPrice += parseFloat(item.courseCurrentPrice)
                             }
                         }
                     })
@@ -696,7 +696,8 @@ export default {
 
             if(this.leBaoStatus && this.buyMaintenance) {
                 // 判断是否使用乐保
-                marketPrice += 500
+                // marketPrice += 500
+                marketPrice += 300
                 amount += 300
                 buyList.push({
                     name: '乐器保养',
@@ -1069,7 +1070,7 @@ export default {
         display: flex;
         // align-items: center;
     }
-    .el-col-6, .el-col-8 {
+    .el-col-6, .el-col-8, .el-col-11{
         display: flex;
         justify-content: flex-end;
     }

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -60,7 +60,7 @@
                 scope.row.courseSchedule.status != 'NOT_START'
               "
             >
-              <p v-if="scope.row.status">
+              <p v-if="scope.row.status" :class="scope.row.status == 'NORMAL'?'green':'red'">
                 {{ scope.row.status | studentRecord }}
               </p>
               <p v-else>未签到</p>
@@ -200,4 +200,14 @@ export default {
     margin-bottom: 10px !important;
   }
 }
+.red {
+  color: red;
+}
+.green {
+  color: #14928a;
+}
+.orgin {
+  color: #E6A23C;
+}
 </style>
+