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

src/components/sale/backinfo-form.vue

@@ -95,7 +95,7 @@
           </div>
           <div class="col-6">
             <span class="backInfo_Title">申请人：</span>
-            <span class="backOtherInfo">{{setingObj.DataObj.CreateByName}}</span>
+            <span class="backOtherInfo">{{setingObj.CreateByName}}</span>
           </div>
         </div>
         <div class="row backInfo_One">
@@ -103,10 +103,10 @@
             <span class="backInfo_Title">学员姓名：</span>
             <span class="backOtherInfo">{{setingObj.DataObj.GuestName}}</span>
           </div>
-          <!-- <div class="col-6">
+          <div class="col-6">
             <span class="backInfo_Title">申请时间：</span>
-            <span class="backOtherInfo">{{setingObj.CreateTimeStr}}</span>
-          </div> -->
+            <span class="backOtherInfo">{{setingObj.CreateTime}}</span>
+          </div>
         </div>
         <div class="backinfo_Item">
           <span class="role_Line" style="background-color:#F28C1D"></span>教学信息
@@ -118,7 +118,10 @@
           </div>
           <div class="col-6">
             <span class="backInfo_Title">班级信息：</span>
-            <span class="backOtherInfo">{{setingObj.DataObj.ClassName}}</span>
+            <span class="backOtherInfo">
+              {{setingObj.DataObj.ClassName}}
+              <span style="color:blue;cursor:pointer;" @click="goClassManage(setingObj.DataObj.ClassName)">{{setingObj.DataObj.ClassNo}}</span>
+            </span>
           </div>
         </div>
         <div class="row backInfo_One">
@@ -156,7 +159,7 @@
         <div class="row backInfo_One">
           <div class="col-6">
             <span class="backInfo_Title">关联单号：</span>
-            <span class="backOtherInfo" style="color:#2961FE">{{setingObj.DataObj.OrderId}}</span>
+            <span class="backOtherInfo" style="color:#2961FE;cursor:pointer" @click="goOrderStatic(setingObj.DataObj.OrderId)">{{setingObj.DataObj.OrderId}}</span>
           </div>
           <div class="col-6">
             <span class="backInfo_Title">关联销售：</span>
@@ -363,6 +366,18 @@
           }
         })
         return str;
+      },
+      //跳转到班级管理
+      goClassManage(ClassName){
+        this.OpenNewUrl('/course/classManage',{
+          'ClassName':ClassName
+        })
+      },
+      //跳转到报名统计
+      goOrderStatic(OrderId){
+        this.OpenNewUrl('/sale/orderStatistics',{
+          'OrderId':OrderId
+        })
       }
     },
   }

src/pages/teacher/changeClassManager.vue

@@ -24,11 +24,11 @@
             label="学员名称/班级名称/老师名称" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" filled v-model="msg.AuditStatus" :options="ShowOpts"
+          <q-select @input="resetSearch" clearable filled v-model="msg.AuditStatus" :options="ShowOpts"
             emit-value map-options label="审核状态" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" option-value="Id" option-label="Name" filled v-model="msg.ReceiptType" :options="OrderTypeList"
+          <q-select @input="resetSearch" clearable option-value="Id" option-label="Name" filled v-model="msg.ReceiptType" :options="OrderTypeList"
             emit-value map-options label="单据类型" />
         </div>
         <div class="col-3 Sysuser_Date">