From fead504e209300d26cde872a78dee76bf2a674bb Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Fri, 28 Apr 2023 15:02:40 +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/pay/payOrder/payuOrderWater.vue | 23 +++++++++++++++++------
 src/views/pay/payOrder/payuwater.vue      |  8 ++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/views/pay/payOrder/payuOrderWater.vue b/src/views/pay/payOrder/payuOrderWater.vue
index 6093942..b80cac9 100644
--- a/src/views/pay/payOrder/payuOrderWater.vue
+++ b/src/views/pay/payOrder/payuOrderWater.vue
@@ -33,8 +33,8 @@
                     <el-input size="medium" v-model="queryParams.acctName" placeholder="请输入开户名"
                         @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
                 </el-form-item>
-                <el-form-item label="银行地址" prop="acctId">
-                    <el-input size="medium" v-model="queryParams.acctId" placeholder="请输入银行地址"
+                <el-form-item label="收款地址" prop="acctId">
+                    <el-input size="medium" v-model="queryParams.acctId" placeholder="请输入收款地址"
                         @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
                 </el-form-item>
                 <!-- <el-form-item label="身份证号码" prop="certId">
@@ -62,12 +62,12 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="是否发起代付" prop="isPayment">
+                <!-- <el-form-item label="是否发起代付" prop="isPayment">
                     <el-select v-model="queryParams.isPayment" placeholder="请选择是否发起代付" size="medium">
                         <el-option v-for="dict in dict.type.yes_no" :key="dict.value" :label="dict.label"
                             :value="dict.value" />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
 
                 <el-form-item label="用户类型" prop="userType">
                     <el-select v-model="queryParams.userType" placeholder="请选择用户类型" size="medium">
@@ -149,6 +149,18 @@
                     </template>
                 </el-table-column>
 
+                <el-table-column :label="'交易hash'" align="center" prop="transactionId" min-width="150">
+                    <template slot-scope="scope">
+                        {{ scope.row.transactionId }}
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="'系统出款地址'" align="center" prop="storeNo" min-width="150">
+                    <template slot-scope="scope">
+                        {{ scope.row.attach }}
+                    </template>
+                </el-table-column>
+
                 <el-table-column :label="'收款地址'" align="center" prop="storeNo" min-width="180">
                     <template slot-scope="scope">
                         {{ scope.row.acctId }}
@@ -160,10 +172,9 @@
                         {{ scope.row.tranFee }}
                     </template>
                 </el-table-column>
-                <el-table-column :label="'代付状态\n是否发起'" align="center" prop="storeNo">
+                <el-table-column :label="'代付状态'" align="center" prop="storeNo">
                     <template slot-scope="scope">
                         {{ scope.row.orderStatusName }}<br />
-                        {{ scope.row.isPayment == 'yes' ? '已发起' : '未发起' }}
                     </template>
                 </el-table-column>
                 <el-table-column :label="'对公对私\n出款账号'" align="center" prop="storeNo" min-width="150">
diff --git a/src/views/pay/payOrder/payuwater.vue b/src/views/pay/payOrder/payuwater.vue
index 4b056b9..83e54d3 100644
--- a/src/views/pay/payOrder/payuwater.vue
+++ b/src/views/pay/payOrder/payuwater.vue
@@ -130,6 +130,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="交易hash" align="center" prop="transactionId" min-width="150" />
+
+                <el-table-column :label="'付款地址\n系统收款地址'" align="center" prop="storeNo" min-width="160">
+                    <template slot-scope="scope">
+                        {{ scope.row.attach }}<br />
+                        {{ scope.row.productName }}
+                    </template>
+                </el-table-column>
+
                 <el-table-column :label="'商户名称\n商户编号'" align="center" prop="storeNo" min-width="150">
                     <template slot-scope="scope">
                         {{ scope.row.storeName }}<br />