2

src/components/school/student/class-record.vue

@@ -80,6 +80,11 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column prop="AgainNum" label="进度" width="80">
+              <template slot-scope="scope">
+                {{scope.row.CourseRateName}}({{scope.row.ChapterGradeNo}})
+              </template>
+            </el-table-column>
             <el-table-column prop="State" label="状态" width="70">
               <template slot-scope="scope">
                 <div v-if="scope.row.State == 1">
@@ -91,11 +96,11 @@
                 <div class="text-negative" v-if="scope.row.State == 3">缺课</div>
               </template>
             </el-table-column>
-            <el-table-column prop="AgainNum" label="重学次数" width="80">
+            <!-- <el-table-column prop="AgainNum" label="重学次数" width="80">
               <template slot-scope="scope">
                 {{scope.row.AgainNum}}
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
 
       </div>

src/pages/course/chapter.vue

@@ -39,6 +39,11 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column prop="name" label="进度" sortable width="100">
+            <template slot-scope="scope">
+              {{scope.row.CourseRateName}}({{scope.row.ChapterGradeNo}})
+            </template>
+          </el-table-column>
           <el-table-column prop="name" label="课时" sortable width="100">
             <template slot-scope="scope">
               {{ scope.row.StudyHours }}课时

src/pages/stuMan/coffeeManage/coffeeOrderList.vue

@@ -19,50 +19,11 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
-        class="sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
-        row-key="name">
-        <template v-slot:top>
-          <div class="col-2 q-table__title">订单列表</div>
-        </template>
-        <template v-slot:body-cell-orderInfo="props">
-          <q-td :props="props">
-            <div class="q-my-xs"> <span class="label">订单号</span>：{{props.row.OrderNo}}({{ props.row.OrderId }})</div>
-            <div class="q-my-xs"> <span class="label">下单时间</span>：{{props.row.CreateDate}}</div>
-            <div class="q-my-xs"> <span class="label">付款时间</span>：{{props.row.PaymentTime}}</div>
-            <div class="q-my-xs"> <span class="label">订单状态</span>：<span v-if="props.row.OrderStatus==1">待付款 </span>
-              <span v-if="props.row.OrderStatus==2">已完成</span>
-              <span v-if="props.row.OrderStatus==3">已取消</span>
-            </div>
-            <div class="q-my-xs" v-if="props.row.OrderStatus==3"> <span class="label">取消时间</span>：{{props.row.CancelTime}}</div>
-            <div class="q-my-xs"><span class="label">用户</span>：<span v-if="props.row.UserType==1">{{props.row.EmName}} <q-chip class="q-ml-xs" size="xs" color="primary" text-color="white" >内部人员</q-chip></span> 
-                      <span v-if="props.row.UserType==2">{{props.row.EmName}}  <q-chip class="q-ml-xs" size="xs" color="positive" text-color="white">学生</q-chip></span>
-                      <span v-if="props.row.UserType==3">{{props.row.UserName}} <q-chip class="q-ml-xs" size="xs" color="info" text-color="white">甲鹤用户</q-chip></span>
-            </div>
-          </q-td>
-        </template>
-        <template v-slot:body-cell-goodsInfo="props">
-          <q-td :props="props">
-            <div>
-              <q-img :src="props.row.CoverImage" spinner-color="white" style="height: 90px; max-width: 90px" :ratio="4/3"/>
-              <span class="q-ml-sm">{{props.row.GoodsName}}</span>
-            </div>
-          </q-td>
-        </template>
-        <template v-slot:body-cell-priceInfo="props">
-          <q-td :props="props">
-            <div class="q-my-xs">单价：{{ props.row.Unit_Price}}</div>
-            <div class="q-my-xs">应收：{{ props.row.PreferPrice}}</div>
-            <div class="q-my-xs">实收：{{ props.row.Income}}</div>
-            <div class="q-my-xs" v-if="props.row.Fee">手续费：{{ props.row.Fee}}</div>
-            <div class="q-my-xs" v-if="props.row.Refund">退款金额：{{ props.row.Refund}}</div>
-          </q-td>
-        </template>
-        <template v-slot:bottom>
+      <OrderList :dataList="dataList"></OrderList>
+      <div>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
             :input="true" @input="changePage" />
-        </template>
-      </q-table>
+      </div>
     </div>
   </div>
 </template>
@@ -70,11 +31,14 @@
   import {
     getCoffeeOrderList
   } from "../../../api/stuMan/index"
+  import OrderList from '../../../components/sale/orderlistbycoffee.vue'
   export default {
     meta: {
       title: "咖啡订单列表"
     },
-
+    components:{
+      OrderList
+    },
     data() {
       return {
         dataList: [],