08/03 16:20

去除,老师默认课酬导出带课程类型参数

dist/static/css/chunk-3826f6c8.83c8de5d.css

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

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"
@@ -73,18 +84,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>
@@ -139,6 +138,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 = {
@@ -146,7 +146,7 @@ export default {
         headers: {
           'Authorization': getToken()
         },
-        data: qs.stringify(data),
+        data: qs.stringify(cleanDeep(data)),
         url,
         responseType: 'blob'
       }
@@ -201,7 +201,7 @@ export default {
         headers: {
           'Authorization': getToken()
         },
-        data: qs.stringify(data),
+        data: qs.stringify(cleanDeep(data)),
         url,
         responseType: 'blob'
       }
@@ -244,7 +244,7 @@ export default {
       }).catch(() => { })
     },
     exportDefaultSalary () {
-      let courseTypeList = this.courseScheduleType.join(',')
+
       let organIdList = this.teacherDefaultSalaryOrganId.join(',')
       let url = '/api-web/export/teacherDefaultSalary'
       let data = { organIdList, courseTypeList }