Merge branch 'online' of http://git.dayaedu.com/molingzhide/dy-admin-manager into online

src/views/resetTeaming/modals/pay-items.vue

@@ -5,7 +5,13 @@
         align="center"
         prop="batchNo"
         width="200"
-        label="订单编号"
+        label="批次号"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="id"
+        width="120"
+        label="缴费单号"
       ></el-table-column>
       <el-table-column align="center" prop="paymentType" label="缴费类型">
         <template slot-scope="scope">

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

@@ -149,7 +149,6 @@ import classrooms from "./classrooms";
 import otherform from "./other";
 import baseInfoVue from '../../teamDetail/components/baseInfo.vue';
 import merge from 'webpack-merge'
-import MusicStore from '@/views/resetTeaming/store'
 
 const paymentTypeFormat = {
   0: "MUSIC_APPLY",
@@ -195,7 +194,7 @@ export default {
   },
   computed: {
     musicGroup() {
-      return MusicStore.state.musicGroup
+      return this.baseInfo?.musicGroup
     },
     isCommon () {
       return this.form.leixing === "1";
@@ -283,9 +282,6 @@ export default {
   },
   mounted () {
     this.formatCourse()
-    MusicStore.dispatch('getBaseInfo', {
-      data: { musicGroupId: this.musicGroupId }
-    })
     this.init();
   },
   activated () {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -70,23 +70,28 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="教学地点"
-          prop="address"
-          :rules="[{ required: true, message: '教学地点不能为空' }]"
-        >
-          <el-select
-            v-model.trim="topFrom.address"
-            filterable
-            clearable
-            :disabled="!topFrom.section || basdisabled"
-          >
-            <el-option
-              v-for="(item, index) in addList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="教学地点"
+                      prop="address"
+                      :rules="[{ required: true, message: '教学地点不能为空' }]">
+          <template #label>
+            <p style="position: relative; display: inline-block;"> 教学地点
+              <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    如果已生成课表，则会修改未上课时的教学点
+                  </div>
+                  <i class="el-icon-question"
+                     style="font-size: 18px; color: #F56C6C"></i>
+                </el-tooltip>
+            </p>
+          </template>
+          <el-select v-model.trim="topFrom.address"
+                     filterable
+                     clearable
+                     :disabled="!topFrom.section || basdisabled">
+            <el-option v-for="(item, index) in addList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
@@ -560,8 +565,6 @@ import {
   getSchool,
 } from "@/api/systemManage";
 import { classStatus } from "@/utils/searchArray";
-import { scrollTo } from "@/utils/scroll-to";
-import axios from "axios";
 import store from "@/store";
 import numeral from "numeral";
 import { formatData } from "@/utils/utils";

src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -75,7 +75,7 @@
               filterable>
               <el-option v-for="(item,index) in pricesArray"
                 :key="index"
-                :disabled="surplustime < item"
+                :disabled="(surplustime + (parseFloat(scope.row.time) || 0)) < item"
                 :label="item"
                 :value="item">
               </el-option>
@@ -214,5 +214,6 @@ export default {
   /deep/ .close-icon{
     cursor: pointer;
     font-size: 16px;
+    margin-bottom: 24px;
   }
 </style>

src/views/teamDetail/teamCourseList.vue

@@ -257,8 +257,7 @@
                            &&
                            !scope.row.isSettlement
                            &&permission('courseSchedule/cleanAttendance')"
-                           @click="clearAttend(scope.row)"
-                           size="small">清除考勤</el-button>
+                           @click="clearAttend(scope.row)">清除考勤</el-button>
               </div>
             </template>
           </el-table-column>