This commit is contained in:
linfso 2024-08-14 08:37:11 +08:00
parent f4801224a8
commit b881293324
3 changed files with 80 additions and 70 deletions

View File

@ -1,7 +1,7 @@
<template>
<XdPageContainer >
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="queryCode" label-width="80px">
<el-form-item label="" prop="" label-width="80px">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
@ -294,6 +294,7 @@ export default {
currentSettleBillNo:null,
queryCode:null,
queryOrderType:null,
// 弹出展示层

View File

@ -16,7 +16,7 @@
/>
</el-form-item>
<el-form-item label="开票时间" prop="">
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
<elDateAdvPicker placeholder="开票时间" v-model="dateTimeRange" style="z-index:9999;width:300px" ></elDateAdvPicker>
</el-form-item>
<el-form-item :label="$t('开票状态')" prop="openBillStatus">
@ -33,7 +33,6 @@
v-model="queryParams.companyName"
:placeholder="$t('开票抬头')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开票税号" prop="companyTaxNo">
@ -41,7 +40,14 @@
v-model="queryParams.companyTaxNo"
:placeholder="$t('开票税号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发票号" prop="invoiceNo">
<el-input
v-model="queryParams.invoiceNo"
:placeholder="$t('发票号')"
clearable
/>
</el-form-item>
@ -51,7 +57,6 @@
v-model="queryParams.salerCompanyName"
:placeholder="$t('主体名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="主体税号" prop="salerCompanyTaxNo">
@ -59,7 +64,6 @@
v-model="queryParams.salerCompanyTaxNo"
:placeholder="$t('主体税号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -186,6 +190,7 @@
</template>
</el-table-column>
<!-- <el-table-column :label="$t('账期')" align="center" prop="settleBill.billMonth" width="80" :show-overflow-tooltip="true" /> -->
<el-table-column :label="$t('账期')" align="center" prop="billMonth" width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('代垫费用')" align="center" prop="ddfy" width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('折让')" align="center" prop="zr" width="80" :show-overflow-tooltip="true" />
@ -232,7 +237,6 @@
<!-- <el-table-column :label="$t('扩展信息,货物名称')" align="center" prop="extData" width="100" :show-overflow-tooltip="true" /> -->
<el-table-column :label="$t('开票备注')" align="center" prop="remark" width="100" :show-overflow-tooltip="true" />
<el-table-column :label="$t('账期')" align="center" prop="settleBill.billMonth" width="80" :show-overflow-tooltip="true" />
@ -278,8 +282,6 @@ export default {
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 渠道开票记录表表格数据
@ -296,7 +298,6 @@ export default {
id:null,
titleView:"",
openView: false,
// 更新站点时间范围
dateTimeRange: [],
// 查询参数
queryParams: {

View File

@ -1,6 +1,21 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="queryCode" label-width="80px">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<el-radio :key="2" label="2">账单号</el-radio>
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.queryCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
</el-form-item>
<el-form-item label="支付类型" prop="payType">
<el-select v-model="queryParams.payType" placeholder="收款方式" clearable filterable style="width:100%">
@ -34,10 +49,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="总账单号" prop="settleBillNo">
<el-form-item label="账单号" prop="settleBillNo">
<el-input
v-model="queryParams.settleBillNo"
:placeholder="$t('总账单号')"
:placeholder="$t('账单号')"
clearable
@keyup.enter.native="handleQuery"
/>
@ -76,9 +91,15 @@
</SearchForm>
<XdTable v-loading="loading"
border stripe
size="small"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
size="mini"
storageName="emisSettlePayRecordList_main_s"
@ -126,7 +147,7 @@
v-hasPermi="['emis:emisSettlePayRecord:remove']"
>作废</el-button>
</el-col> -->
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -135,7 +156,7 @@
@click="handleExport"
v-hasPermi="['emis:emisSettlePayRecord:export']"
>导出</el-button>
</el-col>
</el-col> -->
</el-row>
</div>
@ -146,26 +167,17 @@
</template>
</el-table-column>
<el-table-column :label="$t('支付流水号')" align="center" prop="payId" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收款来源')" align="center" prop="settleType" min-width="80" >
<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" >
<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>
<span v-else>其他</span>
</template>
</el-table-column>
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('审核状态')" align="center" prop="blAudit" min-width="100" >
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.blAudit == '1'">审核通过</el-tag>
<el-tag type="error" v-if="scope.row.blAudit == '2'">审核不通过</el-tag>
<span v-else>未审核</span>
</template>
</el-table-column>
<el-table-column :label="$t('缴款客户')" align="center" prop="payMan" min-width="100" />
<el-table-column :label="$t('月结编号')" align="center" prop="payManCode" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('支付类型')" align="center" prop="payType" min-width="100" >
<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="100" >
<template slot-scope="scope">
<span v-if="scope.row.payType == '1'">微信支付</span>
<span v-if="scope.row.payType == '2'">支付宝支付</span>
@ -175,49 +187,39 @@
</template>
</el-table-column>
<el-table-column :label="$t('收付类型')" align="center" prop="recType" min-width="100" >
<el-table-column :label="$t('收付类型')" align="center" prop="recType" width="80" >
<template slot-scope="scope">
<span v-if="scope.row.recType == '1'">收款</span>
<span v-if="scope.row.recType == '2'">退款</span>
</template>
</el-table-column>
<el-table-column :label="$t('支付金额')" align="center" prop="payMoney" min-width="100" />
<el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="170" />
<el-table-column :label="$t('审核人')" align="center" prop="auditManCode" min-width="100" />
<el-table-column :label="$t('审核站点')" align="center" prop="auditSiteCode" min-width="100" />
<!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" /> -->
<el-table-column :label="$t('支付状态')" align="center" prop="payStatus" min-width="100" >
<el-table-column :label="$t('支付状态')" align="center" prop="payStatus" width="100" >
<template slot-scope="scope">
<span v-if="scope.row.payStatus == '0'">未支付</span>
<span v-if="scope.row.payStatus == '1'">已支付</span>
<span v-if="scope.row.payStatus == '2'">支付异常</span>
<el-tag type="info" v-if="scope.row.payStatus == '0' || scope.row.payStatus==null">未支付</el-tag>
<el-tag type="warning" v-if="scope.row.payStatus == '1'">支付中</el-tag>
<el-tag type="warning" v-if="scope.row.payStatus == '2'">支付成功</el-tag>
<el-tag type="error" v-if="scope.row.payStatus == '3'">支付失败 </el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('异常描述')" align="center" prop="payStatusDesc" min-width="100" />
<!-- <el-table-column :label="$t('收款人代码')" align="center" prop="recManCode" min-width="100" />
<el-table-column :label="$t('结算类型')" align="center" prop="settleType" min-width="100" />
<el-table-column :label="$t('退款日期')" align="center" prop="refundDate" min-width="100" />
<el-table-column :label="$t('退款人')" align="center" prop="refundManCode" min-width="100" />
<el-table-column :label="$t('退款序号')" align="center" prop="refundSeq" min-width="100" />
<el-table-column :label="$t('退款模式')" align="center" prop="refundMode" min-width="100" />
<el-table-column :label="$t('退款金额')" align="center" prop="refundMoney" min-width="100" />
<el-table-column :label="$t('退款原因')" align="center" prop="refundReason" min-width="100" />
<el-table-column :label="$t('退款备注')" align="center" prop="refundRemark" min-width="100" />
<el-table-column :label="$t('退款操作人')" align="center" prop="refundOpManCode" min-width="100" />
<el-table-column :label="$t('退款登记站点')" align="center" prop="refundRegisterSiteCode" min-width="100" />
<el-table-column :label="$t('退款登记人')" align="center" prop="refundRegisterManCode" min-width="100" />
<el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" min-width="100" />
<el-table-column :label="$t('理赔原因')" align="center" prop="satisfyReason" min-width="100" /> -->
<!-- <el-table-column :label="$t('allowance_money')" align="center" prop="allowanceMoney" min-width="100" />
<el-table-column :label="$t('allowance_reason')" align="center" prop="allowanceReason" min-width="100" />
<el-table-column :label="$t('deduction_money')" align="center" prop="deductionMoney" min-width="100" />
<el-table-column :label="$t('deduction_reason')" align="center" prop="deductionReason" min-width="100" />
<el-table-column :label="$t('other_money')" align="center" prop="otherMoney" min-width="100" />
<el-table-column :label="$t('other_reason')" align="center" prop="otherReason" min-width="100" /> -->
<el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" min-width="170" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('失败原因')" align="center" prop="payStatusDesc" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('支付金额')" align="center" prop="payMoney" width="100" />
<el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('理赔原因')" align="center" prop="satisfyReason" 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="remark" width="100" :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="createSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="登记时间" align="center" prop="createTime" width="170"/>
</XdTable>
@ -232,7 +234,7 @@
</el-dialog>
-->
</div>
</XdPageContainer>
</template>
<script>
@ -269,6 +271,9 @@ export default {
openForm: false,
titleForm: "",
queryCode:null,
queryOrderType:null,
// 弹出展示层
id:null,
titleView:"",
@ -287,6 +292,9 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 20,
queryCode:null,
payType: null,
recType: null,
payMan: null,