页面修改

src/components/sale/orderlist.vue

@@ -51,7 +51,7 @@
           <col width="7%" />
           <col width="7%" />
           <col width="7%" />
-          <col width="7%" v-if="viewType==0"/>
+          <col width="7%" v-if="viewType==0" />
           <col>
         </colgroup>
         <tr>
@@ -62,8 +62,19 @@
             <td :rowspan="3" style="text-align: left">
               <div class="order_OfferId" @click="goOrderdetails(item,1)">{{item.OrderId}}
               </div>
-              <div class="order_OfferId" v-if="item.RenewOrderId&&item.RenewOrderId>0">
-                原订单:{{item.RenewOrderId}}
+              <div class="order_OfferId" v-if="item.TargetJoinType==1">
+                <template v-if="item.JoinType==3">
+                  原订单:{{item.SourceOrderId}}
+                </template>
+                <template v-if="item.JoinType==4">
+                  从【{{item.SourceClassName}}】转入。关联订单号{{item.SourceOrderId}}
+                </template>
+              </div>
+              <div class="order_OfferId" v-if="item.TargetJoinType==3">
+                续费订单:{{item.TargetOrderId}}
+              </div>
+              <div class="order_OfferId" v-if="item.TargetJoinType==4">
+                已转班【{{item.TargetClassName}}】,关联订单号{{item.TargetOrderId}}
               </div>
               <div>{{item.EnterName}}</div>
               <div style="margin-top: 10px">{{item.CreateTime}}</div>
@@ -90,16 +101,16 @@
               </template>
               <template v-if="item.OrderType==1">
                 <div v-if="item.CourseName">课程名称:{{item.CourseName}}</div>
-                <div v-if="item.IsChaBan==1" style="color:red;">
+                <div v-if="item.JoinType==2" style="color:red;">
                   插班报入
                     <q-tooltip :offset="[10, 10]">
                                   <div>开始课时：{{item.StartClassHours}}</div>
                                   <div>生效状态：{{item.EffectStatusStr}}</div>
                                   <div>生效时间：{{item.EffectTime}}</div>
-                                  <template v-if="item.UpOrderId&&item.UpOrderId>0">
+                        <template v-if="item.UpOrderId&&item.UpOrderId>0">
                       <div>前置订单：{{item.UpOrderId}}</div>
                     </template>
-                                </q-tooltip>
+                  </q-tooltip>
                 </div>
               </template>
               <div style="margin-top:10px;" v-if="item.OfferId>0">
@@ -780,7 +791,8 @@
     <myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
 
     <!--班级详情-->
-    <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" :isShowEditBtn="isShowEditBtn" @close="closeClass" @success="refreshOrder">
+    <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" :isShowEditBtn="isShowEditBtn"
+      @close="closeClass" @success="refreshOrder">
     </classinfo-form>
 
     <!--退课申请-->
@@ -794,7 +806,7 @@
     <!--续课申请-->
     <continueclass-form v-if="isShowContinueClass" :save-obj="orderObj" @close="closeContinueClassForm"
       @success="refreshOrder"></continueclass-form>
-    
+
     <!-- 转班申请 -->
     <transferclass-form v-if="isShowTransferClass" :save-obj="orderObj" @close="closeTransferClassForm"
       @success="refreshOrder"></transferclass-form>
@@ -872,13 +884,13 @@
         type: Number,
         default: 0, //1-销售修改，2-OP修改，3-总经理修改
       },
-      isShowEditBtn:{
+      isShowEditBtn: {
         type: Number,
         default: null
       },
-      viewType:{
-        type:Number,
-        default:0
+      viewType: {
+        type: Number,
+        default: 0
       }
     },
     data() {
@@ -930,7 +942,7 @@
         isEditOrder: false, //是否有【总经理】修改订单但权限
         newModityOrderType: 0,
         isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
-        isShowTransferClass:false //是否显示转班
+        isShowTransferClass: false //是否显示转班
       }
     },
     created() {
@@ -971,8 +983,7 @@
         immediate: true
       }
     },
-    mounted() {
-    },
+    mounted() {},
     methods: {
       //初始化权限信息
       initAuth() {
@@ -1071,13 +1082,13 @@
       },
 
       //转班
-      transferClass(item){
+      transferClass(item) {
         this.orderObj = item;
         this.isShowTransferClass = true;
       },
 
       //关闭转班
-      closeTransferClassForm(){
+      closeTransferClassForm() {
         this.orderObj = {};
         this.isShowTransferClass = false;
       },
@@ -1186,7 +1197,7 @@
         } else { //留学就业订单
           this.isShowStudyOrderForm = true;
         }
-        this.isChaBan = item.IsChaBan;
+        this.isChaBan = item.JoinType==2?1:0;
       },
       //刷新页面
       refreshOrder() {