Merge branch 'online' into LAO_MO

dist/static/css/chunk-4f3eea27.e57e011b.css

@@ -0,0 +1 @@
+.m-container .m-core[data-v-7cbb8d89]{margin-top:20px}.m-container .m-core .m-wrap[data-v-7cbb8d89]{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:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-core .m-wrap .newBand[data-v-7cbb8d89]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-7cbb8d89]{width:120px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-7cbb8d89]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-7cbb8d89]{width:20px;height:20px;position:relative;top:12px}[data-v-7cbb8d89] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-0c5e85bd.5011b0ca.css → dist/static/css/chunk-7f2e10e0.1a0389c3.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.right-code .title[data-v-0507f529]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-0507f529]{display:inline-block}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.right-code .title[data-v-abbaadba]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-abbaadba]{display:inline-block}

dist/static/css/chunk-ea7a8276.9071987a.css

@@ -1 +0,0 @@
-.m-container .m-core[data-v-1f365c4e]{margin-top:20px}.m-container .m-core .m-wrap[data-v-1f365c4e]{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:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-core .m-wrap .newBand[data-v-1f365c4e]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-1f365c4e]{width:120px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-1f365c4e]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-1f365c4e]{width:20px;height:20px;position:relative;top:12px}[data-v-1f365c4e] .el-input__icon.el-icon-date{height:40px!important}

src/views/reportForm/index.vue

@@ -10,6 +10,17 @@
                         type="month"
                         placeholder="选择月"
                         value-format="yyyy-MM-dd"></el-date-picker>
+        <!-- <el-select v-model.trim="courseScheduleType"
+                   style="marginLeft:10px"
+                   filterable
+                   clearable
+                   multiple
+                   placeholder="课程类型">
+          <el-option v-for="(item, index) in courseArray"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
+        </el-select> -->
 
         <div class="newBand"
              @click="exportSalar"
@@ -75,18 +86,6 @@
                        :value="item.id"></el-option>
           </el-select>
 
-          <el-select v-model.trim="courseScheduleType"
-                     style="marginLeft:10px"
-                     filterable
-                     clearable
-                     multiple
-                     placeholder="课程类型">
-            <el-option v-for="(item, index) in courseArray"
-                       :key="index"
-                       :label="item.label"
-                       :value="item.value"></el-option>
-          </el-select>
-
           <div class="newBand"
                @click="exportDefaultSalary"
                v-permission="'export/teacherDefaultSalary'">导出</div>
@@ -174,6 +173,7 @@ export default {
         this.$message.error('请选择导出月份')
         return
       }
+      // let courseTypeList = this.courseScheduleType.join(',')
       let url = '/api-web/export/teacherSalary'
       let data = { date: this.mouth }
       const options = {
@@ -181,7 +181,7 @@ export default {
         headers: {
           'Authorization': getToken()
         },
-        data: qs.stringify(data),
+        data: qs.stringify(cleanDeep(data)),
         url,
         responseType: 'blob'
       }
@@ -228,7 +228,6 @@ export default {
         this.$message.error('请至少选择一个分部')
         return
       }
-
       let url = '/api-web/export/musicGroupRegister'
       let data = { organIds: this.organIdList.join(',') }
       const options = {
@@ -236,7 +235,7 @@ export default {
         headers: {
           'Authorization': getToken()
         },
-        data: qs.stringify(data),
+        data: qs.stringify(cleanDeep(data)),
         url,
         responseType: 'blob'
       }
@@ -279,10 +278,10 @@ export default {
       }).catch(() => { })
     },
     exportDefaultSalary () {
-      let courseTypeList = this.courseScheduleType.join(',')
+
       let organIdList = this.teacherDefaultSalaryOrganId.join(',')
       let url = '/api-web/export/teacherDefaultSalary'
-      let data = { organIdList, courseTypeList }
+      let data = { organIdList }
       const options = {
         method: 'POST',
         headers: {

src/views/sporadicManager/sporadicList.vue

@@ -81,6 +81,7 @@
           <el-button @click="onReSet"
                      type="primary">重置</el-button>
           <el-button @click="exportSporad"
+                     v-permission="'export/sporadicChargeInfo'"
                      style=" background: #14928a; border:1px solid #14928a;color:#fff">导出</el-button>
         </el-form-item>
       </el-form>