提交一下

1

src/views/main/constant.js

@@ -183,15 +183,15 @@ export const errorType = {
       visitFlag: '0',
     },
   },
-  WAIT_CREATE_PAYMENT_CALENDER: {
-    name: '待创建缴费项目',
-    isError: true,
-    url: '/teamList',
-    permission: '/teamList',
-    query: {
-      searchType: 'WAIT_CREATE_PAYMENT_CALENDER'
-    }
-  },
+  // WAIT_CREATE_PAYMENT_CALENDER: {
+  //   name: '待创建缴费项目',
+  //   isError: true,
+  //   url: '/teamList',
+  //   permission: '/teamList',
+  //   query: {
+  //     searchType: 'WAIT_CREATE_PAYMENT_CALENDER'
+  //   }
+  // },
   COURSE_TRUANT_STUDENT_NUM: {
     name: '学员考勤异常旷课',
     isError: true,
@@ -306,7 +306,26 @@ export const errorType = {
       unDone: 1,
       reminded: 0
     },
-  }
+  },
+  MUSIC_GROUP_HAS_COURSE_TIMES:{
+    name: '乐团剩余时长未排课',
+    isError: true,
+    url: '/teamList',
+    permission: '/teamList',
+    query: {
+      searchType: 'MUSIC_GROUP_HAS_COURSE_TIMES'
+    }
+  },
+  // HAS_FREE_COURSE_TIMES: {
+  //   name: '基础技能班学员数量异常',
+  //   isError: true,
+  //   url: '/teamCLassList',
+  //   permission: '/teamCLassList',
+  //   always: true,
+  //   query: {
+  //     HAS_FREE_COURSE_TIMES: '1',
+  //   },
+  // },
 }
 
 export const matterTypes = {

src/views/resetTeaming/components/payInfoDetail.vue

@@ -768,16 +768,46 @@ export default {
             obj.calenderId = this.$route.query.calenderId;
             try {
               const res = await musicGroupresetCalender(obj);
-              this.$message.success("修改缴费成功");
-              this.goback();
+              if (res.code == 200) {
+                this.$message.success("修改缴费成功");
+                this.goback();
+              }
+                  if (res.code == 207) {
+                await this.$confirm(
+                  res.msg || `当前乐团存在未排课的缴费项目，请再次确认操作`,
+                  "提示",
+                  {
+                    type: "warning",
+                  }
+                );
+                obj.confirmCreate = true;
+                await musicGroupresetCalender(obj);
+                this.$message.success("修改缴费成功");
+                this.goback();
+              }
             } catch (e) {
               console.log(e);
             }
           } else {
             try {
               const res = await musicGroupcreateCalender(obj);
-              this.$message.success("创建缴费成功");
-              this.goback();
+              if (res.code == 200) {
+                this.$message.success("创建缴费成功");
+                this.goback();
+              }
+              if (res.code == 207) {
+                await this.$confirm(
+                  res.msg || `当前乐团存在未排课的缴费项目，请再次确认操作`,
+                  "提示",
+                  {
+                    type: "warning",
+                  }
+                );
+                obj.confirmCreate = true;
+                await musicGroupcreateCalender(obj);
+                this.$message.success("创建缴费成功");
+                this.goback();
+              }
             } catch (e) {
               console.log(e);
             }

src/views/resetTeaming/components/resetPayList.vue

@@ -216,7 +216,7 @@
                   !isNewGropu &&
                   teamStatus &&
                   scope.row.paymentType != 'MUSIC_APPLY' &&
-                  scope.row.status == 'OPEN'
+                  (scope.row.status == 'OPEN'||scope.row.status == 'OVER')
                 "
                 @click="onCreateQRCode(scope.row)"
                 >续费二维码</el-button

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

@@ -464,6 +464,23 @@ export default {
                 this.$listeners.close();
                 return;
               }
+                 if (result.code == 208) {
+                await this.$confirm(
+                  result.msg || `班级剩余排课时长不一致,请再次确认`,
+                  "提示",
+                  {
+                    type: "warning",
+                  }
+                );
+                // obj.allowZeroSalary = true;
+                list.forEach((item) => {
+                  item.checkCourseTimesFlag   = true;
+                });
+                await classGroupUpdate(list);
+                this.$listeners.submited();
+                this.$listeners.close();
+                return;
+              }
               if (result.code == 206) {
                 this.previewVisible = true;
                 this.previewList = result.data;

src/views/teamDetail/teamList.vue

@@ -3,12 +3,12 @@
     <h2>
       <div class="squrt"></div>
       乐团管理
-      <!-- <filter-search
+      <filter-search
         @reload="reloadSearch"
         :moreKeys="['organId']"
         :keys="['searchType']"
           v-if="permission('/teamList/abnormal')"
-      />  -->
+      />
     </h2>
     <div class="m-core">
       <div class="btnList" style="margin-bottom: 20px">

vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.251:8000' // 何国威
 // let target = 'http://192.168.3.250:8000' //邹璇
 // let target = 'http://192.168.3.119:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**