mo 4 년 전
부모
커밋
5fd060e46b

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/index.html


+ 0 - 1
dist/static/css/chunk-1f2f6cab.c4577122.css

@@ -1 +0,0 @@
-.m-container .m-wrap[data-v-eb746a0e]{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-wrap .newBand[data-v-eb746a0e]{margin:0 5px 0 10px}.m-container .m-wrap .el-tooltip.micon[data-v-eb746a0e]{width:20px;height:20px;position:relative;top:12px}[data-v-eb746a0e] .el-input__icon.el-icon-date{height:40px!important}

+ 1 - 0
dist/static/css/chunk-20a571ef.ea6b24f7.css

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

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.d947d3be.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/chunk-1f2f6cab.8ed4a578.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/chunk-20a571ef.659a04b8.js


+ 35 - 16
src/views/reportForm/index.vue

@@ -5,6 +5,7 @@
     </h2>
     <div class="m-core">
       <div class="m-wrap">
+        <div class="title">课酬导出:</div>
         <el-date-picker v-model="mouth"
                         type="month"
                         placeholder="选择月"
@@ -12,7 +13,7 @@
 
         <div class="newBand"
              @click="exportSalar"
-             v-permission="'export/teacherSalary'">导出课酬</div>
+             v-permission="'export/teacherSalary'">导出</div>
         <el-tooltip placement="top"
                     popper-class="mTooltip">
           <div slot="content">
@@ -23,9 +24,14 @@
              style="font-size: 18px; color: #F56C6C"></i>
         </el-tooltip>
       </div>
+      <el-divider></el-divider>
       <div class="m-core">
         <div class="m-wrap">
+          <div class="title">乐团招生汇总:
+          </div>
           <el-select v-model.trim="organIdList"
+                     class="organSelect"
+                     style="width:100%"
                      filterable
                      multiple
                      clearable>
@@ -37,7 +43,7 @@
 
           <div class="newBand"
                @click="exportMusicGroup"
-               v-permission="'export/musicGroupRegister'">招生情况汇总表导出</div>
+               v-permission="'export/musicGroupRegister'">导出</div>
           <el-tooltip placement="top"
                       popper-class="mTooltip">
             <div slot="content">
@@ -193,20 +199,33 @@ export default {
 </script>
 <style lang="scss" scoped>
 .m-container {
-  .m-wrap {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    width: 100%;
-    // align-items: center;
-    .newBand {
-      margin: 0 5px 0 10px;
-    }
-    .el-tooltip.micon {
-      width: 20px;
-      height: 20px;
-      position: relative;
-      top: 12px;
+  .m-core {
+    margin-top: 20px;
+    .m-wrap {
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      width: 100%;
+      // align-items: center;
+      .newBand {
+        margin: 0 5px 0 10px;
+      }
+      .title {
+        width: 120px;
+        height: 40px;
+        line-height: 40px;
+        text-align: right;
+        color: #606266;
+      }
+      .organSelect {
+        width: 220px !important;
+      }
+      .el-tooltip.micon {
+        width: 20px;
+        height: 20px;
+        position: relative;
+        top: 12px;
+      }
     }
   }
 }

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.