From 9be70fa9069795235cbcc8d72bd99a3ac1924edd Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 9 Sep 2025 10:58:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9A=E5=88=B6=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisSettlePayRecord/index.vue | 32 +++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index 887378f7..7f23dcd2 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -125,6 +125,17 @@
                   v-hasPermi="['emis:emisSettlePayRecord:export']"
                 >导出</el-button>
               </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleCustomExport"
+                  v-hasPermi="['emis:emisSettlePayRecord:customExport']"
+                >定制导出</el-button>
+              </el-col>
           </el-row>
       </div>
 
@@ -141,15 +152,15 @@
 
       <el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" width="170" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('流水号')" align="center" prop="payId" width="170" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('收款来源')" align="center" prop="settleType" width="80" >
+      <el-table-column :label="$t('支付类型')" align="center" prop="settleType" width="80" >
         <template slot-scope="scope">
               <el-tag type="success" v-if="scope.row.settleType == '1'">现金收款</el-tag>
               <el-tag type="success" v-if="scope.row.settleType == '2'">月结收款</el-tag>
-            </template>
+        </template>
       </el-table-column>
       <el-table-column :label="$t('缴款客户')" align="center" prop="payMan" width="150" :show-overflow-tooltip="true" />
       <!-- <el-table-column :label="$t('月结编号')" align="center" prop="payManCode" width="100" :show-overflow-tooltip="true"/> -->
-       <el-table-column :label="$t('支付类型')" align="center" prop="payType" width="150" >
+       <el-table-column :label="$t('收款来源')" align="center" prop="payType" width="150" >
           <template slot-scope="scope">
             <dict-tag  :options="dict.type.emis_settlebill_pay_type" :value="scope.row.payType"/>
           </template>
@@ -187,8 +198,11 @@
       <el-table-column label="登记人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="登记网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="登记时间" align="center" prop="createTime"  width="170"/>
-
-
+      <el-table-column label="账单编号" align="center" prop="settleBillNo"  width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="运单号" align="center" prop="billCodes"  width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="账单金额" align="center" prop="billAmount"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="开票金额" align="center" prop="invoiceAmount"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="开票状态" align="center" prop="invoiceStatus"  width="80" :show-overflow-tooltip="true"/>
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
@@ -806,6 +820,14 @@ export default {
     dateTimeChange(value){
         this.dateTimeRange=value;
     },
+    //定制导出
+    handleCustomExport(){
+      let settleBillNo = this.selectList[0].settleBillNo;
+      //获取选中
+      this.download('emis/emisSettlePayRecord/customExport', {
+        'settleBillNo':settleBillNo
+      }, `定制收款明细列表.xlsx`)
+    },
   }
 };
 </script>

From 8ef68fc0bf4c759b960b3c2e015723142b16fbe5 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 9 Sep 2025 11:25:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisSettlePayRecord/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index 7f23dcd2..8eb9e4d2 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -131,7 +131,6 @@
                   plain
                   icon="el-icon-download"
                   size="mini"
-                  :disabled="single"
                   @click="handleCustomExport"
                   v-hasPermi="['emis:emisSettlePayRecord:customExport']"
                 >定制导出</el-button>
@@ -822,10 +821,10 @@ export default {
     },
     //定制导出
     handleCustomExport(){
-      let settleBillNo = this.selectList[0].settleBillNo;
+      let qParam=this.initQueryParams();
       //获取选中
       this.download('emis/emisSettlePayRecord/customExport', {
-        'settleBillNo':settleBillNo
+        ...qParam
       }, `定制收款明细列表.xlsx`)
     },
   }