更新

src/constant/index.js

@@ -320,7 +320,7 @@ export const downListType = {
   30: "平衡关系-乐团课",
   31: "平衡关系-VIP已排课",
   32: "平衡关系-VIP未排课",
-  33: "平衡关系-乐团课剩余时长",
+  33: "平衡关系-缴费项目课时明细",
   34: "平衡关系-学员情况总表",
   35: "平衡关系(分表)-乐团在读学员",
   36: "平衡关系(分表)-乐团退团学员"

src/views/indexErrDataRecord/components/errorCourse.vue

@@ -94,7 +94,7 @@
             start-placeholder="上课开始日期"
             end-placeholder="上课结束日期"
             :picker-options="{
-              firstDayOfWeek: 1,
+              firstDayOfWeek: 1
             }"
           ></el-date-picker>
         </el-form-item>
@@ -133,7 +133,11 @@
             label="乐团/课程组编号"
           >
             <template slot-scope="scope">
-              <el-button type="text" style="width: 100%;" @click="gotoCourse(scope.row)">
+              <el-button
+                type="text"
+                style="width: 100%;"
+                @click="gotoCourse(scope.row)"
+              >
                 <copy-text>{{ scope.row.musicGroupId }}</copy-text>
               </el-button>
             </template>
@@ -404,7 +408,7 @@
             start-placeholder="创建开始日期"
             end-placeholder="创建结束日期"
             :picker-options="{
-              firstDayOfWeek: 1,
+              firstDayOfWeek: 1
             }"
           ></el-date-picker>
         </el-form-item>
@@ -422,7 +426,7 @@ import pagination from "@/components/Pagination/index";
 import {
   superFindCourseSchedules,
   cleanAttendance,
-  cancelCourseMerge,
+  cancelCourseMerge
 } from "@/api/buildTeam";
 import { bathDelete } from "@/api/vipSeting";
 import { workType, mergeCourseType } from "@/constant";
@@ -431,6 +435,7 @@ import { getTeacherPersonalAttendanceDetail } from "@/api/teacherManager";
 import { courseType, courseListType } from "@/utils/searchArray";
 import { permission } from "@/utils/directivePage";
 import { getHistoryErrCourse, getAllEducationUsers } from "../api";
+import dayjs from "dayjs";
 let nowTime = new Date();
 nowTime =
   nowTime.getFullYear() +
@@ -439,12 +444,23 @@ nowTime =
   "-" +
   nowTime.getDate();
 
+/** 获取当前月 */
+const getCurrentMonth = () => {
+  return [
+    dayjs()
+      .startOf("month")
+      .format("YYYY-MM-DD"),
+    dayjs()
+      .endOf("month")
+      .format("YYYY-MM-DD")
+  ];
+};
 const initSearch = {
   teachMode: null, // 教学模式
   organIdList: null,
   courseStatus: null,
   courseType: null,
-  timer: [], // 时间
+  timer: getCurrentMonth(), // 时间
   class: null,
   teachType: null,
   mergeCourseType: null,
@@ -455,7 +471,7 @@ const initSearch = {
   creatTimer: [],
   courseIdSearch: null,
   hasDealTime: null,
-  educationUserId: null,
+  educationUserId: null
 };
 export default {
   props: ["searchType"],
@@ -477,7 +493,7 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       teacherList: [],
       schoolList: [],
@@ -490,11 +506,11 @@ export default {
       isMainGo: false,
       isDetele: false,
       showMove: false,
-      educationList: [],
+      educationList: []
     };
   },
   components: {
-    pagination,
+    pagination
   },
   created() {
     // this.searchForm.timer = [nowTime, nowTime];
@@ -518,7 +534,7 @@ export default {
         this.searchForm.isCallNames ||
         this.searchForm.creatTimer?.length > 0
       );
-    },
+    }
   },
   async mounted() {
     const { query } = this.$route;
@@ -587,6 +603,7 @@ export default {
 
     reset() {
       this.searchForm = { ...initSearch };
+      this.searchForm.timer = getCurrentMonth();
       this.search();
     },
     search() {
@@ -598,7 +615,7 @@ export default {
       this.searchForm = {
         ...initSearch,
         timer: [],
-        courseIdSearch: row.newCourseId,
+        courseIdSearch: row.newCourseId
       };
       this.search();
     },
@@ -635,7 +652,7 @@ export default {
         rows: this.rules.limit,
         searchType: this.searchType,
         ...getTimes(creatTimer, ["createStartDate", "createEndDate"]),
-        ...getTimes(timer, ["startTime", "endTime"]),
+        ...getTimes(timer, ["startTime", "endTime"])
       };
     },
     async getList() {
@@ -675,7 +692,7 @@ export default {
     lookDetail(row) {
       this.$router.push({
         name: "teamCourseList",
-        params: { courseIdSearch: row.id },
+        params: { courseIdSearch: row.id }
       });
       // this.maskForm = row;
       // 发请求 获取详情 row.id
@@ -706,17 +723,17 @@ export default {
       if (row.groupType == "MUSIC") {
         this.$router.push({
           path: "/teamList",
-          query: { search: row.musicGroupId },
+          query: { search: row.musicGroupId }
         });
       } else if (row.groupType == "VIP") {
         this.$router.push({
           path: "/vipManager/vipList",
-          query: { search: row.musicGroupId },
+          query: { search: row.musicGroupId }
         });
       } else if (row.groupType == "PRACTICE") {
         this.$router.push({
           path: "/accompanyManager/accompany",
-          query: { search: row.musicGroupId },
+          query: { search: row.musicGroupId }
         });
       }
     },
@@ -727,7 +744,7 @@ export default {
     okMore() {
       this.getList();
       this.showMove = false;
-    },
+    }
   },
   filters: {
     isCall(val) {
@@ -736,15 +753,15 @@ export default {
       } else if (val == 1) {
         return "已点名";
       }
-    },
+    }
   },
   watch: {
     classVisible(val) {
       if (!val) {
         this.activeName = null;
       }
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/indexErrDataRecord/components/historyError.vue

@@ -273,6 +273,19 @@ import dayjs from "dayjs";
 import { getTimes } from "@/utils";
 import { Export } from "@/utils/downLoadFile";
 import qs from "qs";
+
+/** 获取当前月 */
+const getCurrentMonth = () => {
+  return [
+    dayjs()
+      .startOf("month")
+      .format("YYYY-MM-DD"),
+    dayjs()
+      .endOf("month")
+      .format("YYYY-MM-DD")
+  ];
+};
+console.log(getCurrentMonth(), "getCurrentMonth()");
 export default {
   props: ["searchType"],
   components: { pagination, "count-to": countTo },
@@ -280,7 +293,7 @@ export default {
     return {
       searchForm: {
         organIds: "",
-        timer: [],
+        timer: getCurrentMonth(),
         educationUserId: ""
       },
       tableList: [],
@@ -322,6 +335,7 @@ export default {
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
+      this.searchForm.timer = getCurrentMonth();
       this.search();
     },
     search() {

src/views/indexErrDataRecord/components/patrol.vue

@@ -1,4 +1,4 @@
- <!--  -->
+<!--  -->
 <template>
   <div>
     <!-- <h2> class="m-container"
@@ -158,12 +158,19 @@
           </el-table-column>
           <el-table-column align="center" label="巡查项目是否异常">
             <template slot-scope="scope">
-              {{ scope.row.conclusionStatus ?'否':'是'}}
+              {{ scope.row.conclusionStatus ? "否" : "是" }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="subject" label="巡查时间" width="103px">
+          <el-table-column
+            align="center"
+            prop="subject"
+            label="巡查时间"
+            width="103px"
+          >
             <template slot-scope="scope">
-              {{ dayjs(scope.row.planStart).format("YYYY-MM-DD HH:mm") }}~{{ dayjs(scope.row.planEnd).format("HH:mm") }}
+              {{ dayjs(scope.row.planStart).format("YYYY-MM-DD HH:mm") }}~{{
+                dayjs(scope.row.planEnd).format("HH:mm")
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -276,7 +283,7 @@
           label="处理方式"
           prop="memo"
           :rules="[
-            { required: true, message: '请输入处理方式', trigger: 'blur' },
+            { required: true, message: '请输入处理方式', trigger: 'blur' }
           ]"
         >
           <el-input type="textarea" v-model.trim="handleForm.memo"></el-input>
@@ -303,6 +310,18 @@ import { getTimes } from "@/utils";
 import { Export } from "@/utils/downLoadFile";
 import gpsLoction from "@/views/teamDetail/componentCourse/gpsLocation";
 import { getErrInspectionData } from "../api";
+
+/** 获取当前月 */
+const getCurrentMonth = () => {
+  return [
+    dayjs()
+      .startOf("month")
+      .format("YYYY-MM-DD"),
+    dayjs()
+      .endOf("month")
+      .format("YYYY-MM-DD")
+  ];
+};
 export default {
   props: ["searchType"],
   components: { pagination, LookDetail, gpsLoction },
@@ -319,8 +338,8 @@ export default {
         // musicGroupId: null,
         conclusionStatus: null,
         cooperationOrganId: null,
-        createTimer: [],
-        hasDealTime:null
+        createTimer: getCurrentMonth(),
+        hasDealTime: null
       },
       tableList: [],
       pageInfo: {
@@ -328,15 +347,15 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       handleStatus: false,
       handleForm: {
         id: null,
-        memo: null,
+        memo: null
       },
       tableStatus: false,
-      gpsVisible: false,
+      gpsVisible: false
     };
   },
   async mounted() {
@@ -355,7 +374,6 @@ export default {
     await this.$store.dispatch("setBranchs");
     await this.$store.dispatch("setOrganRole");
 
-
     // 乐团列表 {只查询进行中的乐团}
     // await getTeamList({ musicGroupStatus: 'PROGRESS', rows: 9999 }).then(res => {
     //     if(res.code == 200) {
@@ -378,7 +396,7 @@ export default {
           page: this.pageInfo.page,
           rows: this.pageInfo.limit,
           searchType: this.searchType,
-          ...getTimes(createTimer, ["startTime", "endTime"]),
+          ...getTimes(createTimer, ["startTime", "endTime"])
         };
         const res = await getErrInspectionData(params);
         this.tableList = res.data.rows;
@@ -396,7 +414,7 @@ export default {
     onGPS(row) {
       this.activeRow = {
         schoolLongitudeLatitude: row.schoolGps,
-        signOutLongitudeLatitude: row.submitedGps,
+        signOutLongitudeLatitude: row.submitedGps
       };
       this.gpsVisible = true;
     },
@@ -408,8 +426,8 @@ export default {
           fileName: "巡查结果.xls",
           method: "get",
           params: {
-            planId: row.id,
-          },
+            planId: row.id
+          }
         },
         "您确定导出巡查结果?"
       );
@@ -421,7 +439,7 @@ export default {
         return;
       }
       // 合作单位
-      await queryByOrganId({ organId: value }).then((res) => {
+      await queryByOrganId({ organId: value }).then(res => {
         if (res.code == 200) {
           this.cooperationList = res.data;
         }
@@ -433,6 +451,7 @@ export default {
     },
     onReSet() {
       this.$refs["searchForm"].resetFields();
+      this.searchForm.createTimer = getCurrentMonth();
       this.pageInfo.page = 1;
       this.getList();
     },
@@ -442,7 +461,7 @@ export default {
       this.handleStatus = true;
     },
     onHandleSubmit(formName) {
-      this.$refs[formName].validate(async (valid) => {
+      this.$refs[formName].validate(async valid => {
         if (valid) {
           console.log(this.handleForm);
           try {
@@ -456,17 +475,17 @@ export default {
     },
     handleClose(formName) {
       this.$refs[formName].resetFields();
-    },
+    }
   },
   filters: {
     statusFormat(value) {
       let template = ["未提交", "正常", "异常"];
       return template[value];
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 ::v-deep .el-dialog__body {
   // padding: 10px 20px;
 }

src/views/reportForm/balanced-relationship.vue

@@ -121,23 +121,25 @@
       class="m-wrap"
       v-permission="'export/EXPORT_BALANCED_RELATIONSHIP_MUSIC_SUB_COURSE'"
     >
-      <div class="title">乐团课剩余时长：</div>
+      <div class="title">缴费项目课时明细：</div>
       <el-date-picker
         v-model="month5"
-        type="month"
+        type="monthrange"
         placeholder="选择月"
         value-format="yyyy-MM"
         class="organSelect"
-        :picker-options="pickerOptions"
+        start-placeholder="开始月份"
+        end-placeholder="结束月份"
+        :picker-options="pickerOptions2"
         clearable
       ></el-date-picker>
       <ExportChiose
         style="margin-left: 10px"
         ExportEnum="EXPORT_BALANCED_RELATIONSHIP_MUSIC_SUB_COURSE"
         :exportData="exportData5"
-        fileName="平衡关系-乐团课剩余时长导出"
+        fileName="平衡关系-缴费项目课时明细导出"
         errorMsg="请选择月份"
-        message="您确认导出乐团课剩余时长"
+        message="您确认导出缴费项目课时明细"
         :flag="this.month5.length <= 0"
         :isDownList="true"
       />
@@ -213,7 +215,7 @@
 	EXPORT_BALANCED_RELATIONSHIP_MUSIC_COURSE(30,"平衡关系-乐团课"),
 	EXPORT_BALANCED_RELATIONSHIP_VIP_COURSE(31,"平衡关系-VIP已排课"),
 	EXPORT_BALANCED_RELATIONSHIP_VIP_NO_COURSE(32,"平衡关系-VIP未排课"),
-	EXPORT_BALANCED_RELATIONSHIP_MUSIC_SUB_COURSE(33,"平衡关系-乐团课剩余时长"),
+	EXPORT_BALANCED_RELATIONSHIP_MUSIC_SUB_COURSE(33,"平衡关系-缴费项目课时明细"),
 	EXPORT_BALANCED_RELATIONSHIP_STUDENT_INFO(34,"平衡关系-学员情况总表"),
 	EXPORT_BALANCED_RELATIONSHIP_STUDENT_NORMAL_DETAIL(35,"平衡关系(分表)-乐团在读学员"),
 	EXPORT_BALANCED_RELATIONSHIP_STUDENT_QUIT_DETAIL(36,"平衡关系(分表)-乐团退团学员") -->
@@ -221,6 +223,7 @@
 </template>
 <script>
 import ExportChiose from "@/components/Export-chiose";
+import { getTimes } from "@/utils";
 import dayjs from "dayjs";
 export default {
   name: "balanced-relationship",
@@ -235,11 +238,17 @@ export default {
           return time.getTime() + 86400000 > dayjs(new Date()).startOf("month");
         }
       },
+      pickerOptions2: {
+        firstDayOfWeek: 1,
+        disabledDate(time) {
+          return time.getTime() > dayjs(new Date()).startOf("month");
+        }
+      },
       organId1: [], // 乐团梯队数据
       month2: "", // 平衡关系-乐团课
       month3: "", // 平衡关系-VIP已排课
       month4: "", // 平衡关系-VIP未排课
-      month5: "", // 平衡关系-乐团课剩余时长
+      month5: [], // 平衡关系-缴费项目课时明细
       month6: "", // 平衡关系-学员情况总表
       month7: "" // 平衡关系(分表)-乐团退团学员
     };
@@ -293,7 +302,7 @@ export default {
     },
     exportData5() {
       let data = {
-        month: this.month5
+        ...getTimes(this.month5, ["startMonth", "endMonth"], "YYYY-MM")
       };
       return data;
     },

vue.config.js

@@ -19,7 +19,7 @@ const name = defaultSettings.title || "管乐迷后台管理系统"; // page tit
 // let target = 'http://192.168.3.20:8000' //邹璇
 // let target = "http://192.168.0.127:8000"; //勇哥
 // let target = "http://192.168.3.14:8005"; // 原谅
-let target = "https://dev.dayaedu.com"; //测试环境
+let target = "https://test.dayaedu.com"; //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**