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-09-06 15:53:09 +08:00
parent 1d156dcb31
commit 9a93c2b1d8
3 changed files with 134 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@
<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">
<el-table-column :label="$t('账单期间')" align="center" prop="settleDateScope" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
</template>
@ -208,7 +208,7 @@
</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="confirmSiteNote" min-width="100" :show-overflow-tooltip="true"/>
</XdTable>

116
src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
View File

@ -31,6 +31,13 @@
</el-select>
</el-form-item>
<el-form-item label="是否定制账单" prop="blMerge">
<el-select clearable v-model="queryParams.blMerge" placeholder="">
<el-option key="1" label="是" value="1"></el-option>
<el-option key="0" label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="寄件日期" prop="sendDate">
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
@ -63,6 +70,9 @@
@selection-change="handleSelectionChange"
@row-dblclick="handleSumDblClick"
show-summary
:summary-method="getSummaries"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('月结客户')" align="left" prop="custName" width="150" :sortable="true" :show-overflow-tooltip="true"/>
@ -200,7 +210,7 @@ export default {
currentTraceBillItem:null,
currentTraceBillCode:null,
// 时间搜索
// 时间搜索
// 弹出展示层
id:null,
titleView:"",
@ -456,7 +466,6 @@ export default {
},
// 获取当前月的最后一天
getMonthLast(date) {
var currentMonth = date.getMonth()
@ -500,6 +509,109 @@ export default {
this.openForm = false;
},
// <el-table-column :label="$t('总票数')" align="center" prop="totalNum" width="100" :sortable="true" />
// <el-table-column :label="$t('总件数')" align="center" prop="parcelQty" width="100" :sortable="true" />
// <el-table-column :label="$t('总重量')" align="center" prop="totalBillWeight" width="100" :sortable="true" />
// <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" width="100" :sortable="true" />
// <el-table-column :label="$t('总体积重量')" align="center" prop="totalVolumeWeight" width="120" :sortable="true" />
// <el-table-column :label="$t('结算重量')" align="center" prop="totalSettlementWeight" width="120" :sortable="true" />
// <el-table-column :label="$t('运费')" align="center" prop="totalFreight" width="100" :sortable="true" />
//指定列求和
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (
column.property === 'totalNum'
) {
const values = data.map(item => Number(item.waybillDetail.billWeight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if (
column.property === 'waybillDetail.volumeWeight'
) {
const values = data.map(item => Number(item.waybillDetail.volumeWeight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if (
column.property === 'waybillDetail.freight'
) {
const values = data.map(item => Number(item.waybillDetail.freight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if (
column.property === 'waybillDetail.totalVolume'
) {
const values = data.map(item => Number(item.waybillDetail.totalVolume));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(5); //保留2位小数
}
else if(
column.property === 'waybillDetail.parcelQty'
){
const values = data.map(item => Number(item.waybillDetail.parcelQty));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index];
}
});
// console.log(sums);
return sums
},
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({

43
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -891,31 +891,24 @@ export default {
this.openTraceInfo=true;
},
initQueryParams(){
// this.queryOrderType="1";
// this.queryOrderDateType="1";
if(this.queryParams.billCode){
if(this.queryOrderType != "1"){
this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode);
this.queryParams.billCode=null;
}else{
// 处理子单号
let qBillCode=formatSearchStr(this.queryParams.billCode);
let billArr = qBillCode.split(",");
let newBillCodeStr="";
billArr.forEach(item=>{
if(item.startsWith("T")){
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
});
this.queryParams.billCode=newBillCodeStr;
}
}
this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
let qParam=null;
if(this.queryParams.billCode){
qParam={
pageNum:this.queryParams.pageNum,
pageSize:this.queryParams.pageSize,
billCode:this.queryParams.billCode,
}
}else{
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.salesmen=='') ){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
}
qParam=this.queryParams
}
return qParam;
},
/** 查询运单列表列表 */
getList() {
@ -950,7 +943,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
if(selection!=null){
if(selection!=null&&selection.length>0){
this.billCode=selection[0].billCode;
}
this.selectionList=selection;