Browse Source

1211 22:21

111
mo 5 years ago
parent
commit
3a02b54eb7

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-05cf3609.5279d8c0.css → dist/static/css/chunk-0fd95b47.bd2daedb.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}.vipwrap[data-v-c8f6c096]{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}.vipwrap .newBand[data-v-c8f6c096]{margin-right:20px}.resetClassForm[data-v-c8f6c096] .el-date-editor.el-input,.resetClassForm[data-v-c8f6c096] .el-date-editor.el-input__inner{width:180px!important}[data-v-c8f6c096] .el-date-editor.el-input,[data-v-c8f6c096] .el-date-editor.el-input__inner{width:100px!important}
+.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}.vipwrap[data-v-333d6b0c]{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}.vipwrap .newBand[data-v-333d6b0c]{margin-right:20px}.resetClassForm[data-v-333d6b0c] .el-date-editor.el-input,.resetClassForm[data-v-333d6b0c] .el-date-editor.el-input__inner{width:180px!important}[data-v-333d6b0c] .el-date-editor.el-input,[data-v-333d6b0c] .el-date-editor.el-input__inner{width:100px!important}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.a0e3c15e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-05cf3609.e961e88e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-0fd95b47.fc6a8cf8.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2dd74c68.c5d24db0.js


+ 1 - 0
src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -71,6 +71,7 @@
                            @click="lookFee(scope)">退学</el-button>
               </el-popover> -->
               <el-button type="text"
+                         v-if="scope.row.studentStatus == 0"
                          v-permission="'vipGroupManage/applyRefundForStudent'"
                          @click="lookFee(scope)">退学</el-button>
             </div>

+ 14 - 5
src/views/vipClass/vipReset.vue

@@ -29,10 +29,10 @@
                          align="center"
                          prop="name">
         </el-table-column>
-        <el-table-column label="班级id"
+        <!-- <el-table-column label="班级id"
                          align="center"
                          prop="classGroupId">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="上课日期"
                          align="center"
                          prop="classDate">
@@ -51,11 +51,20 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="上课开始时间"
+        <el-table-column label="结算状态"
+                         align="center">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.isSettlement?'已结算':'未结算'}}
+            </div>
+          </template>
+
+        </el-table-column>
+        <el-table-column label="开始时间"
                          align="center"
                          prop="startClassTimeStr">
         </el-table-column>
-        <el-table-column label="上课结束时间"
+        <el-table-column label="结束时间"
                          align="center"
                          prop="endClassTimeStr">
         </el-table-column>
@@ -509,7 +518,7 @@ export default {
       })
     },
     isDisabled (row, index) {
-      if (!row.isSettlement) {
+      if (row.isSettlement) {
         return false
       } else {
         return true;

Some files were not shown because too many files changed in this diff