From dd1c0c28c5375db850b637a52c764e9543beb773 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 27 Dec 2023 18:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/listTransfer/index.vue | 98 ++++++++++++++++++++------
 1 file changed, 77 insertions(+), 21 deletions(-)

diff --git a/src/views/order/listTransfer/index.vue b/src/views/order/listTransfer/index.vue
index f67b5d2..97fd8b6 100644
--- a/src/views/order/listTransfer/index.vue
+++ b/src/views/order/listTransfer/index.vue
@@ -90,7 +90,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="商户类别：" style="display: inline-block;">
+            <!-- <el-form-item label="商户类别：" style="display: inline-block;">
               <el-select
                 v-model="tableFrom.is_trader"
                 clearable
@@ -101,7 +101,7 @@
                 <el-option label="自营" value="1" />
                 <el-option label="非自营" value="0" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="商品名称：" class="width100" style="display: inline-block;">
               <el-input
                 v-model="tableFrom.store_name"
@@ -191,34 +191,34 @@
             <span v-show="scope.row.is_del > 0" style="color: #ED4014;display: block;">用户已删除</span>
           </template>
         </el-table-column>
-        <el-table-column label="用户信息" min-width="170">
+        <!-- <el-table-column label="用户信息" min-width="170">
           <template slot-scope="scope">
              <el-button type="text" size="small" @click.native="onUserDetails(scope.row.uid)">{{scope.row.user&&scope.row.user.nickname +'/'+ scope.row.uid}}</el-button>
           </template>
-        </el-table-column>
-        <el-table-column label="订单类型" min-width="90">
+        </el-table-column> -->
+        <!-- <el-table-column label="订单类型" min-width="90">
           <template slot-scope="scope">
             <span>{{ scope.row.is_virtual == 1 ? "虚拟订单" : scope.row.order_type == 0 ? "普通订单" : "核销订单" }}</span>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="活动类型" min-width="100">
+        <el-table-column label="活动类型" min-width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.activity_type != 4">{{ scope.row.activity_type === 1 ? "秒杀" : scope.row.activity_type === 2 ? "预售" : scope.row.activity_type === 3 ? "助力" : "--"}}</span>
             <span v-else>拼团订单 <span v-if="scope.row.groupUser && scope.row.groupUser.groupBuying">-{{scope.row.groupUser.groupBuying.status | activityOrderStatus}}</span></span>
           </template>
-        </el-table-column> -->
-        <el-table-column prop="real_name" label="收货人/订购人" min-width="120" />
+        </el-table-column>
+        <el-table-column prop="real_name" label="收货人/订购人" min-width="120" /> -->
         <el-table-column label="商户名称" min-width="150">
           <template slot-scope="scope">
             <span>{{ scope.row.merchant ? scope.row.merchant.mer_name :'' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="mer_name" label="商户类别" min-width="90">
+        <!-- <el-table-column prop="mer_name" label="商户类别" min-width="90">
           <template slot-scope="scope">
             <span v-if="scope.row.merchant" class="spBlock">{{ scope.row.merchant.is_trader ? '自营' : '非自营' }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="商品信息" min-width="330">
+        </el-table-column> -->
+        <el-table-column label="商品信息" min-width="280">
           <template slot-scope="scope">
             <div
               v-for="(val, i) in scope.row.orderProduct"
@@ -235,22 +235,77 @@
                 class="tabBox_tit"
               >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
               <span class="tabBox_pice">
-                {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}
-                <em
+                <!-- {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} -->
+                {{' x '+ val.product_num}}
+                <!-- <em
                   v-if="val.refund_num < val.product_num && val.refund_num  > 0"
                   style="color: red;font-style: normal;"
-                >(-{{ val.product_num - val.refund_num }})</em>
+                >(-{{ val.product_num - val.refund_num }})</em> -->
               </span>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="实际支付" min-width="100">
+        <!-- <el-table-column label="实际支付" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.pay_price }}</span>
             <p v-if="scope.row.finalOrder">尾款：{{ scope.row.finalOrder.pay_price }}</p>
           </template>
+        </el-table-column> -->
+        <el-table-column prop="pay_price" label="订单金额" min-width="100" />
+        <el-table-column label="收款公司" min-width="320">
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_extend"
+            >
+              <div v-if="scope.row.order_extend.bank_info">
+                <div>公司名称: {{scope.row.order_extend.bank_info.company_name||'-'}}</div>
+                <div>对公账户: {{scope.row.order_extend.bank_info.corporate_account||'-'}}</div>
+                <div>开户行: {{scope.row.order_extend.bank_info.corporate_bank||'-'}}</div>
+                <div>开户行地址: {{scope.row.order_extend.bank_info.corporate_bank_address||'-'}}</div>
+              </div>
+              <div v-else>-</div>
+            </div>
+            <div v-else>-</div>
+          </template>
         </el-table-column>
-        <el-table-column label="订单佣金" min-width="100">
+        <el-table-column label="收款凭证" min-width="80" >
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_extend"
+              class="tabBox acea-row row-middle"
+            >
+              <div class="demo-image__preview" v-if="scope.row.order_extend.image">
+                <el-image
+                  :src="scope.row.order_extend.image"
+                  :preview-src-list="[scope.row.order_extend.image]"
+                />
+              </div>
+              <div v-else>-</div>
+            </div>
+            <div v-else>-</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="pay_price" label="手续扣除" min-width="100" >
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_extend&&scope.row.order_extend.commission_rate"
+            >
+              {{ scope.row.order_extend.commission_rate }}
+            </div>
+            <div v-else>-</div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="pay_price" label="押金扣除" min-width="100" /> -->
+        <el-table-column label="剩余金额" min-width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_extend&&scope.row.order_extend.commission_rate"
+            >
+              {{ (scope.row.pay_price - scope.row.order_extend.commission_rate).toFixed(2) }}
+            </div>
+            <div v-else>{{scope.row.pay_price}}</div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="pay_price" label="返点扣除" min-width="100" /> -->
+        <!-- <el-table-column prop="pay_price" label="应支付金额" min-width="100" /> -->
+        <!-- <el-table-column prop="pay_price" label="收款信息" min-width="180" /> -->
+        <!-- <el-table-column label="订单佣金" min-width="100">
           <template slot-scope="scope">
             <span>{{ (parseFloat(scope.row.extension_one) + parseFloat(scope.row.extension_two) + parseFloat(scope.row.refund_extension_one) + parseFloat(scope.row.refund_extension_two)).toFixed(2) }}</span>
             <em v-if="(scope.row.refund_extension_one > 0) || (scope.row.refund_extension_two > 0)" style="color: red;font-style: normal;">(-{{ (parseFloat(scope.row.refund_extension_one)+parseFloat(scope.row.refund_extension_two)).toFixed(2) }})</em>
@@ -261,12 +316,12 @@
             <span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
             <span v-else>--</span>
           </template>
-        </el-table-column>
-        <el-table-column label="支付状态" min-width="80">
+        </el-table-column> -->
+        <!-- <el-table-column label="支付状态" min-width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.paid == 0 ? "未支付" : "已支付" }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="订单状态" min-width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.is_del === 0">
@@ -284,7 +339,7 @@
             <span>{{ scope.row.create_time }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="推广人" min-width="100">
+        <!-- <el-table-column label="推广人" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.spread && scope.row.spread.nickname || '无' }}</span>
           </template>
@@ -293,7 +348,7 @@
           <template slot-scope="scope">
             <span>{{ scope.row.TopSpread && scope.row.TopSpread.nickname || '无' }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="操作" min-width="80" fixed="right" align="center">
           <template slot-scope="scope">
             <span v-for="(val, i ) in scope.row.orderProduct" :key="i">
@@ -690,6 +745,7 @@ export default {
       }).then(res=>{
         Message.success(res.message);
         this.closeDialogVoucher();
+        this.getList();
       }).catch(e=>{
         Message.error(e);
       })