Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/stopbill-form.vue

@@ -197,11 +197,11 @@
               <div class="row backInfo_One">
                 <div class="col-6">
                   <span class="backInfo_Title">总课时：</span>
-                  <span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.TotalPlanNum}} 课时</span>
+                  <span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.TotalHours}} 课时</span>
                 </div>
                 <div class="col-6">
                   <span class="backInfo_Title">已学课时：</span>
-                  <span class="backOtherInfo" style="color:#2961FE;cursor:pointer;" @click="goStudentsClassSee(setingObj.DataObj.Order_Guest_ViewModel)">{{setingObj.DataObj.Order_Guest_ViewModel.Ranks}} 课时</span>
+                  <span class="backOtherInfo" style="color:#2961FE;cursor:pointer;" @click="goStudentsClassSee(setingObj.DataObj.Order_Guest_ViewModel)">{{setingObj.DataObj.Order_Guest_ViewModel.CompleteHours}} 课时</span>
                    <!-- <span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.Ranks}} 课时</span> -->
                 </div>
               </div>
@@ -209,7 +209,7 @@
                 <div class="col-6">
                   <span class="backInfo_Title">剩余课时：</span>
                   <span
-                    class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.TotalPlanNum-setingObj.DataObj.Order_Guest_ViewModel.Ranks}}
+                    class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.TotalHours-setingObj.DataObj.Order_Guest_ViewModel.CompleteHours}}
                     课时</span>
                 </div>
               </div>

src/pages/teacher/components/teachTable.vue

@@ -2,7 +2,7 @@
   <div style="padding:20px 0">
     <div class="page-content">
       <q-table :pagination="setMsg" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
-        separator="none" :data="tableData" :columns="columns" row-key="name">
+        separator="none" :data="tableData" :columns="showCZ?columns:columns2" row-key="name">
         <template v-slot:body-cell-GuestList="props">
           <q-td auto-width :props="props">
             <span v-for="(item,index) in props.row.GuestList" style="margin-right:5px;">
@@ -48,6 +48,10 @@
       PageCount: {
         type: Number,
         default: null
+      },
+      showCZ:{//是否显示操作栏
+        Type:Boolean,
+        default:true
       }
     },
     meta: {
@@ -103,6 +107,47 @@
             label: '操作',
             field: 'Id'
           }
+        ],
+         columns2: [{
+            name: 'ClassDate',
+            label: '日期',
+            field: 'ClassDate',
+            align: 'left'
+          }, {
+            name: 'StartTime',
+            label: '上课时间',
+            field: 'StartTime',
+            align: 'left'
+          }, {
+            name: 'ClassName',
+            label: '班级',
+            field: 'ClassName',
+            align: 'left'
+          },
+          {
+            name: 'CourseName',
+            label: '课程名称',
+            field: 'CourseName',
+            align: 'left',
+          },
+          {
+            name: 'GuestList',
+            label: '学员名称',
+            field: 'GuestList',
+            align: 'left'
+          },
+          {
+            name: 'TeacherName',
+            label: '教师',
+            field: 'TeacherName',
+            align: 'left'
+          },
+          {
+            name: 'TotalPlanNum',
+            label: '课程进度',
+            field: 'TotalPlanNum',
+            align: 'left'
+          },
         ],
         tabMsg: {
           PageIndex: 1,