From 8066f5229c2eff6fca8d7c9622046915b10e7cdb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 6 May 2025 12:43:34 +0800
Subject: [PATCH] md

---
 .../PayBackStat/PayBackRecordList.vue         | 143 +++++++++---------
 1 file changed, 72 insertions(+), 71 deletions(-)

diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue
index deb3694e..75dbce92 100644
--- a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue
+++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue
@@ -10,7 +10,7 @@
 
                 ref="refTable"
 
-                storageName="paybackrecord_query_main_250501"
+                storageName="paybackrecord_query_main_250502"
                 :data="emisSettleBillList"
                 :showSearch.sync="showSearch"
                 :queryParams="queryParams"
@@ -35,87 +35,87 @@
             </el-row>
           </div>
 
-          <!-- 账单名称	账单月份	账期	运单号	客户名称	支付方式	付款方式	开票状态	开票金额	收款状态	账单金额	账单退款金额	理赔金额	折让金额	抵扣金额	其他收费	收款金额	收款时间	收款登记人	销售联系人	回款联系人	寄件公司	件数	重量	实际重量	体积	结算重量	线路	产品类型	收款登记备注 -->
+          <!-- 账单名称	账单月份	账期	运单号	客户名称	支付方式	付款方式	开票状态	开票金额
+           收款状态	账单金额	账单退款金额	理赔金额	折让金额	抵扣金额	其他收费	收款金额
+           收款时间	收款登记人,收款登记备注
+           销售联系人	回款联系人
+           寄件公司	件数	重量	实际重量	体积	结算重量	线路
+           产品类型	 -->
 
             <el-table-column type="selection" width="55" align="center" />
-            <el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="200" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" width="80" />
-            <el-table-column :label="$t('账单期间')" align="center" prop="billMonthRange" width="200" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                  <div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
-                <el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
-                <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
-                <el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
-                <el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
-                <el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
-                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
-              </template>
-            </el-table-column>
-
-            <el-table-column :label="$t('核销状态')" align="center" prop="chargeStatus" width="100" >
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.chargeStatus=='0'" type="error">未核销</el-tag>
-                <el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
-              </template>
-            </el-table-column>
+            <el-table-column :label="$t('账单名称')" align="left" prop="settleBillDetail.settleBillName" width="200" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('账单月份')" align="center" prop="settleBillDetail.billMonth" width="80" />
+            <el-table-column :label="$t('账期(天)')" align="center" prop="settleBillDetail.creditPeriod" min-width="100" />
+            <el-table-column :label="$t('运单号')" align="center" prop="billCode" width="120" />
             <el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                  <span  type="normal">{{ scope.row.custName }}</span>
+                  <span  type="normal">{{ scope.row.settleBillDetail.custName }}</span>
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
-            <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
-            <el-table-column :label="$t('结算重量')" align="center" prop="feeWeight" width="80" />
-            <el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" width="150" />
-            <el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" width="150" />
-            <el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" width="150" />
-            <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="80" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="80" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="80" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="80" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true"   >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('付款方式')" align="center" prop="payType" width="100" >
+              <template slot-scope="scope">
+                    <span v-if="scope.row.settlePayRecordDetail.payType == '1'">微信支付</span>
+                    <span v-if="scope.row.settlePayRecordDetail.payType == '2'">支付宝支付</span>
+                    <span v-if="scope.row.settlePayRecordDetail.payType == '3'">企业微信收款</span>
+                    <span v-if="scope.row.settlePayRecordDetail.payType == '4'">对公付款</span>
+                    <span v-if="scope.row.settlePayRecordDetail.payType == '5'">其他</span>
+                  </template>
+            </el-table-column>
+            <el-table-column :label="$t('开票状态')" align="center" prop="settleSubBill.openBillStatus" width="100" >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.settleSubBill.openBillStatus=='0'" type="error">未开票</el-tag>
+                <el-tag v-if="scope.row.settleSubBill.openBillStatus=='1'" type="success">已开票</el-tag>
+                <el-tag v-if="scope.row.settleSubBill.openBillStatus=='2'" type="warning">部分开票</el-tag>
+                <el-tag v-if="scope.row.settleSubBill.openBillStatus=='3'" type="warning">不开票</el-tag>
+                <el-tag v-if="scope.row.settleSubBill.openBillStatus=='4'" type="success">已完成</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('开票金额')" align="center" prop="settleSubBill.invoicedMoney" width="80" />
+            <el-table-column :label="$t('收款状态')" align="center" prop="settleSubBill.paymentStatus" width="100" >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.settleSubBill.paymentStatus=='0'" type="error">未收款</el-tag>
+                <el-tag v-if="scope.row.settleSubBill.paymentStatus=='1'" type="success">已收款</el-tag>
+                <el-tag v-if="scope.row.settleSubBill.paymentStatus=='2'" type="warning">部分收款</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('账单金额')" align="center" prop="settleBillDetail.recMoney" width="150" />
+            <el-table-column :label="$t('账单退款金额')" align="center" prop="settleBillDetail.refundMoney" width="150" />
+            <el-table-column :label="$t('理赔金额')" align="center" prop="settleBillDetail.satisfyMoney" width="80" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('折让金额')" align="center" prop="settleBillDetail.allowanceMoney" width="80" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('抵扣金额')" align="center" prop="settleBillDetail.deductionMoney" width="80" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('其他收费')" align="center" prop="settleBillDetail.otherMoney" width="80" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('收款金额')" align="center" prop="payMoney" width="80" />
+            <el-table-column :label="$t('收款时间')" align="center" prop="settlePayRecordDetail.tradeDate" width="170" :show-overflow-tooltip="true"/>
+            <el-table-column label="登记人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="登记时间" align="center" prop="settlePayRecordDetail.createTime"  width="170"/>
+            <el-table-column :label="$t('回款联系人')" align="center" prop="settleBillDetail.payee" width="100" />
+            <el-table-column :label="$t('销售联系人')" align="center" prop="settleBillDetail.salesmen" width="100" />
+            <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sortable="true"   :show-overflow-tooltip="true"/>
 
-            <el-table-column :label="$t('理赔原因')" align="center" prop="satisfyMoney" width="100"  :show-overflow-tooltip="true" />
-            <el-table-column :label="$t('折让原因')" align="center" prop="allowanceReason" width="100" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('抵扣原因')" align="center" prop="deductionReason" width="100"  :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('其他原因')" align="center" prop="otherReason" width="100"  :show-overflow-tooltip="true" />
-            <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
-            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
-
-            <el-table-column :label="$t('账期(天)')" align="center" prop="creditPeriod" min-width="100" />
-            <el-table-column :label="$t('账单日')" align="center" prop="settleDay" min-width="100" />
-            <el-table-column :label="$t('最后回款日')" align="center" prop="paymentDueDate" min-width="170" />
-
-
-            <el-table-column :label="$t('账单生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
-
-            <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
+            <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true"   :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sortable="true"   :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80"      />
+            <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80"    />
+            <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
+            <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80"   />
+            <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="120" :sortable="true"  />
+            <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80"    >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
-                  <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
-                  <el-tag v-if="scope.row.blConfirmSite=='2'" type="error">确认不出账</el-tag>
-                  <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
+                    <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
+                    <span v-else>{{scope.row.waybillDetail.freight}}</span>
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
-            <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
-            <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
 
-            <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="updateByName"  width="80" :show-overflow-tooltip="true"/>
-            <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-            <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
 
           </XdTable>
 
@@ -207,6 +207,7 @@ export default {
       }
   },
   created() {
+    this.getList();
   },
   methods: {
   /** 查询结算总账单列表 */