aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-11 08:32:50 +08:00
parent 6b14221a05
commit 2ce4312c16
6 changed files with 682 additions and 892 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
src/views/emis/emisSettleBill/MergeBillForm.vue
View File

@ -41,304 +41,68 @@
show-summary :summary-method="getSummaries"
>
<div slot="toolbar" v-if="actionType==1 || actionType==2">
<div slot="toolbar" >
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmByCenter"
v-hasPermi="['emis:emisSettleSubBill:confirmBillByCenter']"
>批量确认</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmNoBillByCenter"
v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']"
>确认不出账</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleSetBillErrorByCenter"
v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']"
>置账单异常</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab!='waitConfirm'">
<el-button
type="danger"
plain
size="mini"
:disabled="multiple"
@click="handleCancelConfirmByCenter"
v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillByCenter']"
>取消确认</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleSplit"
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
>拆分子账单</el-button>
</el-col> -->
<el-col :span="1.5" >
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisSettleSubBill:export']"
>导出</el-button>
</el-col>
</el-row>
</div>
<div slot="toolbar" v-if="actionType==3">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmBySite"
v-hasPermi="['emis:emisSettleSubBill:confirmBillBySite']"
>批量确认</el-button>
@click="handleAddBillCode"
>追加运单到此账单</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmNoBillBySite"
v-hasPermi="['emis:emisSettleSubBill:confirmNoBillBySite']"
>确认不出账</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleSetBillErrorBySite"
v-hasPermi="['emis:emisSettleSubBill:setBillErrorBySite']"
>置账单异常</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab!='waitConfirm'">
<el-button
type="danger"
plain
size="mini"
:disabled="multiple"
@click="handleCancelConfirmBySite"
v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
>取消确认</el-button>
</el-col>
</el-row>
</div>
<div slot="toolbar" v-if="actionType==4">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<div style="display:inline-flex;font-size:13px;font-weight:bold;font-weight: bold;line-height: 30px;">
<span>账单名称:</span>
<el-input
size="mini"
style="width:280px"
v-model="billName"
:placeholder="$t('账单名称')"
clearable
/>
<span>账单月:</span>
<el-date-picker size="mini" style="width:120px" v-model="billMonth" type="month" placeholder="" value-format="yyyy-MM"></el-date-picker>
</div>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleMergeBill"
v-hasPermi="['emis:emisSettleBill:add']"
>合账</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleSplit"
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
>拆子账单</el-button>
</el-col>
<el-col :span="1.5" >
<el-button
type="warning"
type="primary"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisSettleSubBill:export']"
>导出</el-button>
:disabled="multiple"
@click="handleRemovceBillCode"
>从账单内删除运单</el-button>
</el-col>
</el-row>
</div>
<div slot="statInfo" style="font-size: 13px;">
总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
总费用:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="expand">
<template slot-scope="scope">
<div style="padding: 8px 50px;background: white;">
<div style="display:inline-flex;padding: 15px 0px;" >
<div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
<div>
<el-button
type="text"
size="mini"
style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
@click="handleShowTraceInfo(scope.row)"
>运单详情</el-button>
</div>
</div>
<div style="font-weight:500">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
<div class="feeItem">
<ul class="th">
<li>费用名称</li>
<li>费用</li>
<!-- <li>币种</li> -->
<li>描述</li>
</ul>
<ul v-for="(item,index) in scope.row.feeitemList" :key="index">
<li style="background: #f4f4f4;font-weight: 600;">{{$t(item.feeName)}}</li>
<li>{{item.billFee}}</li>
<!-- <li>{{item.currency}}</li> -->
<li>{{item.remark}}</li>
</ul>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
<!-- <el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
</template>
</el-table-column>
<el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="130" />
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column v-if="actionType!=1" :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span type="normal">{{ scope.row.custNo }}</span>
</template>
</el-table-column>
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.customerName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :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.sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span type="normal">{{ scope.row.custNo }}</span>
</template>
</el-table-column> -->
<!-- <el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<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="80" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-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="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
<span v-else >/</span>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
<el-tag v-if="scope.row.blConfirmCenter=='2'" type="error">确认不出账</el-tag>
<el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<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>
</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> -->
<!-- <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" /> -->
<!-- <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" /> -->
<!-- <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" /> -->
</XdTable>
@ -438,6 +202,7 @@ export default {
getEmisSettleBill(this.id).then(response => {
this.form = response.data;
this.loading = false;
this.getSubBillList(this.form.settleBillNo);
});
}
else if(this.settleBillNo){
@ -445,11 +210,29 @@ export default {
getEmisSettleBill(this.settleBillNo).then(response => {
this.form = response.data;
this.loading = false;
this.getSubBillList(this.form.settleBillNo);
});
}else{
this.$modal.msgError("信息不存在");
this.$modal.msgError("账单不存在");
this.$emit("on-cancel");
}
},
getSubBillList(settleBillNo) {
this.loading = true;
let qParam={
settleBillNo:settleBillNo
}
listEmisSettleSubBill(qParam).then(response => {
this.emisSettleSubBillList = response.rows;
this.total = response.total;
this.loading = false;
});
// 查询统计
// getQueryStatInfoMap(qParam).then(response => {
// this.queryStatInfoMap = response.data;
// });
},
@ -480,7 +263,6 @@ export default {
return;
}
if (
column.property === 'waybillDetail.billWeight'
) {

778
src/views/emis/emisSettleBill/SettleMainBillList.vue
View File

@ -1,337 +1,107 @@
<template>
<XdPageContainer class="app-container">
<!-- <SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="settleBillNo">
<el-input
v-model="queryParams.settleBillNo"
:placeholder="$t('总结算账单编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="settleBillName">
<el-input
v-model="queryParams.settleBillName"
:placeholder="$t('结算账单名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="settleType">
<el-input
v-model="queryParams.settleType"
:placeholder="$t('结算账单类型')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="settleStartDate">
<el-date-picker clearable
v-model="queryParams.settleStartDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('结算开始时间')">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="settleEndDate">
<el-date-picker clearable
v-model="queryParams.settleEndDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('结算结束时间')">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="billMonth">
<el-input
v-model="queryParams.billMonth"
:placeholder="$t('账单月份')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="recMoney">
<el-input
v-model="queryParams.recMoney"
:placeholder="$t('应收款金额')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="recedMoney">
<el-input
v-model="queryParams.recedMoney"
:placeholder="$t('已收款金额')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="custNo">
<el-input
v-model="queryParams.custNo"
:placeholder="$t('月结编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerCode">
<el-input
v-model="queryParams.customerCode"
:placeholder="$t('客户编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerName">
<el-input
v-model="queryParams.customerName"
:placeholder="$t('客户名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteCode">
<el-input
v-model="queryParams.siteCode"
:placeholder="$t('结算站点代码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteName">
<el-input
v-model="queryParams.siteName"
:placeholder="$t('结算站点名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="satisfyMoney">
<el-input
v-model="queryParams.satisfyMoney"
:placeholder="$t('安全金额')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="allowanceMoney">
<el-input
v-model="queryParams.allowanceMoney"
:placeholder="$t('允许金额')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="deductionMoney">
<el-input
v-model="queryParams.deductionMoney"
:placeholder="$t('抵扣金额')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="otherMoney">
<el-input
v-model="queryParams.otherMoney"
:placeholder="$t('其他金额')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="satisfyReason">
<el-input
v-model="queryParams.satisfyReason"
:placeholder="$t('安全原因')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="allowanceReason">
<el-input
v-model="queryParams.allowanceReason"
:placeholder="$t('允许原因')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="deductionReason">
<el-input
v-model="queryParams.deductionReason"
:placeholder="$t('抵扣原因')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="otherReason">
<el-input
v-model="queryParams.otherReason"
:placeholder="$t('其他原因')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="openBillStatus">
<el-input
v-model="queryParams.openBillStatus"
:placeholder="$t('开票状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="paymentStatus">
<el-input
v-model="queryParams.paymentStatus"
:placeholder="$t('付款状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="sendPieceSum">
<el-input
v-model="queryParams.sendPieceSum"
:placeholder="$t('总票数')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="pieceNumber">
<el-input
v-model="queryParams.pieceNumber"
:placeholder="$t('总件数')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="feeWeight">
<el-input
v-model="queryParams.feeWeight"
:placeholder="$t('总重量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="uncollectedAmount">
<el-input
v-model="queryParams.uncollectedAmount"
:placeholder="$t('未结数量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="sendMoneySum">
<el-input
v-model="queryParams.sendMoneySum"
:placeholder="$t('合计金额')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="refundAmount">
<el-input
v-model="queryParams.refundAmount"
:placeholder="$t('退款数量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="refundMoney">
<el-input
v-model="queryParams.refundMoney"
:placeholder="$t('退款金额')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blConfirm">
<el-input
v-model="queryParams.blConfirm"
:placeholder="$t('财务确认状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="confirmDate">
<el-input
v-model="queryParams.confirmDate"
:placeholder="$t('财务确认日期')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="confirmSite">
<el-input
v-model="queryParams.confirmSite"
:placeholder="$t('财务确认站点')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="confirmManCode">
<el-input
v-model="queryParams.confirmManCode"
:placeholder="$t('财务确认人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blSiteConfirm">
<el-input
v-model="queryParams.blSiteConfirm"
:placeholder="$t('站点确认状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="confirmNote">
<el-input
v-model="queryParams.confirmNote"
:placeholder="$t('财务确认备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteConfirmDate">
<el-input
v-model="queryParams.siteConfirmDate"
:placeholder="$t('站点确认日期')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteConfirmManCode">
<el-input
v-model="queryParams.siteConfirmManCode"
:placeholder="$t('站点确认人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteConfirmNote">
<el-input
v-model="queryParams.siteConfirmNote"
:placeholder="$t('网点确认备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志（0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm> -->
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
<el-tabs slot="pageTabs" v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick">
<el-tab-pane label="账单列表" name="billList" >
<!-- 账单表 -->
<XdTable
v-loading="loading"
border stripe
size="mini"
:data="emisSettleBillList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
@row-dblclick="getDetailList"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisSettleBill:edit']"
>修改账单</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisSettleBill:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisSettleBill:export']"
>导出EXCEL电子表</el-button>
</el-col>
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="200" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="80" />
<el-table-column :label="$t('账单期间')" align="center" prop="billMonth" min-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="createTime" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" min-width="100" />
<el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" />
<el-table-column :label="$t('重量')" align="center" prop="feeWeight" min-width="100" />
<el-table-column :label="$t('付款状态')" align="center" prop="paymentStatus" min-width="100" />
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" min-width="100" />
<el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" min-width="150" />
<el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" min-width="150" />
<el-table-column :label="$t('账单未收金额')" align="center" prop="billMonth" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div >{{scope.row.recedMoney-scope.row.recedMoney}}</div>
</template>
</el-table-column>
<el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" min-width="100" />
<!-- <el-table-column :label="$t('允许金额')" align="center" prop="allowanceMoney" min-width="100" /> -->
<el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" min-width="100" />
<el-table-column :label="$t('其他收费项')" align="center" prop="otherMoney" min-width="100" />
<el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" min-width="100" />
<el-table-column :label="$t('月结编号')" align="center" prop="custNo" 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="satisfyMoney" min-width="100" />
<el-table-column :label="$t('抵让原因')" align="center" prop="deductionReason" min-width="100" />
<el-table-column :label="$t('其他原因')" align="center" prop="otherReason" min-width="100" />
<el-table-column :label="$t('账单其他费用')" align="center" prop="otherReason" min-width="170" />
</XdTable>
</el-tab-pane>
<el-tab-pane label="明细数据" name="dtlList" >
<SearchForm :model="queryParams" ref="queryForm"
size="mini" :maxShow="12" label-width="100px"
v-show="showSearch"
@search="handleQuery"
@ -393,195 +163,196 @@
</el-form-item>
</SearchForm>
<el-tabs slot="pageTabs" v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick">
<el-tab-pane label="账单列表" name="billList" />
<el-tab-pane label="明细数据" name="dtlList" />
</el-tabs>
<!-- 账单明细数据表 -->
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight-60)+'px'"
v-loading="loading"
border stripe
border
size="mini"
:data="emisSettleBillList"
ref="refTable1"
row-key="id"
storageName="storageNamemx"
:data="emisSettleSubBillList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
:row-style="tableRowClassName"
highlight-current-row
>
<div slot="toolbar" >
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-col :span="1.5" >
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisSettleBill:add']"
>新增</el-button>
</el-col> -->
@click="handleAddBillCode"
>追加运单到此账单</el-button>
</el-col>
<el-col :span="1.5" >
<el-button
type="success"
type="primary"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisSettleBill:edit']"
>修改账单</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisSettleBill:remove']"
>删除</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisSettleBill:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisSettleBill:export']"
>导出EXCEL电子表</el-button>
@click="handleRemovceBillCode"
>从账单内删除运单</el-button>
</el-col>
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<el-table-column type="expand">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
<div style="padding: 8px 50px;background: white;">
<div style="display:inline-flex;padding: 15px 0px;" >
<div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
<div>
<el-button
type="text"
size="mini"
style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
@click="handleShowTraceInfo(scope.row)"
>运单详情</el-button>
</div>
</div>
<div style="font-weight:500">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
<div class="feeItem">
<ul class="th">
<li>费用名称</li>
<li>费用</li>
<!-- <li>币种</li> -->
<li>描述</li>
</ul>
<ul v-for="(item,index) in scope.row.feeitemList" :key="index">
<li style="background: #f4f4f4;font-weight: 600;">{{$t(item.feeName)}}</li>
<li>{{item.billFee}}</li>
<!-- <li>{{item.currency}}</li> -->
<li>{{item.remark}}</li>
</ul>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
<!-- <el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
<span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
</template>
</el-table-column>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column v-if="actionType!=1" :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span type="normal">{{ scope.row.custNo }}</span>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.customerName }}</span>
</template>
</el-table-column>
-->
<el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="200" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('结算账单类型')" align="center" prop="settleType" min-width="100" /> -->
<el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="80" />
<el-table-column :label="$t('账单期间')" align="center" prop="billMonth" min-width="200" :show-overflow-tooltip="true">
<!-- <el-table-column :label="$t('取件员/操作员')" align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
<span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column> -->
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :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="createTime" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" min-width="100" />
<el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" />
<el-table-column :label="$t('重量')" align="center" prop="feeWeight" min-width="100" />
<el-table-column :label="$t('付款状态')" align="center" prop="paymentStatus" min-width="100" />
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" min-width="100" />
<el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" min-width="150" />
<el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" min-width="150" />
<el-table-column :label="$t('账单未收金额')" align="center" prop="billMonth" min-width="150" :show-overflow-tooltip="true">
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<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="80" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-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">
<div >{{scope.row.recedMoney-scope.row.recedMoney}}</div>
<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="satisfyMoney" min-width="100" />
<!-- <el-table-column :label="$t('允许金额')" align="center" prop="allowanceMoney" min-width="100" /> -->
<el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" min-width="100" />
<el-table-column :label="$t('其他收费项')" align="center" prop="otherMoney" min-width="100" />
<el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" min-width="100" />
<el-table-column :label="$t('月结编号')" align="center" prop="custNo" 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="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('理赔原因')" align="center" prop="satisfyMoney" min-width="100" />
<el-table-column :label="$t('抵让原因')" align="center" prop="deductionReason" min-width="100" />
<el-table-column :label="$t('其他原因')" align="center" prop="otherReason" min-width="100" />
<el-table-column :label="$t('账单其他费用')" align="center" prop="otherReason" min-width="170" />
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
<span v-else >/</span>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
<el-tag v-if="scope.row.blConfirmCenter=='2'" type="error">确认不出账</el-tag>
<el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<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>
</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="$t('未结数量')" align="center" prop="uncollectedAmount" min-width="100" /> -->
<!-- <el-table-column :label="$t('应收款金额')" align="center" prop="recMoney" min-width="100" /> -->
<!-- <el-table-column :label="$t('已收款金额')" align="center" prop="recedMoney" min-width="100" /> -->
<!-- <el-table-column :label="$t('月结编号')" align="center" prop="custNo" 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="siteCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('结算站点名称')" align="center" prop="siteName" min-width="100" /> -->
<!-- <el-table-column :label="$t('安全金额')" align="center" prop="satisfyMoney" min-width="100" /> -->
<!-- <el-table-column :label="$t('允许金额')" align="center" prop="allowanceMoney" min-width="100" /> -->
<!-- <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" min-width="100" /> -->
<!-- <el-table-column :label="$t('安全原因')" align="center" prop="satisfyReason" min-width="100" /> -->
<!-- <el-table-column :label="$t('允许原因')" align="center" prop="allowanceReason" min-width="100" /> -->
<!-- <el-table-column :label="$t('抵扣原因')" align="center" prop="deductionReason" min-width="100" /> -->
<!-- <el-table-column :label="$t('其他原因')" align="center" prop="otherReason" min-width="100" /> -->
<!-- <el-table-column :label="$t('退款数量')" align="center" prop="refundAmount" min-width="100" />
<el-table-column :label="$t('退款金额')" align="center" prop="refundMoney" min-width="100" />
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="100" />
<el-table-column :label="$t('财务确认日期')" align="center" prop="confirmDate" min-width="100" />
<el-table-column :label="$t('财务确认站点')" align="center" prop="confirmSite" min-width="100" />
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManCode" min-width="100" />
<el-table-column :label="$t('站点确认状态')" align="center" prop="blSiteConfirm" min-width="100" />
<el-table-column :label="$t('财务确认备注')" align="center" prop="confirmNote" min-width="100" />
<el-table-column :label="$t('站点确认日期')" align="center" prop="siteConfirmDate" min-width="100" />
<el-table-column :label="$t('站点确认人')" align="center" prop="siteConfirmManCode" min-width="100" />
<el-table-column :label="$t('网点确认备注')" align="center" prop="siteConfirmNote" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-->
</XdTable>
</el-tab-pane>
</el-tabs>
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
<MergeBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
</el-dialog>
@ -634,6 +405,8 @@ import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import { parseTime,genJsSeqNo } from "@/utils/custom";
import { listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
export default {
name: "emisSettleBill",
@ -686,6 +459,10 @@ export default {
openForm: false,
titleForm: "",
subBillTotal: 0,
// 结算子账单表格数据
emisSettleSubBillList: [],
// 弹出展示层
id:null,
titleView:"",
@ -769,6 +546,26 @@ export default {
this.total = response.total;
this.loading = false;
});
},
getDetailList(row, column, event) {
this.activeTab="dtlList";
this.loading = true;
let qParam={
settleBillNo:row.settleBillNo
}
listEmisSettleSubBill(qParam).then(response => {
this.emisSettleSubBillList = response.rows;
this.total = response.total;
this.loading = false;
});
// 查询统计
// getQueryStatInfoMap(qParam).then(response => {
// this.queryStatInfoMap = response.data;
// });
},
/** 搜索按钮操作 */
@ -890,14 +687,37 @@ export default {
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
<style lang="scss" scoped>
.feeItem{
border: 1px solid #dfe6ec;
margin-bottom:50px;
ul{
list-style: none;
padding: 0px;
margin: 0px;
width: 590px;
height: 32px;
line-height: 32px;
border: 1px solid #dfe6ec;
border-top: 0px;
font-size: 12px;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
ul li{
display:block; width:33%; float:left;text-indent:2em
}
.th{
background:#FFF; font-weight:bold; border-top:1px
}
}
.statInfoValue{
color: red;
font-size: 13px;
font-weight: 500;
}
</style>

72
src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
View File

@ -12,7 +12,7 @@
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
:rows="1"
/>
</el-form-item>
<el-form-item label="寄件日期" prop="sendDate">
@ -106,7 +106,7 @@
<el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<el-tab-pane label="已合账" name="hasMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<XdTable
@ -279,8 +279,18 @@
>合账</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleMergeBill"
v-hasPermi="['emis:emisSettleBill:add']"
>自动合账</el-button>
</el-col> -->
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
@ -289,7 +299,7 @@
@click="handleSplit"
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
>拆子账单</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
@ -514,6 +524,7 @@ import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDet
import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import { parseTime,genJsSeqNo } from "@/utils/custom";
export default {
name: "SubBillConfirmByMoneyList",
// name: "SubBillConfirmByMonthList",
@ -1062,23 +1073,60 @@ export default {
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
this.titleMergeForm="合并账单";
// this.titleMergeForm="账单-"+this.currentSettleBillNo;
// this.openMergeForm=true;
});
}).catch(() => {});
},
handleAutoMergeBill(){
if(!this.billMonth){
this.$message.error("账单月不能为空!");
return;
}
this.$confirm("确定自动合账吗?", "提示", {
cancelButtonText: "否",
confirmButtonText: "确定",
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false
}).then(() => {
this.currentSettleBillNo=genJsSeqNo();
let startDate = new Date(this.billMonth+"-01 00:00:00");
let endDate= this.getMonthLast(startDate);
endDate.setHours(23,59,59,0)
let settleBillForm={
settleBillNo: this.currentSettleBillNo,
settleBillName: this.billName,
billMonth: this.billMonth,
settleStartDate:parseTime(startDate),
settleEndDate:parseTime(endDate),
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
this.titleMergeForm="账单-"+this.currentSettleBillNo;
this.openMergeForm=true;
});
}).catch(() => {});
// this.titleMergeForm="合并账单";
// this.openMergeForm=true;
// titleMergeForm:null,
// openMergeForm:false,
// selectBillList:[],
},
// 获取当前月的最后一天

71
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -12,7 +12,7 @@
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
:rows="1"
/>
</el-form-item>
<el-form-item label="寄件日期" prop="sendDate">
@ -106,7 +106,7 @@
<el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<el-tab-pane label="已合账" name="hasMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<XdTable
@ -279,8 +279,18 @@
>合账</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleMergeBill"
v-hasPermi="['emis:emisSettleBill:add']"
>自动合账</el-button>
</el-col> -->
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
@ -289,7 +299,7 @@
@click="handleSplit"
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
>拆子账单</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
@ -1063,23 +1073,60 @@ export default {
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
this.titleMergeForm="合并账单";
// this.titleMergeForm="账单-"+this.currentSettleBillNo;
// this.openMergeForm=true;
});
}).catch(() => {});
},
handleAutoMergeBill(){
if(!this.billMonth){
this.$message.error("账单月不能为空!");
return;
}
this.$confirm("确定自动合账吗?", "提示", {
cancelButtonText: "否",
confirmButtonText: "确定",
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false
}).then(() => {
this.currentSettleBillNo=genJsSeqNo();
let startDate = new Date(this.billMonth+"-01 00:00:00");
let endDate= this.getMonthLast(startDate);
endDate.setHours(23,59,59,0)
let settleBillForm={
settleBillNo: this.currentSettleBillNo,
settleBillName: this.billName,
billMonth: this.billMonth,
settleStartDate:parseTime(startDate),
settleEndDate:parseTime(endDate),
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
this.titleMergeForm="账单-"+this.currentSettleBillNo;
this.openMergeForm=true;
});
}).catch(() => {});
// this.titleMergeForm="合并账单";
// this.openMergeForm=true;
// titleMergeForm:null,
// openMergeForm:false,
// selectBillList:[],
},
// 获取当前月的最后一天

71
src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
View File

@ -12,7 +12,7 @@
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
:rows="1"
/>
</el-form-item>
<el-form-item label="寄件日期" prop="sendDate">
@ -106,7 +106,7 @@
<el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<el-tab-pane label="已合账" name="hasMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<XdTable
@ -279,8 +279,18 @@
>合账</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleMergeBill"
v-hasPermi="['emis:emisSettleBill:add']"
>自动合账</el-button>
</el-col> -->
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
@ -289,7 +299,7 @@
@click="handleSplit"
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
>拆子账单</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
@ -1063,23 +1073,60 @@ export default {
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
this.titleMergeForm="合并账单";
// this.titleMergeForm="账单-"+this.currentSettleBillNo;
// this.openMergeForm=true;
});
}).catch(() => {});
},
handleAutoMergeBill(){
if(!this.billMonth){
this.$message.error("账单月不能为空!");
return;
}
this.$confirm("确定自动合账吗?", "提示", {
cancelButtonText: "否",
confirmButtonText: "确定",
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false
}).then(() => {
this.currentSettleBillNo=genJsSeqNo();
let startDate = new Date(this.billMonth+"-01 00:00:00");
let endDate= this.getMonthLast(startDate);
endDate.setHours(23,59,59,0)
let settleBillForm={
settleBillNo: this.currentSettleBillNo,
settleBillName: this.billName,
billMonth: this.billMonth,
settleStartDate:parseTime(startDate),
settleEndDate:parseTime(endDate),
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
this.titleMergeForm="账单-"+this.currentSettleBillNo;
this.openMergeForm=true;
});
}).catch(() => {});
// this.titleMergeForm="合并账单";
// this.openMergeForm=true;
// titleMergeForm:null,
// openMergeForm:false,
// selectBillList:[],
},
// 获取当前月的最后一天

68
src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
View File

@ -12,7 +12,7 @@
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
:rows="1"
/>
</el-form-item>
<el-form-item label="寄件日期" prop="sendDate">
@ -106,7 +106,7 @@
<el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<el-tab-pane label="已合账" name="hasMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<XdTable
@ -279,8 +279,18 @@
>合账</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleMergeBill"
v-hasPermi="['emis:emisSettleBill:add']"
>自动合账</el-button>
</el-col> -->
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
@ -289,7 +299,7 @@
@click="handleSplit"
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
>拆子账单</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
@ -1064,6 +1074,49 @@ export default {
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
// this.titleMergeForm="账单-"+this.currentSettleBillNo;
// this.openMergeForm=true;
});
}).catch(() => {});
},
handleAutoMergeBill(){
if(!this.billMonth){
this.$message.error("账单月不能为空!");
return;
}
this.$confirm("确定自动合账吗?", "提示", {
cancelButtonText: "否",
confirmButtonText: "确定",
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false
}).then(() => {
this.currentSettleBillNo=genJsSeqNo();
let startDate = new Date(this.billMonth+"-01 00:00:00");
let endDate= this.getMonthLast(startDate);
endDate.setHours(23,59,59,0)
let settleBillForm={
settleBillNo: this.currentSettleBillNo,
settleBillName: this.billName,
billMonth: this.billMonth,
settleStartDate:parseTime(startDate),
settleEndDate:parseTime(endDate),
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
@ -1074,13 +1127,6 @@ export default {
}).catch(() => {});
// this.titleMergeForm="合并账单";
// this.openMergeForm=true;
// titleMergeForm:null,
// openMergeForm:false,
// selectBillList:[],
},
// 获取当前月的最后一天