页面修改

src/components/course/classstu-form.vue

@@ -62,6 +62,16 @@
           <span style="color:green;" v-if="props.row.IsRenew==1">是</span>
         </q-td>
       </template>
+      <template v-slot:body-cell-GuestName="props">
+        <q-td auto-width :props="props">
+          <span v-if="props.row.GuestState==1">{{props.row.GuestName}}</span>
+          <span style="color:red;cursor:pointer" v-else>{{props.row.GuestName}}
+            <q-tooltip :offset="[10, 10]">
+              {{props.row.GuestStateStr}}
+            </q-tooltip>
+          </span>
+        </q-td>
+      </template>
       <template v-slot:body-cell-StuType="props">
         <q-td auto-width :props="props">
           <span v-if="props.row.IsChaBan==0">正常报入</span>
@@ -202,14 +212,13 @@
           }
         })
       },
-
-
       //获取学员信息
       getStudentData() {
         this.studentList = [];
         queryClassStudent({
           ClassId: this.setingObj.ClassId,
-          School_Id: this.setingObj.School_Id
+          School_Id: this.setingObj.School_Id,
+          QEffectStatus: 2,
         }).then(res => {
           if (res.Code == 1) {
             this.studentList = res.Data;

src/components/sale/orderlist.vue

@@ -106,7 +106,8 @@
               </div>
               <template v-if="item.IsCommissionGive==1">
                 <div style="color:red" v-if="item.YFCommissionMoney>0">应发提成：{{item.YFCommissionMoney}}</div>
-                <div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>已发提成：{{item.CommissionMoney}}</div>
+                <div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>
+                  已发提成：{{item.CommissionMoney}}</div>
                 <div style="color:red" v-if="item.ExtraCommissionMoney>0">额外奖励实发：{{item.ExtraCommissionMoney}}</div>
                 <div style="color:red;" v-if="item.ExtraRewardMoney>0">额外奖励：{{item.ExtraRewardMoney}}</div>
                 <div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div>
@@ -165,12 +166,10 @@
               </div>
             </td>
             <td style="border:none">
-   
               <template v-if="isEditOrder||AuthorityObj.isShowEdit">
-                   <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
-                    @click="editOrder(item)" />
+                <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
+                  @click="editOrder(item)" />
               </template>
-    
               <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
                 <q-list>
                   <q-item clickable v-close-popup>
@@ -259,8 +258,15 @@
             <td :colspan="12" style="text-align: left">
               <div class="row" v-if="item.GuestList&&item.GuestList.length>0">
                 学生名单：
-                <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
-                  style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
+                <template v-for="(x,j) in item.GuestList" :index="j">
+                  <span v-if="x.GuestState==1" style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
+                  <span v-else style="color:red;margin-right: 5px">
+                    {{x.GuestName}}
+                    <q-tooltip :offset="[10, 10]">
+                      {{x.GuestStateStr}}
+                    </q-tooltip>
+                  </span>
+                </template>
               </div>
               <div v-if="AuthorityObj.isShowContract&&item.GuestList&&item.GuestList.length>0" class="takeContract">
                 <span @click="isShowPop=true">查看合同</span>
@@ -970,7 +976,7 @@
         });
       },
       //跳转到预约单号
-      goVisitorReser(Id){
+      goVisitorReser(Id) {
         this.OpenNewUrl("/sale/appointManagement", {
           Id: Id
         });
@@ -1298,7 +1304,7 @@
           query: {}
         });
       },
-      gourltx(OrderId){
+      gourltx(OrderId) {
         this.OpenNewUrl("/financial/cycleOrderList", {
           OrderId: OrderId
         });