lex-xin %!s(int64=3) %!d(string=hai) anos
pai
achega
c8821c0add

+ 1 - 1
src/App.vue

@@ -68,7 +68,7 @@ body {
   color: #606266;
 }
 .el-tabs__item {
-  font-size: 16px !important;
+  font-size: 15px !important;
 }
 </style>
 <style lang="scss">

+ 2 - 4
src/views/afterSchoolManager/afterWorkList.vue

@@ -69,8 +69,7 @@
                        value="0"></el-option>
           </el-select>
         </el-form-item>
-        <br />
-        <el-form-item label="布置时间">
+        <el-form-item>
           <el-date-picker v-model.trim="searchForm.timer"
                           style="width:400px;"
                           type="daterange"
@@ -82,8 +81,7 @@
         firstDayOfWeek: 1
     }"></el-date-picker>
         </el-form-item>
-        <br />
-        <el-form-item label="截止时间">
+        <el-form-item>
           <el-date-picker v-model.trim="searchForm.expireDate"
                           style="width:400px;"
                           type="daterange"

+ 83 - 81
src/views/studentManager/studentGroupPractice.vue

@@ -4,89 +4,91 @@
       <div class="squrt"></div>
       待激活团练宝
     </h2>
-    <el-form :inline="true" :model="searchForm">
-      <el-form-item>
-        <el-input
-          v-model.trim="searchForm.queryCondition"
-          @keyup.enter.native="queryCondition"
-          clearable
-          placeholder="学生姓名/编号/电话"
-        ></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="search" type="danger">搜索</el-button>
-        <el-button @click="onReSet" type="primary">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- <div class="newBand"
-         @click="resetPays"
-         v-permission="'musicGroupStudentFee/batchUpdateCourseFee'">修改缴费金额</div> -->
-    <el-button @click="addMember" v-if="$helpers.permission('cloudTeacherOrder/pay/student')" type="primary" style="margin-bottom: 20px">激活会员</el-button>
+    <div class="m-core">
+      <el-form :inline="true" :model="searchForm">
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.queryCondition"
+            @keyup.enter.native="queryCondition"
+            clearable
+            placeholder="学生姓名/编号/电话"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="search" type="danger">搜索</el-button>
+          <el-button @click="onReSet" type="primary">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <!-- <div class="newBand"
+          @click="resetPays"
+          v-permission="'musicGroupStudentFee/batchUpdateCourseFee'">修改缴费金额</div> -->
+      <el-button @click="addMember" v-if="$helpers.permission('cloudTeacherOrder/pay/student')" type="primary" style="margin-bottom: 20px">激活会员</el-button>
 
-    <div class="tableWrap">
-      <el-table
-        style="width: 100%"
-        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-        :data="tableList"
-        ref="multipleTable"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column
-          align="center"
-          prop="studentId"
-          label="学员编号"
-        ></el-table-column>
-        <el-table-column align="center" prop="name" label="学员姓名">
-        </el-table-column>
-        <el-table-column align="center" prop="phone" label="手机号">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="subjectName"
-          label="学员声部"
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          prop="type"
-          label="团练宝类型"
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+          ref="multipleTable"
+          @selection-change="handleSelectionChange"
         >
-          <template slot-scope="scope">
-            {{ scope.row.type | memberEnumType }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="time"
-          label="数量"
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="缴费金额(元)"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.amount | hasMoneyFormat }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column align="center"
-                         label="操作">
-          <template slot-scope="scope">
-            <div>
-              <el-button type="text"
-                         v-permission="'musicGroupStudentFee/batchUpdateCourseFee'"
-                         @click="resetPay(scope.row)">修改金额</el-button>
-            </div>
-          </template>
-        </el-table-column> -->
-      </el-table>
-      <pagination
-        sync
-        :total.sync="rules.total"
-        :page.sync="rules.page"
-        :limit.sync="rules.limit"
-        :page-sizes="rules.page_size"
-        @pagination="getList"
-      />
+          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column
+            align="center"
+            prop="studentId"
+            label="学员编号"
+          ></el-table-column>
+          <el-table-column align="center" prop="name" label="学员姓名">
+          </el-table-column>
+          <el-table-column align="center" prop="phone" label="手机号">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="subjectName"
+            label="学员声部"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="type"
+            label="团练宝类型"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.type | memberEnumType }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="time"
+            label="数量"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="缴费金额(元)"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.amount | hasMoneyFormat }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center"
+                          label="操作">
+            <template slot-scope="scope">
+              <div>
+                <el-button type="text"
+                          v-permission="'musicGroupStudentFee/batchUpdateCourseFee'"
+                          @click="resetPay(scope.row)">修改金额</el-button>
+              </div>
+            </template>
+          </el-table-column> -->
+        </el-table>
+        <pagination
+          sync
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
     </div>
 
     <el-dialog