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

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

@@ -46,8 +46,6 @@
     text-align: center;
     font-style: normal;
   }
-
-
 </style>
 <template>
   <div>
@@ -66,32 +64,38 @@
       </div>
       <div>
           <el-table :data="chapterList" v-loading="loading" ref="table" :height="tableHeight" style="width: 100%;">
-            <el-table-column prop="ChapterNo" label="章节" width="450">
+            <el-table-column prop="ChapterNo" label="章节" width="400">
               <template slot-scope="scope">
                 <div style="display: inline-block;">
                   <div class="flex q-ml-md">
-                    <div class="record_cala_Num" v-if="scope.row.ChapterNo.indexOf('.') == -1" style="cursor:pointer;">
+                    <div class="record_cala_Num">
                       <span>
                         <i>{{ scope.row.ChapterNo }}</i>
                       </span>
                     </div>
-                    <div style="margin-left: 36px;width:360px;cursor:pointer;" class="ellipsis"
-                      v-if="scope.row.ChapterNo.indexOf('.') == -1">
+                    <div style="margin-left: 36px;width:320px;" class="ellipsis">
                       {{ scope.row.ChapterName }}
                     </div>
                   </div>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="State" label="状态" width="100">
+            <el-table-column prop="State" label="状态" width="70">
               <template slot-scope="scope">
-                <div class="text-positive" v-if="scope.row.State == 1">
-                  正常上课
+                <div v-if="scope.row.State == 1">
+                  <span class="text-warning" v-if="scope.row.AppointState==1">待确认</span>
+                  <span class="text-info" v-if="scope.row.AppointState==2">待上课</span>
+                  <span class="text-positive" v-if="scope.row.AppointState==3">已上课</span>
                 </div>
                 <div class="text-warning" v-if="scope.row.State == 2">补课</div>
                 <div class="text-negative" v-if="scope.row.State == 3">缺课</div>
               </template>
             </el-table-column>
+            <el-table-column prop="AgainNum" label="重学次数" width="80">
+              <template slot-scope="scope">
+                {{scope.row.AgainNum}}
+              </template>
+            </el-table-column>
           </el-table>
 
       </div>

src/components/school/student/transfer-order.vue

@@ -165,7 +165,8 @@
           JoinStartTime: "", //报名截止日期开始
           JoinEndTime: "", //报名截止日期结束
           ClassNo: "", //班号
-          CourseSubject: "" //所属科目
+          CourseSubject: "", //所属科目
+          IsQuerySalePlat:1
         },
         courseData: [], //课程列表
         coursePageCount: 0, //课程页数

src/components/school/student/transfer-order/order-form.vue

@@ -225,7 +225,7 @@
           class="col-6 q-py-sm"
           label="客人来源"
         />
-        <q-select
+        <!-- <q-select
           :disable="
             modityOrderType == 2 || OrderMsg.JoinType == 3 || HelpEnterDisable
           "
@@ -249,7 +249,7 @@
               </q-item-section>
             </q-item>
           </template>
-        </q-select>
+        </q-select> -->
         <q-select
           :disable="
             modityOrderType == 2 ||
@@ -498,7 +498,7 @@ export default {
         if (res.Code == 1) {
           res.Data.map(e => {
             if (e.AssistType == 4) {
-              this.OrderMsg.HelpEnterId = e.AssistId;
+              // this.OrderMsg.HelpEnterId = e.AssistId;
               this.HelpEnterDisable = true;
             }
             if (e.AssistType == 2) {

src/components/school/student/transfer-order/yueke.vue

@@ -156,6 +156,7 @@ export default {
         CourseSubject: "", //所属科目
         CourseName:"",
         ClassScrollType :2,
+        IsQuerySalePlat:1
       },
       CourseSubjectList: [],
       //课程分类树形列表

src/components/stuMan/subscribe/detail.vue

@@ -154,14 +154,14 @@
                 size="xs"
                 label="补课"
                 @click="showRelenishDig = true"
-                class="q-mr-sm"
+                style="margin-left:440px"
               />
               <q-btn
                 color="accent"
                 size="xs"
                 label="重学"
                 @click="showReStudyDig = true"
-                class="q-mr-sm"
+                class="q-ml-sm"
               />
             </div>
 

src/components/stuMan/subscribe/reStudy.vue

@@ -22,6 +22,7 @@
                 v-model="reStuMsg.StuName"
                 label="学员姓名"
                 class="col-10"
+                hint="提示：需输入学员姓名查询学员列表"
               />
               <div class="col-2 q-pt-md">
                 <q-btn
@@ -43,7 +44,15 @@
                 :options="stuOptions"
                 label="学员列表"
                 class="col-10"
-              />
+              >
+                <template v-slot:no-option>
+                  <q-item>
+                    <q-item-section class="text-grey">
+                      未找到相关数据
+                    </q-item-section>
+                  </q-item>
+                </template>
+              </q-select>
               <div class="col-2 q-pt-md">
                 <q-btn
                   size="sm"
@@ -153,7 +162,7 @@ export default {
           });
           this.$emit("success", {
             GuestName: this.stuInfo.StuName,
-            AppointType:3,
+            AppointType: 3,
             AppointmentId: res.Data
           });
           this.stuInfo = "";

src/components/stuMan/subscribe/replenish.vue

@@ -19,8 +19,8 @@
               <q-select
                 filled
                 v-model="stuInfo"
-                stack-label
                 use-input
+                stack-label
                 option-value="StuId"
                 option-label="StuName"
                 :options="stuOptions"
@@ -94,7 +94,7 @@ export default {
       reStuMsg: {
         ChapterNo: 0
       },
-      stuInfo: "",
+      stuInfo: "请选择",
       stuOptions: [],
       AllStuOptions: []
     };

src/pages/studyAbroad/subscribe.vue

@@ -273,8 +273,7 @@
                         </div>
                         <div class="flex no-wrap" v-if="__item.ClassType == 3">
                           <span class="detailLabel">
-                            状态：<span></span
-                            ><span
+                            状态：<span
                               v-if="__item.AppointState == 1"
                               style="color:#ef5350"
                               >待确认</span
@@ -380,8 +379,7 @@
                       </div>
                       <div class="flex no-wrap" v-if="__item.ClassType == 3">
                         <span class="detailLabel">
-                          状态：<span></span
-                          ><span
+                          状态：<span
                             v-if="__item.AppointState == 1"
                             style="color:#ef5350"
                             >待确认</span
@@ -713,7 +711,6 @@ export default {
     },
     onClickIntervalHeader2(data) {},
     showDetail(data, date, tid) {
-      console.log(700, data);
       this.showForm = true;
       this.editType = 2;
       this.dateObj.date = date;

src/pages/teacher/components/teachTable.vue

@@ -20,9 +20,9 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td>
-            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1" color="accent"
+            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1||props.row.ClassType == 3" color="accent"
               style="font-weight: 400" label="课程回顾" @click="goCourseRecord(props.row)" />
-            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1" color="accent"
+            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1||props.row.ClassType == 3" color="accent"
               style="font-weight: 400" label="课程反馈" @click="goFeedBack(props.row)" />
           </q-td>
         </template>