页面修改

src/components/schedul/reservelist.vue

@@ -64,6 +64,20 @@
           </span>
         </q-td>
       </template>
+      <template v-slot:body-cell-OrderCount="props">
+        <q-td auto-width :props="props">
+          <q-badge color="green">
+            {{props.row.OrderCount}}
+          </q-badge>
+        </q-td>
+      </template>
+      <template v-slot:body-cell-FailCount="props">
+        <q-td auto-width :props="props">
+          <q-badge color="red">
+            {{props.row.FailCount}}
+          </q-badge>
+        </q-td>
+      </template>
       <template v-slot:body-cell-TeacherId="props">
         <q-td :props="props">
           <q-btn-dropdown v-if="authObj&&authObj.isShowEdit" flat size="xs" color="dark" label="更多">
@@ -163,7 +177,7 @@
           },
           {
             name: 'OrderCount',
-            label: '转订单人数',
+            label: '试听成功',
             align: 'left',
             field: 'OrderCount',
           },
@@ -173,6 +187,12 @@
             align: 'left',
             field: 'ConversionRates',
           },
+          {
+            name: 'FailCount',
+            label: '试听失败',
+            align: 'left',
+            field: 'FailCount',
+          },
           {
             name: 'ClassContent',
             label: '试讲内容',
@@ -199,8 +219,9 @@
         ],
         //表格可见列
         visibleColumns: [
-          'TeacherName', 'ClassDateStr', 'ClassTime', 'RoomName', 'LessonName', 'JoinNum', 'OrderCount', 'ConversionRates', 'ClassContent', "ReserveType",
-          'CreateByName','TeacherId'
+          'TeacherName', 'ClassDateStr', 'ClassTime', 'RoomName', 'LessonName', 'JoinNum', 'OrderCount', 'FailCount',
+          'ConversionRates', 'ClassContent', "ReserveType",
+          'CreateByName', 'TeacherId'
         ], //可见列
         reserveObj: {},
         isShowReserve: false,

src/pages/sale/reserveClass.vue

@@ -87,6 +87,17 @@
       var day = nowDay.getDate(); //日
        this.msg.StartClassDate = year + '-' + month + '-' + day
  
+      if (this.$route.query) {
+        if (this.$route.query.StartClassDate) {
+          this.msg.StartClassDate = this.$route.query.StartClassDate;
+        }
+        if (this.$route.query.EndClassDate) {
+          this.msg.EndClassDate = this.$route.query.EndClassDate;
+        }
+        if (this.$route.query.TeacherId) {
+          this.msg.TeacherId = Number(this.$route.query.TeacherId);
+        }
+      }  
       this.GetTeacherList();
       this.getClassRoomList();
       this.getList()

src/pages/sale/reserveStudentList.vue

@@ -12,6 +12,20 @@
           <div class="page-option">
           </div>
         </template>
+        <template v-slot:body-cell-SpeakState="props">
+          <q-td :props="props">
+            <template v-if="props.row.OrderCount>0">
+              <q-badge color="green">
+                试讲成功
+              </q-badge>
+            </template>
+            <template v-else>
+              <q-badge color="red">
+                试讲失败
+              </q-badge>
+            </template>
+          </q-td>
+        </template>
         <template v-slot:bottom>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
             :input="true" @input="changePage" />
@@ -94,6 +108,18 @@
             field: 'TeacherName',
             align: 'left'
           },
+          {
+            name: 'OrderCount',
+            label: '订单数量',
+            field: 'OrderCount',
+            align: 'left'
+          },
+          {
+            name: 'SpeakState',
+            label: '试讲',
+            field: 'SpeakState',
+            align: 'left'
+          },
           {
             name: 'RoomName',
             label: '教室',

src/pages/teacher/teacherMonth.vue

@@ -207,6 +207,27 @@
             {{props.row.AssessmentScore}}
           </q-td>
         </template>
+        <template v-slot:body-cell-SpeakClassScore="props">
+          <q-td :props="props">
+            <span style="color:blue;cursor:pointer;" title="点击查看试听信息" @click="gotoShiTing(props.row)">
+              {{props.row.SpeakClassScore}}
+            </span>
+          </q-td>
+        </template>
+        <template v-slot:body-cell-SpeakVipScore="props">
+          <q-td :props="props">
+            <span style="color:blue;cursor:pointer;" title="点击查看试听信息" @click="gotoShiTing(props.row)">
+              {{props.row.SpeakVipScore}}
+            </span>
+          </q-td>
+        </template>
+        <template v-slot:body-cell-SpeakFailScore="props">
+          <q-td :props="props">
+            <span style="color:blue;cursor:pointer;" title="点击查看试听信息" @click="gotoShiTing(props.row)">
+              {{props.row.SpeakFailScore}}
+            </span>
+          </q-td>
+        </template>
         <template v-slot:bottom-row>
           <q-tr v-if="lastRow">
             <q-td>
@@ -540,6 +561,16 @@
       this.getList();
     },
     methods: {
+      //跳转到试听
+      gotoShiTing(item) {
+        var lastDay = new Date(this.msg.YearStr, this.msg.MonthStr, 0).getDate();
+        var qObj = {
+          TeacherId: item.TeacherId,
+          StartClassDate: this.msg.YearStr + "-" + this.msg.MonthStr + "-01",
+          EndClassDate: this.msg.YearStr + "-" + this.msg.MonthStr + "-" + lastDay,
+        };
+        this.OpenNewUrl('/sale/reserveClass', qObj)
+      },
       GoToDetails(item, type) {
         //跳转到跟进详情
         if (type == 1) {