1

src/components/sale/orderlist.vue

@@ -2,86 +2,16 @@
 <template>
   <div class="classorder">
     <div class="table-head">
-      <!-- <table class="enrollTotalSearchTable" border="1" cellspacing="0" cellpadding="0">
-        <colgroup>
-          <col width="12%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-           <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <template v-if="AuthorityObj.isShowStudyRebate">
-            <col width="6%" />
-          </template>
-         
-          <col width="6%" />
-          <col />
-        </colgroup>
-        <thead>
-          <tr class="fix_th">
-            <th width="12%">单号</th>
-            <th width="6%">人数</th>
-            <th width="6%">单价</th>
-            <th width="6%">教材费</th>
-            <th width="6%">课件费</th>
-            <th width="6%">总课时</th>
-            <th width="6%">成交</th>
-            <th width="6%">应收总额</th>
-            <th width="6%">实收</th>
-            <th width="6%">优惠</th>
-            <th width="6%">少价金额</th>
-            <th width="6%">退款</th>
-            <th width="6%">平台税金</th>
-            <th width="6%">待收金额</th>
-            <template v-if="AuthorityObj.isShowStudyRebate">
-              <th width="6%">留学订单回佣</th>
-            </template>
-            <th width="6%">状态</th>
-            <th v-if="viewType == 0">操作</th>
-          </tr>
-        </thead>
-      </table> -->
     </div>
     <div class="table-body" v-loading="loading">
       <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
-        <!-- <colgroup>
-          <col width="12%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <col width="6%" />
-          <template v-if="AuthorityObj.isShowStudyRebate">
-            <col width="6%" />
-          </template>
-         
-          <col width="6%" />
-          <col  v-if="viewType == 0" />
-        </colgroup> -->
         <tr class="fix_th">
             <th width="12%">单号</th>
             <th width="6%">人数</th>
             <th width="6%">单价</th>
-            <th width="6%">教材费</th>
-            <th width="6%">课件费</th>
-            <th width="6%">总课时</th>
+            <th width="6%" v-if="studyOrderType!=1">教材费</th>
+            <th width="6%" v-if="studyOrderType!=1">课件费</th>
+            <th width="6%" v-if="studyOrderType!=1">总课时</th>
             <th width="6%">成交</th>
             <th width="6%">应收总额</th>
             <th width="6%">实收</th>
@@ -261,20 +191,21 @@
               <template v-if="item.Class_Price >= 0">
                 {{ item.Class_Price.toFixed(2) }} 
               </br>
-              ({{item.SellPriceType==2?'课时单价':'课时总价'}})
+              <template v-if="studyOrderType!=1">
+                ({{item.SellPriceType==2?'课时单价':'课时总价'}})</template>
               </template>
             </td>
-            <td style="border:none;">
+            <td style="border:none;" v-if="studyOrderType!=1">
               <template v-if="item.TextbookFee >= 0">
                 {{ item.TextbookFee.toFixed(2) }}
               </template>
             </td>
-            <td style="border:none;">
+            <td style="border:none;" v-if="studyOrderType!=1">
               <template v-if="item.CoursewareFee >= 0">
                 {{ item.CoursewareFee.toFixed(2) }}
               </template>
             </td>
-            <td style="border:none;">
+            <td style="border:none;" v-if="studyOrderType!=1">
               
                 {{ item.TotalClassHours }}
           
@@ -519,7 +450,7 @@
             </td>
           </tr>
           <tr>
-            <td :colspan="17" style="text-align: left">
+            <td :colspan="studyOrderType!=1?17:14" style="text-align: left">
               <div class="row" v-if="item.GuestList && item.GuestList.length > 0">
                 学生名单：
                 <template v-for="(x, j) in item.GuestList" :index="j">
@@ -591,7 +522,7 @@
             </td>
           </tr>
           <tr>
-            <td :colspan="17" style="height: 168px;text-align: left">
+            <td :colspan="studyOrderType!=1?17:14" style="height: 168px;text-align: left">
               <div class="col row remarks q-gutter-x-md">
                 <div class="col">
                   <div>销售备注：</div>
@@ -950,7 +881,7 @@
         </template>
         <tbody v-if="cancelList && cancelList.length > 0">
           <tr>
-            <td :colspan="17">
+            <td :colspan="studyOrderType!=1?17:14">
               <span style="color:red;cursor:pointer;font-weight:bold;" @click="isShowCancel = !isShowCancel">取消订单</span>
             </td>
           </tr>
@@ -976,17 +907,17 @@
                   {{ item.Class_Price.toFixed(2) }}
                 </template>
               </td>
-              <td style="border:none;">
+              <td style="border:none;" v-if="studyOrderType!=1">
                 <template v-if="item.TextbookFee >= 0">
                   {{ item.TextbookFee.toFixed(2) }}
                 </template>
               </td>
-            <td style="border:none;">
+            <td style="border:none;" v-if="studyOrderType!=1">
               <template v-if="item.CoursewareFee >= 0">
                 {{ item.CoursewareFee.toFixed(2) }}
               </template>
             </td>
-            <td style="border:none;">
+            <td style="border:none;" v-if="studyOrderType!=1">
                 {{ item.TotalClassHours }}
             </td>
 
@@ -1361,6 +1292,10 @@
         type: Number,
         default: 0 //1-销售修改，2-OP修改，3-总经理修改
       },
+      studyOrderType: {
+        type: Number,
+        default: 0 //1-留学订单
+      },
       isShowEditBtn: {
         type: Number,
         default: null

src/pages/sale/studyOrder.vue

@@ -85,7 +85,7 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="1" @success="refreshClassOrder" ref="orderL"
+      <orderlist :dataList="data.List" :authObj="authObj" :studyOrderType="1" :modityOrderType="1" @success="refreshClassOrder" ref="orderL"
         :loading="loading">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">

src/pages/sale/studyOrderStatistics.vue

@@ -94,7 +94,7 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="3" @success="refreshClassOrder" ref="orderL" :loading="loading">
+      <orderlist :dataList="data.List" :authObj="authObj" :studyOrderType="1" :modityOrderType="3" @success="refreshClassOrder" ref="orderL" :loading="loading">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"