From 4d5e804b055e765cd5fb64c7d89356ca74d05d20 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 20 Mar 2024 10:48:25 +0800
Subject: [PATCH] 1

---
 src/views/order/list/index.vue | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue
index 221704d..db60d75 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -171,10 +171,10 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="支付凭证" min-width="80">
+        <el-table-column label="付款凭证" min-width="80">
           <template slot-scope="scope">
             <div class="demo-image__preview"
-              v-if="scope.row.pay_type == 10 && scope.row.order_extend.corporate_voucher">
+              v-if="scope.row.pay_type == 10 && scope.row.order_extend && scope.row.order_extend.corporate_voucher">
               <el-image style="width: 36px; height: 36px" :src="scope.row.order_extend.corporate_voucher"
                 :preview-src-list="[scope.row.order_extend.corporate_voucher]" />
             </div>
@@ -182,6 +182,16 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="收款凭证" min-width="80">
+          <template slot-scope="scope">
+            <div class="demo-image__preview" v-if="scope.row.pay_type == 10 && scope.row.financial_voucher">
+              <el-image style="width: 36px; height: 36px" :src="scope.row.financial_voucher"
+                :preview-src-list="[scope.row.financial_voucher]" />
+            </div>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="订单状态" min-width="80">
           <template slot-scope="scope">
             <span v-if="scope.row.is_del === 0">
@@ -207,8 +217,9 @@
                 @click="onRefundDetail(scope.row.order_sn)">查看退款单</el-button>
             </span>
             <el-button type="text" size="small" @click="onOrderDetails(scope.row.order_id)">详情</el-button>
+            <!-- 用户上传凭证之后 才能收款凭证 -->
             <el-button
-              v-if="!scope.row.order_extend.corporate_voucher && scope.row.pay_type == 10 && scope.row.paid == 0"
+              v-if="scope.row.pay_type == 10 && scope.row.paid == 0 && scope.row.order_extend && scope.row.order_extend.corporate_voucher"
               type="text" size="small" @click="uploadVoucher(scope.row)">上传凭证</el-button>
           </template>
         </el-table-column>
@@ -379,13 +390,12 @@ export default {
 
     // 上传凭证
     uploadVoucher(data) {
-      this.voucherInfo.id = data.order_id;
+      this.voucherInfo.id = data.group_order_id;
       this.voucherInfo.order_sn = data.order_sn;
       this.dialogVoucher = true;
     },
 
     async uploadVoucherImage(options) {
-      console.log('上传', options);
       const file = options.file;
       const formData = new FormData();
       formData.append('file', file);
@@ -396,6 +406,7 @@ export default {
         this.$message.error(e);
       })
     },
+
     // 上传
     addVoucher() {
       if (!this.voucherInfo.image) return this.$message.error('请先上传凭证!');