This commit is contained in:
linfso 2024-09-27 18:10:56 +08:00
parent 6cf3882477
commit 83f622f310
4 changed files with 79 additions and 405 deletions

View File

@ -17,6 +17,14 @@ export function queryBillPayStatInfoList(query) {
})
}
export function queryOpenBillStatInfoList(query) {
return request({
url: '/emis/emisSettleBill/queryOpenBillStatInfoList',
method: 'get',
params: query
})
}
// 查询结算总账单详细
export function getEmisSettleBill(id) {
return request({

View File

@ -1,80 +1,11 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="queryCode" label-width="80px">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<el-radio :key="2" label="2">账单号</el-radio>
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.queryCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
</el-form-item>
<el-form-item label="账单生成时间" prop="dateTimeRange" label-width="110px">
<elDateAdvPicker placeholder="账单生成时间" v-model="dateTimeRange" style="z-index:9999;width:300px" ></elDateAdvPicker>
</el-form-item>
<el-form-item :label="$t('核销状态')" prop="chargeStatus">
<el-select clearable v-model="queryParams.chargeStatus" placeholder="核销状态" style="width:100%">
<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="openBillStatus">
<el-select clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
<el-option key="1" label="已开票" value="1"></el-option>
<el-option key="0" label="未开票" value="0"></el-option>
<el-option key="3" label="不开票" value="3"></el-option>
<el-option key="2" label="部分开票" value="2"></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="收款状态" style="width:100%">
<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:100%" 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>
<!-- 账单表 -->
<!-- slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'" -->
<!-- -->
<XdPageContainer >
<XdTable
slot="pageContent"
v-loading="loading"
border stripe
size="mini"
storageName="emisSettleBillList_custbill_query_main"
storageName="waringEmisSettleBillList_custbill_query_main"
:data="emisSettleBillList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
@ -86,86 +17,12 @@
show-summary
:summary-method="getSummaries"
>
<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"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisSettleBill:export']"
>导出</el-button>
</el-col> -->
<!-- <el-col :span="1.5" v-if="confirmStatus==0">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmBySite"
>确认账单</el-button>
</el-col> -->
<!-- <el-col :span="1.5" v-if="confirmStatus==1">
<el-button
type="danger"
plain
size="mini"
:disabled="multiple"
@click="handleCancelConfirmBySite"
>取消确认</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">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExportToBill"
>导出EXCEL电子表</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="confirmStatus==1">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleGenPayCode"
>微信收款码</el-button>
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="200" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :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">
<el-table-column :label="$t('账单期间')" align="center" prop="billMonthRange" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
</template>
@ -243,38 +100,32 @@
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
<MergeBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
</el-dialog>
</XdPageContainer>
</template>
<script>
import { listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import { listEmisSettleBill } from "@/api/emis/emisSettleBill";
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
export default {
name: "EmisSettleBillQuery",
props:{
confirmStatus:{
type:[String,Number]
queryInfo:{
type:Object
},
queryType:{
type:Number
}
},
components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
components: { },
dicts: [
],
data() {
return {
// 遮罩层
loading: true,
loading: false,
// 选中数组
ids: [],
// 非单个禁用
@ -317,115 +168,59 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
pageSize: 500,
queryCode:null,
settleBillNo: null,
settleBillName: null,
settleType: null,
settleStartDate: null,
settleEndDate: null,
billMonth: null,
recMoney: null,
recedMoney: null,
custNo: null,
customerCode: null,
customerName: null,
siteCode: null,
siteName: null,
satisfyMoney: null,
allowanceMoney: null,
deductionMoney: null,
otherMoney: null,
satisfyReason: null,
allowanceReason: null,
deductionReason: null,
otherReason: null,
openBillStatus: null,
paymentStatus: null,
chargeStatus: null,
sendPieceSum: null,
pieceNumber: null,
feeWeight: null,
uncollectedAmount: null,
sendMoneySum: null,
refundAmount: null,
refundMoney: null,
payee: null,
salesmen: null,
blSendOms: null,
blConfirmCenter: null,
confirmCenterDate: null,
confirmCenterNote: null,
confirmCenterManCode: null,
confirmCenterCode: null,
blConfirmSite: this.confirmStatus,
confirmSiteDate: null,
confirmSiteManCode: null,
confirmSiteNote: null,
confirmSiteCode: null,
remark: null,
delFlag: null,
params:{
billCode:null,
noPayBill:null,
canOpenBill:null
}
},
};
},
watch: {
watch: {
"queryInfo": {
handler (newValue, oldValue) {
console.log("====>queryInfo====>",this.queryInfo);
this.getList();
},
deep: true
}
},
created() {
this.queryOrderType="1"
this.getList();
},
methods: {
/** 查询结算总账单列表 */
getList() {
this.loading = true;
// 按运单查询时的处理
if(this.queryOrderType=='1'){
this.queryParams.params.billCode=this.queryParams.queryCode;
this.queryParams.settleBillNo=null;
this.emisSettleBillList=[];
console.log("====>queryInfo====>",this.queryInfo);
this.queryParams.salesmen=this.queryInfo.salesmen;
this.queryParams.billMonth=this.queryInfo.billMonth;
if(this.queryType==1){
this.queryParams.params.noPayBill=1;
this.queryParams.params.canOpenBill=null;
}
else if(this.queryOrderType=='2'){
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=this.queryParams.queryCode;
else if(this.queryType==2){
this.queryParams.params.noPayBill=null;
this.queryParams.params.canOpenBill=1;
}
// console.log("====>this.$store.getters.ownerSiteCode==>",this.$store.getters.ownerSiteCode)
// if(this.$store.getters.ownerSiteCode !='88888'){
// this.queryParams.salesmen=this.$store.getters.empName
// }
listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
listEmisSettleBill(this.queryParams).then(response => {
this.emisSettleBillList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleConfirmBySite(row) {
const ids = row.id || this.ids;
this.$modal.confirm('请仔细确认,确认后不可撤销').then(function() {
return confirmSettleBillBySite(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
handleGenPayCode(row) {
this.$modal.msgSuccess("暂不支持");
const ids = row.id || this.ids;
// this.$modal.confirm('').then(function() {
// return confirmSettleBillBySite(ids);
// }).then(() => {
// this.getList();
// this.$modal.msgSuccess("操作成功");
// }).catch(() => {});
},
},
handleSendDbClick(row){
this.$emit("onSelect",row);
@ -533,18 +328,6 @@ export default {
});
console.log(sums);
return sums
},
handleAddBillCode(){
},
handleRemovceBillCode(){
},
handleExportToBill() {
this.download('emis/emisSettleBill/exportBill', {
settleBillNo:this.currentSettleBillNo
}, `账单${new Date().getTime()}.xlsx`)
},
/** 搜索按钮操作 */
handleQuery() {
@ -574,18 +357,7 @@ export default {
this.queryParams.isAsc = column.order;
this.getList();
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id || this.ids;
this.openForm = true;
this.titleForm = "账单修改:"+this.currentSettleBillNo;
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisSettleBill/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
this.getList();
@ -593,115 +365,7 @@ export default {
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() {
return delEmisSettleBill(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisSettleBill/export', {
// ...this.queryParams
// }, `emisSettleBill_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisSettleBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
const data = this.formatJson(filterVal, curList, response.rows)
axios({
method: "get",
url: this.templateFile,
responseType: "arraybuffer",
}).then(response =>{
console.log("==this.templateFile=>",this.templateFile);
console.log("==xxxx=>",response);
excel.export_json_to_excel_by_tpl({
tplData:response,
header: tHeader,
data,
filename: '账单',
autoWidth: true
})
}).catch(error => console.log(error))
loadingInstance.close()
})
}
});
},
/** 导出按钮操作 */
handleExport_old() {
// this.download('emis/emisSettleBill/export', {
// ...this.queryParams
// }, `emisSettleBill_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisSettleBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
// const curList = response.rows
// import('@/vendor/Export2Excel').then(excel => {
// const tHeader = ['id','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
// const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
// const data = this.formatJson(filterVal, curList, response.rows)
// excel.export_json_to_excel({
// header: tHeader,
// data,
// filename: '结算总账单',
// autoWidth: true
// })
// loadingInstance.close()
// })
}
});
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1

View File

@ -6,14 +6,14 @@
<BillPaybackSumQuery @onSelect="onSelect"> </BillPaybackSumQuery>
</el-tab-pane>
<el-tab-pane label="开票预警汇总" name="openbill" >
<BillPaybackSumQuery @onSelect="onSelect"> </BillPaybackSumQuery>
<BillPayOpenBillSumQuery @onSelect="onSelectOpenBill"> </BillPayOpenBillSumQuery>
</el-tab-pane>
<el-tab-pane label="超期回款列表" name="paybackList" >
<el-tab-pane label="预警列表" name="warningList" >
<BillPaybackBillList :queryType="queryType" :queryInfo="queryInfo"></BillPaybackBillList>
</el-tab-pane>
<!-- <el-tab-pane label="超期开票列表" name="openBillList" >
<BillPaybackBillList :queryInfo="queryInfo"></BillPaybackBillList>
</el-tab-pane>
<el-tab-pane label="超期开票列表" name="openBillList" >
<BillPaybackBillList :queryInfo="queryInfo"></BillPaybackBillList>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
</div>
</div>
@ -23,12 +23,15 @@
import BillPaybackSumQuery from '@/views/emis/emisSettleBill/BillPaybackSumQuery.vue';
import BillPayOpenBillSumQuery from '@/views/emis/emisSettleBill/BillPayOpenBillSumQuery.vue';
import BillPaybackBillList from '@/views/emis/emisSettleBill/BillPaybackBillList.vue';
export default {
name: "BillPaybackSumList",
components: {
BillPaybackSumQuery,
BillPayOpenBillSumQuery,
BillPaybackBillList
},
dicts: [
@ -36,7 +39,8 @@ export default {
data() {
return {
activeTab:'payback',
queryInfo:null
queryInfo:null,
queryType:null
};
},
created() {
@ -47,9 +51,17 @@ export default {
},
onSelect(item) {
console.log("===onSelect===1111=>",item)
this.queryType=1;
this.queryInfo=item;
this.activeTab="billDetail";
this.activeTab="warningList";
},
onSelectOpenBill(item) {
console.log("===onSelect===2222=>",item)
this.queryType=2;
this.queryInfo=item;
this.activeTab="warningList";
},
}
};
</script>

View File

@ -67,14 +67,7 @@
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="getList"
>查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
@ -86,8 +79,6 @@
</el-row>
</div>
<!-- 销售联系人 应收总金额 账单总数量 已收款账单数量 部分收款账单数量 未收款账单数量 账期内已收金额 账期内未收金额 超期已收金额 超期未收金额 账期内回款率 超期回款率 超期未回款率 -->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('账期')" align="center" prop="billMonth" min-width="100" />
@ -197,16 +188,16 @@ export default {
// 查询参数
queryParams: {
pageNum:1,
pageSize:20,
scanType:null,
scanSiteCode:this.$store.getters.ownerSiteCode,
preOrNextStationCode:null,
scanManCode:null,
params:{
beginScanDate:null,
endScanDate:null,
},
pageSize:500,
settleBillNo: null,
settleType: null,
billMonth: null,
custNo: null,
openBillStatus: null,
paymentStatus: null,
chargeStatus: null,
payee: null,
salesmen: null,
},
// 表单参数
form: {},
@ -238,9 +229,8 @@ export default {
/** 查询明细列表 */
onDblClick(row, column, event) {
// this.loading = true;
this.tempQueryParams.scanSiteCode = row.scanSiteCode;
console.log("===>onDblClick====>",this.tempQueryParams);
this.$emit("onSelect", this.tempQueryParams);
console.log("===>onDblClick====>",row);
this.$emit("onSelect", row);
},
/** 重置按钮操作 */