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-08-08 19:26:20 +08:00
parent 30d2448940
commit 9137519523
16 changed files with 290 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/emis/emisSettleBill.js
View File

@ -25,6 +25,14 @@ export function confirmSettleBillBySite(id) {
})
}
// 站点确认不开票
export function confirmNotOpenBillBySite(id) {
return request({
url: '/emis/emisSettleBill/confirmNotOpenBillBySite/' + id,
method: 'post'
})
}
// 查询结算总账单详细
export function getInfoBySettleBillNo(settleBillNo) {

1
src/views/emis/customerService/traceWaybillDetailView.vue
View File

@ -138,6 +138,7 @@ export default {
if(
ownerSiteCode == this.billDetail.sendSiteCode
|| ownerSiteCode == this.billDetail.dispatchSiteCode
|| ownerSiteCode == this.billDetail.dispatchUnderlingSiteCode
|| ownerSiteCode == this.billDetail.signSiteCode
|| ownerSiteCode == '88888'
|| empName ==this.billDetail.payee

7
src/views/emis/emisSettleBill/ChargeBillMoneyList.vue
View File

@ -4,13 +4,16 @@
<div class="tab-container">
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick" @tab-remove="removeTab">
<el-tab-pane label="现金账单列表" name="billList" >
<ChargeBillMoneyPanel @onSelect="onSelectBill"> </ChargeBillMoneyPanel>
<ChargeBillMoneyPanel key="billList" @onSelect="onSelectBill"> </ChargeBillMoneyPanel>
</el-tab-pane>
<el-tab-pane v-for="(item, index) in billTabs" :key="index" :name="item.settleBillNo" :label="'账单:'+item.settleBillNo" closable >
<BillDetailPanel :settleBillNo="item.settleBillNo"></BillDetailPanel>
<BillDetailPanel :key="'Detail_'+index" :settleBillNo="item.settleBillNo"></BillDetailPanel>
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>

6
src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
View File

@ -4,10 +4,10 @@
<div class="tab-container">
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick" @tab-remove="removeTab">
<el-tab-pane label="可开票账单" name="waitOpenBillList" >
<SiteWaitOpenBillPanel confirmStatus="1"> </SiteWaitOpenBillPanel>
<SiteWaitOpenBillPanel key="waitOpenBillList" confirmStatus="1"> </SiteWaitOpenBillPanel>
</el-tab-pane>
<el-tab-pane label="开票申请记录" name="billList" >
<InvoiceRecordApplyListPanel @onSelect="onSelectApply"> </InvoiceRecordApplyListPanel>
<el-tab-pane label="开票申请记录" name="billList" >
<InvoiceRecordApplyListPanel key="billList" @onSelect="onSelectApply"> </InvoiceRecordApplyListPanel>
</el-tab-pane>
<!-- <el-tab-pane label="开票申请记录" name="invoiceApplyList" >
<ChargeBillMoneyPanel @onSelect="onSelectBill"> </ChargeBillMoneyPanel>

4
src/views/emis/emisSettleBill/SiteMainBillConfirmList.vue
View File

@ -4,10 +4,10 @@
<div class="tab-container">
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick" @tab-remove="removeTab">
<el-tab-pane label="待确认账单" name="billList" >
<SiteConfimPanel confirmStatus="0" @onSelect="onSelectBill"> </SiteConfimPanel>
<SiteConfimPanel key="SiteConfimPanel1" confirmStatus="0" @onSelect="onSelectBill"> </SiteConfimPanel>
</el-tab-pane>
<el-tab-pane label="已确认账单" name="billConfirmedList" >
<SiteConfimPanel2 confirmStatus="1" @onSelect="onSelectBill"> </SiteConfimPanel2>
<SiteConfimPanel2 key="SiteConfimPanel2" confirmStatus="1" @onSelect="onSelectBill"> </SiteConfimPanel2>
</el-tab-pane>
<el-tab-pane v-for="(item, index) in billTabs" :key="index" :name="item.settleBillNo" :label="'账单明细:'+item.settleBillNo" closable >
<SiteConfirmSubBillListPanel :settleBillNo="item.settleBillNo"></SiteConfirmSubBillListPanel>

63
src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
View File

@ -152,7 +152,6 @@
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="200" :show-overflow-tooltip="true"/>
@ -162,13 +161,6 @@
<div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
</template>
</el-table-column>
<el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="100" />
<el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="100" />
<el-table-column :label="$t('重量')" align="center" prop="feeWeight" width="100" />
<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="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
@ -176,22 +168,42 @@
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="100" /> -->
<!-- <el-table-column :label="$t('允许金额')" align="center" prop="allowanceMoney" width="100" /> -->
<!-- <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" /> -->
<!-- <el-table-column :label="$t('其他收费项')" align="center" prop="otherMoney" width="100" /> -->
<!-- <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" /> -->
<!-- <el-table-column :label="$t('月结编号')" align="center" prop="custNo" width="100" /> -->
<!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" width="100" /> -->
<!-- <el-table-column :label="$t('客户名称')" align="center" prop="customerName" width="100" /> -->
<el-table-column :label="$t('生成账单时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='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>
</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="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="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="satisfyMoney" 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="otherReason" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" 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="deductionReason" width="100" /> -->
<!-- <el-table-column :label="$t('其他原因')" align="center" prop="otherReason" width="100" /> -->
<!-- <el-table-column :label="$t('账单其他费用')" align="center" prop="otherReason" width="170" /> -->
<el-table-column :label="$t('生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
@ -208,7 +220,7 @@ import PayRecordInput from '@/views/emis/emisSettlePayRecord/panel/PayRecordInpu
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
export default {
name: "MoneyPanel",
name: "ChargeBillMoneyPanel",
components: { PayRecordInput,elDateSimplePicker },
dicts: [
],
@ -311,7 +323,8 @@ export default {
},
created() {
this.queryOrderType="1"
// 必须业务已确认后才可以做收款和开票
this.blSiteConfirm="1"
this.getList();
},
@ -319,14 +332,16 @@ export default {
/** 查询结算总账单列表 */
getList() {
this.loading = true;
// 按运单查询时的处理
if(this.queryOrderType==1){
this.queryParams.params.billCode=this.queryParams.settleBillNo;
this.queryParams.settleBillNo=null;
}
// 必须业务已确认后才可以做收款和开票
this.queryParams.blSiteConfirm="1"
listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisSettleBillList = response.rows;
this.total = response.total;

43
src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
View File

@ -172,13 +172,6 @@
<div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
</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="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
@ -201,22 +194,30 @@
<el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
</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="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="satisfyMoney" 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="otherReason" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="100" /> -->
<!-- <el-table-column :label="$t('允许金额')" align="center" prop="allowanceMoney" width="100" /> -->
<!-- <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" /> -->
<!-- <el-table-column :label="$t('其他收费项')" align="center" prop="otherMoney" width="100" /> -->
<!-- <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" /> -->
<el-table-column :label="$t('月结编号')" align="center" prop="custNo" width="100" />
<!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" width="100" /> -->
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" width="100" />
<el-table-column :label="$t('生成账单时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('月结客户')" align="center" prop="custName" width="100" />
<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="satisfyMoney" width="100" /> -->
<!-- <el-table-column :label="$t('抵让原因')" align="center" prop="deductionReason" width="100" /> -->
<!-- <el-table-column :label="$t('其他原因')" align="center" prop="otherReason" width="100" /> -->
<!-- <el-table-column :label="$t('账单其他费用')" align="center" prop="otherReason" width="170" /> -->
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
</XdTable>
<!-- :settleBillObj="currentSettleBillObj" -->
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
@ -339,6 +340,7 @@ export default {
created() {
this.queryOrderType="1"
this.getList();
},
@ -353,6 +355,9 @@ export default {
this.queryParams.settleBillNo=null;
}
// 必须业务已确认后才可以做收款和开票
this.queryParams.blSiteConfirm="1"
listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisSettleBillList = response.rows;
this.total = response.total;

81
src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
View File

@ -1,15 +1,15 @@
<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="billCode" label-width="80px">
<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 :key="2" label="2">账单号</el-radio>
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.billCode"
v-model="queryParams.queryCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
@ -146,45 +146,56 @@
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" min-width="200" :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">
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
<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="billMonth" 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="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="recMoney" min-width="150" />
<el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" min-width="150" />
<el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" min-width="150" />
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" min-width="100" >
<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.paymentStatus=='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>
</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="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="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="satisfyMoney" 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="otherReason" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/>
<!-- <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="custName" min-width="100" />
<el-table-column :label="$t('生成账单时间')" align="center" prop="createTime" min-width="170" :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="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="createTime" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<template slot-scope="scope">
@ -198,8 +209,6 @@
<el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
@ -276,6 +285,10 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 20,
queryCode:null,
settleBillNo: null,
settleBillName: null,
settleType: null,
@ -341,10 +354,14 @@ export default {
this.loading = true;
// 按运单查询时的处理
if(this.queryOrderType==1){
this.queryParams.params.billCode=this.queryParams.settleBillNo;
if(this.queryOrderType=='1'){
this.queryParams.params.billCode=this.queryParams.queryCode;
this.queryParams.settleBillNo=null;
}
else if(this.queryOrderType=='2'){
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=this.queryParams.queryCode;
}
// console.log("====>this.$store.getters.ownerSiteCode==>",this.$store.getters.ownerSiteCode)
// if(this.$store.getters.ownerSiteCode !='88888'){

168
src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
View File

@ -1,30 +1,61 @@
<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="settleBillNo" label-width="80px">
<el-form-item label="" prop="queryCode" label-width="80px">
<div slot="label">
<el-radio-group class="query-label" v-model="queryParams.queryOrderType">
<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.settleBillNo"
v-model="queryParams.queryCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
<!-- @keyup.enter.native="handleQuery" -->
</el-form-item>
<el-form-item label="账单名称" prop="settleBillName">
<el-input
v-model="queryParams.settleBillName"
:placeholder="$t('账单名称')"
clearable
/>
</el-form-item>
<!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
<EmisSiteSimplePicker1 v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
</el-form-item> -->
<el-form-item :label="$t('开票状态')" prop="openBillStatus">
<el-select clearable v-model="queryParams.openBillStatus" placeholder="开票状态">
<el-option key="0" label="未开票" value="0"></el-option>
<el-option key="1" label="已开票" value="1"></el-option>
<el-option key="2" label="部分开票" value="2"></el-option>
<el-option key="3" label="不开票" value="3"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('确认状态')" prop="blConfirmSite">
<el-select clearable v-model="queryParams.blConfirmSite" placeholder="确认状态">
<el-option key="0" label="业务未确认" value="0"></el-option>
<el-option key="1" label="业务已确认" value="1"></el-option>
</el-select>
</el-form-item> -->
<el-form-item :label="$t('收款状态')" prop="paymentStatus">
<el-select clearable v-model="queryParams.paymentStatus" placeholder="收款状态">
<el-option key="0" label="未收款" value="0"></el-option>
<el-option key="1" label="已收款" value="1"></el-option>
<el-option key="2" label="部分收款" value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
<elDateSimplePicker placeholder="" v-model="dateTimeRange" style="z-index:9999;width:300px" ></elDateSimplePicker>
</el-form-item> -->
<el-form-item label="账单月份" prop="billMonth">
<el-date-picker size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="100px">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
</el-form-item>
</SearchForm>
<!-- 账单表 -->
@ -51,17 +82,7 @@
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
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="warning"
@ -81,6 +102,15 @@
@click="handleApplyOpenBill"
>申请开票</el-button>
</el-col>
<el-col :span="1.5" >
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleNotOpenBill"
>确认不开票</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
@ -115,46 +145,56 @@
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" min-width="200" :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">
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
<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="billMonth" 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="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="recMoney" min-width="150" />
<el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" min-width="150" />
<el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" min-width="150" />
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" min-width="100" >
<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.paymentStatus=='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>
</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="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="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="satisfyMoney" 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="otherReason" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/>
<!-- <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="custName" min-width="100" />
<el-table-column :label="$t('生成账单时间')" align="center" prop="createTime" min-width="170" :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" :disabled="$store.getters.ownerSiteCode !='88888'"/>
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" 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="createTime" width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<template slot-scope="scope">
@ -169,7 +209,6 @@
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
@ -182,7 +221,7 @@
</template>
<script>
import { listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
import { confirmNotOpenBillBySite,listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
@ -251,6 +290,10 @@ export default {
pageNum: 1,
pageSize: 20,
// 查询参数
queryCode:null,
settleBillNo: null,
settleBillName: null,
settleType: null,
@ -308,7 +351,8 @@ export default {
watch: {
},
created() {
this.queryParams.queryOrderType="1";
this.queryParams.openBillStatus='0';
this.queryOrderType="1";
this.getList();
},
@ -317,15 +361,16 @@ export default {
getList() {
this.loading = true;
console.log("this.queryParams.queryOrderType==>"+this.queryParams.queryOrderType);
// 按运单查询时的处理
if(this.queryParams.queryOrderType=="1"){
this.queryParams.params.billCode=this.queryParams.settleBillNo;
if(this.queryOrderType=="1"){
this.queryParams.params.billCode=this.queryParams.queryCode;
this.queryParams.settleBillNo=null;
}
else if(this.queryParams.queryOrderType=="2"){
else if(this.queryOrderType=="2"){
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=this.queryParams.queryCode;
}
console.log("====>this.$store.getters.ownerSiteCode==>",this.$store.getters.ownerSiteCode)
if(this.$store.getters.ownerSiteCode !='88888'){
this.queryParams.salesmen=this.$store.getters.empName
}
@ -337,10 +382,11 @@ export default {
});
},
handleConfirmBySite(row) {
handleNotOpenBill(row) {
const ids = row.id || this.ids;
this.$modal.confirm('请仔细确认,确认后不可撤销').then(function() {
return confirmSettleBillBySite(ids);
this.$modal.confirm('确认不开票').then(function() {
NotOpenBill
return confirmNotOpenBillBySite(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");

11
src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
View File

@ -403,10 +403,13 @@
<el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag>
<el-tag v-if="scope.row.invoiceStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.invoiceStatus=='2'" type="warning">开票异常</el-tag>
<el-tag v-if="scope.row.invoiceStatus=='1'" type="success">开票中</el-tag>
<el-tag v-if="scope.row.invoiceStatus=='2'" type="warning">已开票</el-tag>
<el-tag v-if="scope.row.invoiceStatus=='3'" type="warning">开票异常</el-tag>
</template>
</el-table-column>
<!-- <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="settleBillNo" min-width="170" />
@ -442,9 +445,9 @@
</template>
</el-table-column>
<!-- <el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="100" /> -->
<el-table-column :label="$t('审核人')" align="center" prop="auditManCode" min-width="100" />
<el-table-column :label="$t('审核人')" align="center" prop="auditManName" min-width="100" />
<!-- <el-table-column :label="$t('审核站点')" align="center" prop="auditSiteCode" min-width="100" /> -->
<el-table-column :label="$t('操作人')" align="center" prop="opManCode" min-width="100" />
<el-table-column :label="$t('操作人')" align="center" prop="opManName" min-width="100" />
<!-- <el-table-column :label="$t('操作时间')" align="center" prop="opDate" min-width="100" /> -->
<!-- <el-table-column :label="$t('操作站点')" align="center" prop="opSiteCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('开票渠道编号')" align="center" prop="openChId" min-width="100" /> -->

27
src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
View File

@ -2,14 +2,37 @@
<XdPageContainer >
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="申请序号" prop="applySeqNo">
<el-form-item label="" prop="settleBillNo" label-width="80px">
<div slot="label">
<el-radio-group class="query-label" v-model="queryParams.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.settleBillNo"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
</el-form-item>
<el-form-item label="账单名称" prop="settleBillName">
<el-input
v-model="queryParams.settleBillName"
:placeholder="$t('账单名称')"
clearable
/>
</el-form-item>
<!-- <el-form-item label="申请序号" prop="applySeqNo">
<el-input
v-model="queryParams.applySeqNo"
:placeholder="$t('申请序号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="申请时间" prop="applyDate">
<el-date-picker clearable
v-model="queryParams.applyDate"

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

@ -218,8 +218,8 @@
</template>
</el-table-column>
<el-table-column :label="$t('子账单')" align="center" prop="subBillNo" width="130" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" width="130" />
<el-table-column :label="$t('子账单')" align="center" prop="billNo" width="130" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" width="130" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
@ -976,7 +976,11 @@ export default {
this.selectBillList=selection;
if(this.selectBillList&&this.selectBillList.length>0){
const item0=this.selectBillList[0];
this.billName=item0.waybillDetail.custName+"账单-"+this.billMonth;
if(item0.waybillDetail.custName){
this.billName=item0.waybillDetail.custName+"账单-"+this.billMonth;
}else{
this.billName=item0.billCode;
}
}else{
this.billName=null;
}

15
src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="app-container">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
size="mini" :maxShow="8"
v-show="showSearch"
@ -62,7 +62,13 @@
</SearchForm>
<xd-table v-loading="loading"
<xd-table
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
ref="dataTable"
border
size="mini"
@ -76,7 +82,6 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
@ -187,7 +192,7 @@
</div>
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>
@ -260,7 +265,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
pageSize: 100,
orderSN:null,
billCode: null,
scanType: null,

2
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -653,7 +653,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
pageSize: 100,
orderSn: null,
billCode: null,
billCodeSub: null,

2
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -692,7 +692,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
pageSize: 100,
orderSn: null,
billCode: null,
billCodeSub: null,

2
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -1477,7 +1477,7 @@ methods: {
// this.form.billWeight=1.0;
// this.form.totalVolume=0.0;
this.form.parcelQty=1;
this.form.packType=['2'];
// this.form.packType=['2'];
this.form.blOverWeight='0';
this.form.blGenSubbill='1';
this.form.paymentType='1';