日账单月账单页面调整

src/views/accounts/accountRecord/index.vue

@@ -149,7 +149,7 @@
         <el-table-column label="关联订单" min-width="200">
           <template slot-scope="scope">
             <span v-if="scope.row.deal_type == 2" style="color: blue"> -- </span>
-            <span v-else style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)"> {{ scope.row.order_sn }} </span>
+            <span v-else style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn, scope.row.order_type)"> {{ scope.row.order_sn }} </span>
           </template>
         </el-table-column>
         <el-table-column label="交易时间" prop="deal_time" min-width="230" />
@@ -168,7 +168,7 @@
         <el-table-column v-if="shouldShowFgColumn" label="订单复购金收益" prop="fg" min-width="230" />
         <el-table-column label="交易类型" min-width="150">
           <template slot-scope="scope">
-            <span v-if="scope.row.deal_type == 1"> 自营订单入账 <el-button type="primary" size="small" @click="checkOrderFenZhangDetail(scope.row)">明细</el-button></span>
+            <span v-if="scope.row.deal_type == 1 && scope.row.order_type === 0"> 自营订单入账 <el-button type="primary" size="small" @click="checkOrderFenZhangDetail(scope.row)">明细</el-button></span>
             <!-- <el-button v-if="scope.row.deal_type == 1" type="primary" size="small" @click="checkOrderFenZhangDetail(scope.row)">明细</el-button> -->
             <span v-if="scope.row.deal_type == 2"> 佣金提现到账 </span>
             <span v-if="scope.row.deal_type == 3"> 订单支付 </span>
@@ -221,6 +221,10 @@
             <span v-if="orderDidideAccountData.fg"> {{ orderDidideAccountData.fg }}  </span>
             <span v-else> 0  </span>
           </el-form-item>
+          <el-form-item label="订单分润:" class="width100">
+            <span v-if="orderDidideAccountData.fenrun"> {{ orderDidideAccountData.fenrun }}  </span>
+            <span v-else> 0  </span>
+          </el-form-item>
 <!--          <el-form-item label="创客让利总额:" class="width100">-->
 <!--            <span v-if="orderDidideAccountData.order_info"> {{ orderDidideAccountData.order_info.shop_bonus_price }}  </span>-->
 <!--            <span v-else> 0  </span> -->
@@ -505,11 +509,17 @@ export default {
       }
     },
 
-    pushToOrderList(orderIds) {
-      this.$router.push({
-        path: roterPre + '/order/list/',
-        query: { order_sn: orderIds }
-      })
+    pushToOrderList(orderIds, orderType = 0) {
+      if (orderType === 0) {
+        this.$router.push({
+          path: roterPre + "/order/list/",
+          query: { order_sn: orderIds },
+        });
+      } else if (orderType === 9) {
+        alert('暂时无法跳转')
+      } else if (orderType === 10) {
+        alert('暂时无法跳转')
+      }
     },
 
     exportSearchResult() {