1

src/components/sale/myOrder-form.vue

@@ -342,7 +342,7 @@
             </q-td>
           </template>
           <template v-slot:body-cell-TradeWayList="props">
-            <q-td :props="props" class="row" style="align-items: center;height: auto">
+            <q-td :props="props" class="row" style="align-items: center;min-height: 48px;">
               <div v-if="props.row.TradeWayList&&props.row.TradeWayList.length>0" class="my-table-details">
                 <div v-for="(tw,twIn) in props.row.TradeWayList" :key="twIn"
                   style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;width:210px;display: flex;flex-direction: column;align-items: center">

src/components/sale/orderlist.vue

@@ -154,7 +154,7 @@
               </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)'>
+                <div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item)'>
                   已发提成：{{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>
@@ -1668,10 +1668,17 @@
           ContractId: subItem.ContractId
         });
       },
-      gourltx(OrderId) {
-        this.OpenNewUrl("/financial/cycleOrderList", {
-          OrderId: OrderId
-        });
+      gourltx(obj) {
+        if(obj.OrderType == 1){
+          this.OpenNewUrl("/financial/cycleOrderList", {
+            OrderId: obj.OrderId
+          });
+        }else{
+          this.OpenNewUrl("/financial/studyabroad/ordercommission", {
+            OrderId: obj.OrderId
+          });
+        }
+        
       },
       //合同提交审核
       goContractAudit(subItem) {

src/pages/financial/studyabroad/ordercommission.vue

@@ -129,7 +129,7 @@
             PeriodId: 0,
             UserId: 0,
             SourceId: '-1',
-            OrderId: 1,
+            OrderId: 0,
             UserIds:'',
           },
           pageCount: 0,
@@ -153,6 +153,9 @@
         if (this.$route.query && this.$route.query.UserIds) {
           this.msg.UserIds = this.$route.query.UserIds
         }
+        if (this.$route.query && this.$route.query.OrderId) {
+          this.msg.OrderId = this.$route.query.OrderId
+        }
         console.log( this.msg.PeriodId)
         this.getList()
         this.getStudyAbroad()