Merge branch 'contentManagerTemp' into test

src/components/select-all/index.vue

@@ -21,7 +21,7 @@
 export default {
   name: 'select-all',
   mounted() {
-    console.log(this)
+    // console.log(this)
   },
   methods: {
     selectAll() {

src/main.js

@@ -66,7 +66,7 @@ class DonMessage {
 // 修改默认属性
 ElementUI.Dialog.props.closeOnClickModal.default = false;
 // ElementUI.Dialog.props.destroyOnClose.default = true;
-console.log(ElementUI.Input)
+// console.log(ElementUI.Input)
 // 全局修改选择如果value与label都为数字0则清空
 const SelectValueWatch = ElementUI.Select.watch.value
 ElementUI.Select.watch.value = function (newValue, oldValue) {

src/views/reportForm/index.vue

@@ -209,6 +209,33 @@
           </el-tooltip> -->
         </div>
       </div>
+      <el-divider></el-divider>
+      <div class="m-core">
+        <div class="m-wrap">
+          <div class="title">乐保订单导出：
+          </div>
+          <el-date-picker
+            v-model="leBaoTimer"
+            style="width:420px;margin-left: 15px;"
+            type="monthrange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始月份"
+            end-placeholder="结束月份">
+          </el-date-picker>
+          <el-button style="margin-left: 10px;" type="primary" @click="exportLeBao"
+               v-permission="'studentInstrument/export'">导出</el-button>
+          <!-- <el-tooltip placement="top"
+                      popper-class="mTooltip">
+            <div slot="content">
+              请选择分部和月份，导出回款统计
+            </div>
+            <i class="el-icon-question micon el-tooltip"
+               style="font-size: 18px; color: #F56C6C"
+               v-permission="'export/studentOrder'"></i>
+          </el-tooltip> -->
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -217,6 +244,7 @@ import { exportTeacherSalary } from '@/api/generalSettings'
 import { courseType, courseListType } from '@/utils/searchArray'
 import { Export } from '@/utils/downLoadFile'
 import cleanDeep from 'clean-deep'
+import dayjs from 'dayjs'
 import axios from 'axios'
 import qs from 'qs'
 import {
@@ -238,7 +266,8 @@ export default {
       studentMonth: '',
       attendanceOrganId: [],
       attendanceCourseType: 'MUSIC',
-      timer: []
+      timer: [],
+      leBaoTimer: []
     };
   },
   mounted () {
@@ -528,6 +557,25 @@ export default {
         params: qs.stringify({ organId: this.attendanceOrganId.join(','), groupType: this.attendanceCourseType, classStartDate, classEndDate })
       }, '您确定导出学生考勤?')
     },
+    exportLeBao () {
+      let endTime, startTime;
+      if (this.leBaoTimer && this.leBaoTimer.length > 1) {
+        startTime = this.leBaoTimer[0]
+        let end = this.leBaoTimer[1]
+        end = new Date(end)
+        end = new Date(end.getFullYear(), end.getMonth() + 1, 0)
+        endTime = dayjs(end).format('YYYY-MM-DD')
+      } else {
+        this.$message.error('请选择导出月份')
+        return
+      }
+      Export(this, {
+        url: '/api-web/studentInstrument/export',
+        fileName: '乐保订单.xlsx',
+        method: 'get',
+        params: { startTime: startTime, endTime: endTime }
+      }, '您确定导出乐保订单?')
+    },
   }
 
 };