日账单月账单页面调整

src/views/accounts/accountRecord/index.vue

@@ -47,6 +47,16 @@
             <span style="color: green;"> {{ scope.row.accounting }} </span>
           </template>
         </el-table-column>
+        <el-table-column v-if="shouldShowVrColumn" label="订单VR收益" prop="vr" min-width="130">
+          <template slot-scope="scope">
+            <span style="color: green;"> {{ scope.row.vr }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column  v-if="shouldShowFgColumn" label="订单复购金收益" prop="fg" min-width="130">
+          <template slot-scope="scope">
+            <span style="color: green;"> {{ scope.row.fg }} </span>
+          </template>
+        </el-table-column>
         <el-table-column label="京豆" prop="jingdou" min-width="130">
           <template slot-scope="scope">
             <span style="color: green;"> {{ scope.row.jingdou }} </span>
@@ -92,7 +102,7 @@
             >
               <el-option label="全部" value="" />
               <el-option label="自营订单入账" :value="1" />
-              <el-option label="佣金提现到账" :value="2" />
+              <!-- <el-option label="佣金提现到账" :value="2" />-->
               <!-- <el-option label="订单支付" :value="3" />
               <el-option label="商户佣金提现" :value="4" />
               <el-option label="用户佣金提现" :value="5" />
@@ -105,24 +115,30 @@
 
         <el-form size="small" label-width="100px">
           <el-form-item label="订单总流水:" class="width100">
-            <span> {{ detailMoneyData.order_in_money }}  </span>
+            <span> {{ detailMoneyData.platform_enter_all }}  </span>
           </el-form-item>
 
           <el-form-item label="入账总金额:" class="width100">
-            <span> {{ detailMoneyData.platform_enter_all }}  </span>
+            <span> {{ detailMoneyData.order_in_money }}  </span>
             <!-- <span style="margin-left: 30px;">佣金提现到账: {{ detailMoneyData.yongjin_out_all }}  </span>
             <span style="margin-left: 30px;">自营订单入账: {{ detailMoneyData.yanglao_out_red_all }}  </span> -->
-            <span style="margin-left: 30px;">佣金提现到账: {{ detailMoneyData.yongjin_out_all }}  </span>
-            <span style="margin-left: 30px;">自营订单入账: {{ detailMoneyData.platform_enter_all }}  </span>
-          </el-form-item> 
-        <!-- <el-form-item label="佣金提现:" class="width100">
-              </el-form-item>
-              <el-form-item label="养老金(红积分兑换订单):" class="width100">=
-              </el-form-item> -->
+<!--            <span style="margin-left: 30px;">佣金提现到账: {{ detailMoneyData.yongjin_out_all }}  </span>-->
+<!--            <span style="margin-left: 30px;">自营订单入账: {{ detailMoneyData.platform_enter_all }}  </span>-->
+          </el-form-item>
+          <el-form-item v-if="shouldShowVrColumn" label="订单VR收益:" class="width100">
+            <span> {{ detailMoneyData.order_in_vr }}  </span>
+          </el-form-item>
+          <el-form-item v-if="shouldShowFgColumn" label="订单复购金收益:" class="width100">
+            <span> {{ detailMoneyData.order_in_fg }}  </span>
+          </el-form-item>
+          <!-- <el-form-item label="佣金提现:" class="width100">
+                </el-form-item>
+                <el-form-item label="养老金(红积分兑换订单):" class="width100">=
+                </el-form-item> -->
         </el-form>
 
         <div class="bottom-button">
-          <el-button size="small" style="width: 100px; margin-top: 20px; border: 1px solid; #999" @click="detailReset">重置</el-button>
+          <el-button size="small" style="width: 100px; margin-top: 20px; border: 1px solid;" @click="detailReset">重置</el-button>
           <el-button type="primary" size="small" style="width: 100px; margin-top: 20px;" @click="getDayBillDetail(1)">查询</el-button>
         </div>
 
@@ -148,6 +164,8 @@
             <span v-if="scope.row.deal_type == 7" style="color: green;"> -{{ scope.row.money }} </span>
           </template>
         </el-table-column>
+        <el-table-column v-if="shouldShowVrColumn" label="订单VR收益" prop="vr" min-width="230" />
+        <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>
@@ -195,14 +213,22 @@
             <span v-if="orderDidideAccountData.money"> {{ orderDidideAccountData.money }}  </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> 
+          <el-form-item v-if="shouldShowVrColumn" label="订单VR收益:" class="width100">
+            <span v-if="orderDidideAccountData.vr"> {{ orderDidideAccountData.vr }}  </span>
+            <span v-else> 0  </span>
           </el-form-item>
-          <el-form-item label="汇付通道服务费:" class="width100">
-            <span v-if="orderDidideAccountData.order_info"> {{ orderDidideAccountData.order_info.hf_fee_amt }}  </span>
+          <el-form-item v-if="shouldShowFgColumn" label="订单复购金收益:" class="width100">
+            <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.order_info"> {{ orderDidideAccountData.order_info.shop_bonus_price }}  </span>-->
+<!--            <span v-else> 0  </span> -->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="汇付通道服务费:" class="width100">-->
+<!--            <span v-if="orderDidideAccountData.order_info"> {{ orderDidideAccountData.order_info.hf_fee_amt }}  </span>-->
+<!--            <span v-else> 0  </span>-->
+<!--          </el-form-item>-->
         </el-form>
       </div>
     </el-dialog>
@@ -341,7 +367,6 @@ export default {
       },
 
       LogLoading: false,
-      dialogVisible: false,
       fileVisible: false,
       cardLists: [],
       orderDatalist: null,
@@ -357,6 +382,20 @@ export default {
       }}
     }
   },
+  computed: {
+    shouldShowVrColumn() {
+      if (this.tableData && this.tableData.data && this.tableData.data.length > 0) {
+        return this.tableData.data.some(row => row.mer_id == 496 || row.mer_id == 436);
+      }
+      return false;
+    },
+    shouldShowFgColumn() {
+      if (this.tableData && this.tableData.data && this.tableData.data.length > 0) {
+        return this.tableData.data.some(row => row.mer_id == 491);
+      }
+      return false;
+    }
+  },
   mounted() {
     this.getList(1)
   },