现金客户功能

This commit is contained in:
wuteng 2026-01-04 17:18:53 +08:00
parent feddf5fe2d
commit aa0476d826
17 changed files with 2944 additions and 176 deletions

View File

@ -48,3 +48,12 @@ export function moneyUserShipmentStat(query) {
params: query
})
}
//现金客户下来列表
export function listMoneyUserAll(query){
return request({
url: '/emis/emisMoneyUser/listMoneyUserAll',
method: 'get',
params: query
})
}

View File

@ -6,7 +6,7 @@
</el-select>
</template>
<script>
import { listMoneyUser } from "@/api/emis/emisMoneyUser";
import { listMoneyUserAll } from "@/api/emis/emisMoneyUser";
export default {
name: "EmisMoneyUserPicker",
@ -53,6 +53,11 @@ export default {
svalue: this.value,
optionDefault: null,
dataMap: new Map(),
queryParams: {
pageNum: 1,
pageSize: 10,
status: 1,
},
};
},
watch: {
@ -84,13 +89,12 @@ export default {
initData() {
this.loading = true;
let queryParams = {
pageNum: 1,
pageSize: 10,
};
let params ={
...this.queryParams
}
this.bakOptionItems = [];
this.optionItems = [];
listMoneyUser(queryParams).then(response => {
listMoneyUserAll(params).then(response => {
this.loading = false;
this.bakOptionItems = response.rows;
this.optionItems = this.bakOptionItems;
@ -98,11 +102,10 @@ export default {
},
dataFilter(val) {
let params = {
pageNum: 1,
pageSize: 10,
...this.queryParams,
company: val
};
listMoneyUser(params).then(response => {
listMoneyUserAll(params).then(response => {
this.loading = false;
this.bakOptionItems = response.rows;
this.optionItems = this.bakOptionItems;

View File

@ -0,0 +1,736 @@
<template>
<XdPageContainer class="app-container">
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="mini"
ref="refTable"
row-key="id"
storageName="paybackrecord_query_main_25050208"
:data="billList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
show-summary
:summary-method="getSummaries"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
</el-row>
</div>
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span> {{scope.row.billCode}} </span>
<i v-if="scope.row.billCode"
style="margin-left: 4px; cursor: pointer"
class="el-icon-document-copy"
@click="handleCopy(scope.row,$event)"></i>
</template>
</el-table-column>
<el-table-column :label="$t('快件跟踪')" align="left" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<div >{{ scope.row.lastTraceInfo }}</div>
</template>
</el-table-column>
<!-- class="link-type" @click="handleShowTraceInfo(scope.row)" class="link-type" @click="handleShowTraceInfo(scope.row)" class="link-type" @click="handleShowTraceInfo(scope.row)" -->
<el-table-column :label="$t('跟踪预警')" align="center" prop="traceWaring" min-width="100" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<div v-if="scope.row.lastScanDate!=null" >
<div v-if="scope.row.blSign=='1'" >
已签收
</div>
<div v-else >
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
</span>
<span v-else >
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
</span>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
</template>
</el-table-column>
<el-table-column :label="$t('发件人')" align="center" prop="fjr" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="100" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收件员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('操作员')" align="center" prop="operateEmployeeName" min-width="100" >
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==1">{{scope.row.operateEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.customsEclaration"/>
</template>
</el-table-column>
<el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear"/>
</template>
</el-table-column>
<el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('客户名称')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.custName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
// <el-table-column :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div v-if="scope.row.blMessage==1" >发送</div>
<div v-else>不发送</div>
</template>
</el-table-column>
<el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派货短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div v-if="scope.row.blAcceptMessage==1" >发送</div>
<div v-else>不发送</div>
</template>
</el-table-column>
<el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.packType"/>
</template>
</el-table-column>
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="80" />
<el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="80" />
<el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="80" />
<el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="80" />
<el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
<template slot-scope="scope">
<div v-if="scope.row.dispatchMethod==1" >派送</div>
<div v-else>自提</div>
</template>
</el-table-column>
<el-table-column :label="$t('支付类型')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
</template>
</el-table-column>
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
// <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
// <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('费用备注')" align="center" prop="feeRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('签收状态')" align="center" prop="blSign" width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blSign=='1'" type="success">已签收</el-tag>
<el-tag v-else type="danger">未签收</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ remarkFormat(scope.row) }}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
<el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.goodsPics!=null && scope.row.goodsPics!=''" type="success">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('提单号')" align="center" prop="ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="companyCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('主单号')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('主单对应的虚拟单')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
</XdTable>
</XdPageContainer>
</template>
<script>
import { monthlyShipmentDetail } from "@/api/emis/emisCustomerUser";
import {timeDiffTime} from '@/utils/dateUtils'
import { queryLastRecord } from "@/api/emis/emisTmsScanRecord";
export default {
name: "MoneyUserShipmentDetail",
props:{
},
components: { },
dicts: ['emis_settlebill_pay_type','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
],
data() {
return {
// 遮罩层
loading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 结算总账单表格数据
billList: [],
selectList: [],
currentId:null,
openForm: false,
titleForm: "",
subBillTotal: 0,
// 结算子账单表格数据
emisSettleSubBillList: [],
currentSettleBillNo:null,
queryOrderType:null,
// 弹出展示层
id:null,
titleView:"",
openView: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
custNo: null,
transType: null,
sendCountry: null,
receiveCountry: null,
salesExecutive: null, // 销售支持
salesmen: null, // 销售联系人
salesSupport: null, // 销售支持
params: {
beginSendDate: null,
endSendDate: null,
}
},
};
},
watch: {
$route () {
if(this.$route.query.query){
this.queryParams =JSON.parse(this.$route.query.query);
this.getList();
}
}
},
created() {
// console.log("====>queryParams====>",this.$route.query.query);
if(this.$route.query.query){
this.queryParams =JSON.parse(this.$route.query.query);
this.getList();
}
},
methods: {
/** 查询结算总账单列表 */
async getList() {
this.loading = true;
this.billList=[];
await monthlyShipmentDetail(this.queryParams).then(response => {
this.billList = response.rows;
this.total = response.total;
this.loading = false;
});
// 触发获取最后轨迹更新
this.showLastTraceInfo();
},
//指定列求和
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
// if (
// column.property === 'settleSubBill.invoicedMoney'
// ) {
// const values = data.map(item => Number(item['settleSubBill']['invoicedMoney']));
// 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); //保留0位小数
// }
// else if (
// column.property === 'settleBillDetail.recMoney'
// ) {
// const values = data.map(item => Number(item['settleBillDetail']['recMoney']));
// 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.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] = sums[index].toFixed(0); //保留0位小数
// }
// else if (
// column.property === 'waybillDetail.billWeight'
// ) {
// 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.billWeight'
// ) {
// 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.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(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.settlementWeight'
// ) {
// const values = data.map(item => Number(item['waybillDetail']['settlementWeight']));
// 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位小数
// }
if(
column.property === 'payMoney'
){
const values = data.map(item => Number(item.payMoney));
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位小数
}
});
console.log(sums);
return sums
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.selectList=selection;
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
if(selection&&selection.length>0){
this.currentSettleBillNo=selection[0].settleBillNo;
}
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({
text: '正在导出...'
})
if(this.selectionList&&this.selectionList.length>0){
this.exportData(this.selectionList,loadingInstance);
}
else{
monthlyShipmentDetail(this.queryParams).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}
});
}
},
exportData(selData,loadingInstance){
const curList =selData
import('@/vendor/Export2Excel').then(excel => {
const exportParam=this.$refs.refTable.getExportParam();
const tHeader = exportParam.header;
const filterVal = exportParam.filter;
const data = this.formatJson(filterVal, curList, selData)
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 === 'kjlx') {
return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
}
if (j === 'fjr') {
return v['sendName']+'--'+v['receiveName'];
}
if (j === 'custName') {
let paymentType=v['paymentType'];
if(paymentType==2 || paymentType==4 || paymentType==5 ){
return v['custName'];
}else{
return "";
}
}
if (j === 'sendMobile') {
return "";
}
if (j === 'paymentStatus') {
return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
}
if (j === 'pickupMethod') {
return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
}
if (j === 'customsEclaration') {
return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
}
if (j === 'customsClear') {
return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
}
if (j === 'packType') {
return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
}
if (j === 'dispatchMethod') {
if(v[j] == 1){
return '派送';
}else{
return '自提';
}
}
if (j === 'blUploadPic') {
if(v['goodsPics']!=null && v['goodsPics']!=''){
return '是';
}else{
return '否';
}
}
if (j === 'blMessage') {
if(v[j] == 1){
return '发送';
}else{
return '不发送';
}
}
if (j === 'blAcceptMessage') {
if(v[j] == 1){
return '发送';
}else{
return '不发送';
}
}
if (j === 'blSign') {
if(v[j] == 1){
return '已签收';
}else{
return '未签收';
}
}
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
dateTimeChange(value){
this.dateTimeRange=value;
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单,对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
calcDeliveryTime(endDate, startData) {
let days = timeDiffTime(startData, endDate)
return days;
},
//拼接虚拟单后6位
conCatVirtualRemark(virtualRemark) {
if (virtualRemark != null) {
return virtualRemark.split(',').map((item) => {
return item.substring(item.length - 6);
}).join(',');
}
},
showLastTraceInfo(){
console.log("===showLastTraceInfo===1111=>",this.billList)
if(this.billList&&this.billList.length>0){
this.billList.forEach(item=>{
queryLastRecord(item.billCode).then(response => {
let data=response.data;
item.lastTraceInfo=data.lastTraceInfo;
item.lastScanDate=data.scanDate;
});
});
}
},
}
};
</script>
<style lang="scss" scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
.query-label {
.el-radio{
display: block;
line-height: 23px;
white-space: normal;
margin-right: 0;
}
}
</style>

View File

@ -0,0 +1,63 @@
<template>
<div class="app-container">
<div class="el-tabs-container">
<el-tabs slot="pageTabs" v-model="activeTab" @tab-click="handleTabsClick">
<el-tab-pane label="按运输方式统计" name="shipment" >
<MoneyUserShipmentStatQuery @onSelect="onSelect"> </MoneyUserShipmentStatQuery>
</el-tab-pane>
<el-tab-pane label="按目的国家统计" name="receiveCountry" >
<MoneyUserShipmentStatReceiveCountryQuery @onSelect="onSelect"> </MoneyUserShipmentStatReceiveCountryQuery>
</el-tab-pane>
<el-tab-pane label="明细列表" v-if="showDtlList" name="dtlList" >
<!-- <PayBackRecordList :queryType="queryType" :queryInfo="queryInfo"></PayBackRecordList> -->
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
import MoneyUserShipmentStatQuery from '@/views/emis/emisCustomerUser/moneyUserShipmentStatQuery.vue';
import MoneyUserShipmentStatReceiveCountryQuery from '@/views/emis/emisCustomerUser/moneyUserShipmentStatReceiveCountryQuery.vue';
export default {
name: "MoneyUserShipmentStat",
components: {
MoneyUserShipmentStatQuery,
MoneyUserShipmentStatReceiveCountryQuery,
},
dicts: [
],
data() {
return {
activeTab:'shipment',
queryInfo:null,
queryType:null,
showDtlList:false,
};
},
created() {
},
methods: {
handleTabsClick(){
},
onSelect(item) {
console.log("===onSelect===1111=>",item)
this.showDtlList=true;
this.queryType=1;
this.queryInfo=item;
this.activeTab="dtlList";
},
}
};
</script>
<style scoped>
/* .el-tabs__nav{
display: flex !important;
flex-wrap: wrap !important;
} */
</style>

View File

@ -0,0 +1,815 @@
<template>
<XdPageContainer id="moneyUserShipmentStatQuery" >
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="90px" label-position="left" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- 查询条件:客户名称、寄件公司、销售联系人、回款联系人、运单号、账单号、账期月、收款时间、收款登记人、 -->
<el-col :span="6">
<el-form-item label="寄件时间" prop="createTime" label-width="68px">
<elDateAdvPicker v-model="dateTimeRange" style="z-index:9999;width:260px" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="对比时间" prop="createTime" label-width="68px">
<elDateAdvPicker v-model="dateTimeRangeCompare" style="z-index:9999;width:260px" ></elDateAdvPicker>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="客户名称" prop="moneyUserId" >
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" style="width:100%"></EmisMoneyUserPicker>
</el-form-item>
<el-form-item label="寄件国家" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
</el-form-item>
<el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" ></CountryPicker2>
</el-form-item>
<el-form-item label="销售主管" prop="salesExecutive" >
<EmpNamePicker1 :placeholder="$t('销售主管')" v-model="queryParams.salesExecutive" ></EmpNamePicker1>
</el-form-item>
<el-form-item label="销售联系人" prop="salesmen" >
<EmpNamePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></EmpNamePicker2>
</el-form-item>
<el-form-item label="销售支持" prop="salesSupport" >
<EmpNamePicker3 :placeholder="$t('销售支持')" v-model="queryParams.salesSupport" ></EmpNamePicker3>
</el-form-item>
</el-col>
</el-row>
</SearchForm>
<div slot="pageContent">
<xd-table
height="calc(100vh - 20rem)"
ref="refTable"
v-loading="loading"
border
size="mini"
storageName="MonthlyShipmentStatList_main_2511_13"
:data="emisStatList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
show-summary
:summary-method="getSummaries"
highlight-current-row
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('客户名称')" align="left" prop="customerName" width="200" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('首次签约日期')" align="left" prop="firstSigningDay" width="110" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('总票数')" align="center" prop="totalTickets" width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,null)">{{ scope.row.totalTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.totalTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.totalTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.totalTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="140" sortable >
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.totalWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.totalWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.totalWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.totalWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="120" />
<el-table-column :label="$t('快递')" align="center" prop="express" min-width="120" >
<el-table-column :label="$t('票数')" align="center" prop="expressTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,1)">{{ scope.row.expressTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.expressTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.expressTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.expressTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="expressWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.expressWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.expressWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.expressWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.expressWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('空运')" align="center" prop="air" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="airTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,2)">{{ scope.row.airTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.airTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.airTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.airTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="airWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.airWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.airWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.airWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.airWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('陆运')" align="center" prop="land" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="landTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'3,5')">{{ scope.row.landTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.landTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.landTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.landTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="landWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.landWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.landWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.landWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.landWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('进口')" align="center" prop="import" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="importTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'import')">{{ scope.row.importTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.importTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.importTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.importTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="importWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.importWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.importWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.importWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.importWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('海运')" align="center" prop="sea" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="seaTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,4)">{{ scope.row.seaTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.seaTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.seaTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.seaTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="seaWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.seaWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.seaWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.seaWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.seaWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('其他')" align="center" prop="other" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="otherTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'other')">{{ scope.row.otherTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.otherTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.otherTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.otherTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="otherWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.otherWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.otherWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.otherWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.otherWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
</xd-table>
</div>
</XdPageContainer>
</template>
<script>
import { moneyUserShipmentStat } from "@/api/emis/emisMoneyUser";
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import EmisMoneyUserPicker from "../EmisBaseTools/EmisMoneyUserPicker.vue";
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import { timeFormat } from '@/utils/dateUtils';
export default {
name: "MoneyUserShipmentStatQuery",
components: { EmpNamePicker1,EmpNamePicker2,EmpNamePicker3,elDateAdvPicker,EmisMoneyUserPicker,CountryPicker1,CountryPicker2 },
dicts: ['emis_payment_status'],
data() {
return {
// 调整表格的高度,不允许滚动
tableHeight: 200,
// 遮罩层
loading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 对比时间
dateTimeRangeCompare:[],
// 总条数
total: 0,
recordTotal:0,
emisStatList: [],
emisStatRecordList:[],
selectionList:[],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
activeName: 'first',
openForm: false,
titleForm: "",
queryOrderType:null,
queryStatInfoMap:null,
titleEmisElectronicPagApply: "",
openEmisElectronicPagApply: false,
// 显示编辑框更多
moreInputVisible: false,
dataMap:new Map(),
// 弹出展示层
currentId:null,
id:null,
titleView:"",
openView: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
// id: null,
sendCountry: null,
receiveCountry: null,
salesExecutive: null, // 销售支持
salesmen: null, // 销售联系人
salesSupport: null, // 销售支持
params: {
beginSendDate: null,
endSendDate: null,
statType:'1',
moneyUserId: null,
}
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
}
};
},
created() {
let start = new Date()
start.setDate(1)
start.setHours(0, 0, 0, 0)
let end = new Date()
var currentMonth = end.getMonth()
var nextMonth = ++currentMonth
var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)
var oneDay = 1000 * 60 * 60 * 24
end = new Date(nextMonthFirstDay - oneDay)
end.setHours(23, 59, 59, 0)
this.dateTimeRange = [timeFormat(start), timeFormat(end)]
this.getList();
},
methods: {
initQueryParams(){
let thisQueryParams = {...this.queryParams};
console.log("====>thisQueryParams====>", thisQueryParams);
thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRange,"SendDate");
thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRangeCompare,"CompareDate");
if(this.dateTimeRangeCompare && this.dateTimeRangeCompare.length > 0){
thisQueryParams.params.statType = 3;
}else{
thisQueryParams.params.statType = 1;
}
return thisQueryParams;
},
handleShowBillList(row, transType) {
let params = {
...this.queryParams,
transType: transType,
params: {
...this.queryParams.params,
moneyUserId: row.id,
}
};
this.$router.push(
{
path: '/BIStatData/moneyUserShipmentDetail',
query: {
query: JSON.stringify(params)
}
}
);
},
/** 查询统计信息 */
getList() {
this.loading = true;
let tempQueryParams = this.initQueryParams();
moneyUserShipmentStat(tempQueryParams).then(response => {
this.emisStatList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleQuery(){
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.selectionList=selection;
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
getProperty(obj, str) {
str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
let arr = str.split(".");
for (let i in arr) {
obj = obj[arr[i]] || "";
}
return obj;
},
sortFun: function (attr, rev) {
//第一个参数传入info里的prop表示排的是哪一列,第二个参数是升还是降排序
if (rev == undefined||rev==null) {
rev = 1;
} else {
rev = (rev) ? 1 : -1;
}
let that=this;
return function (a, b) {
a = that.getProperty(a,attr);
b = that.getProperty(b,attr);
if (a < b) {
return rev * -1;
}
if (a > b) {
return rev * 1;
}
return 0;
}
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.emisStatList = this.emisStatList.sort(
this.sortFun(column.prop, column.order === 'ascending')
);
},
//指定列求和
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (
column.property === 'totalTickets'
) {
const values = data.map(item => Number(item.totalTickets));
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(0);
}
else if (
column.property === 'totalWeight'
) {
const values = data.map(item => Number(item.totalWeight));
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);
}
else if (
column.property === 'expressTickets'
) {
const values = data.map(item => Number(item.expressTickets));
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(0);
}
else if (
column.property === 'expressWeight'
) {
const values = data.map(item => Number(item.expressWeight));
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);
} else if (
column.property === 'airTickets'
){
const values = data.map(item => Number(item.airTickets));
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(0);
} else if(
column.property === 'airWeight'
){
const values = data.map(item => Number(item.airWeight));
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);
}else if(
column.property === 'landTickets'
){
const values = data.map(item => Number(item.landTickets));
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(0);
}else if(
column.property === 'landWeight'
){
const values = data.map(item => Number(item.landWeight));
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);
}else if(
column.property === 'importTickets'
){
const values = data.map(item => Number(item.importTickets));
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(0);
}else if(
column.property === 'importWeight'
){
const values = data.map(item => Number(item.importWeight));
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);
}else if(
column.property === 'seaTickets'
){
const values = data.map(item => Number(item.seaTickets));
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(0);
}else if(
column.property === 'seaWeight'
){
const values = data.map(item => Number(item.seaWeight));
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);
}else if(
column.property === 'otherTickets'
){
const values = data.map(item => Number(item.otherTickets));
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(0);
}else if(
column.property === 'otherWeight'
){
const values = data.map(item => Number(item.otherWeight));
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);
}
});
return sums
},
handleExportDtl(){
},
/** 导出按钮操作 */
handleExport() {
let qExportParam=this.initQueryParams();
qExportParam.pageNum=1;
qExportParam.pageSize=10000;
this.download('/emis/emisCustomerUser/exportMoneyShipmentStat', {
...qExportParam
}, `按运输方式统计导出.xlsx`)
// const loadingInstance = this.$loading({
// text: '正在导出...'
// })
// const $e = this.$refs['refTable'].$el
// let $table = $e.querySelector('.el-table__fixed')
// if(!$table) {
// $table = $e
// }
// import('@/vendor/Export2Excel').then(excel => {
// excel.table_to_book($table,"月结客户出货统计.xlsx");
// loadingInstance.close()
// })
// loadingInstance.close();
// let qExportParam = this.initQueryParams();;
// qExportParam.pageNum=1;
// qExportParam.pageSize=20000;
// monthlyShipmentStat(qExportParam).then(response => {
// if (response.code === 200) {
// this.exportData(response.rows,loadingInstance);
// }
// });
},
exportData(selData,loadingInstance){
const curList =selData
import('@/vendor/Export2Excel').then(excel => {
const exportParam=this.$refs.refTable.getExportParam();
const tHeader = exportParam.header;
const filterVal = exportParam.filter;
const data = this.formatJson(filterVal, curList, selData)
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 === 'paymentStatus') {
return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
}
if (j === 'openBillStatus') {
if(v[j] == 0){
return '未开票';
}
else if(v[j] == 1){
return '已开票';
}
else if(v[j] == 2){
return '部分开票';
}
else if(v[j] == 3){
return '不开票';
}
else{
return '/';
}
}
if (j === 'settleType') {
if(v[j] == 1){
return '现金';
}
else if(v[j] == 2){
return '月结';
}
}
return v[j]
}))
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
.ellipsis {
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
white-space: nowrap;
}
.flex-center{
display: flex;
align-items: center;
width: 90%;
margin: 0 auto;
}
.icon-content{
margin-left: 10px;
margin-left: auto;
font-size: 18px;
font-weight: bold;
}
.el-icon-right{
color: #409EFF;
}
.el-icon-top{
color: #dd0c1e;
}
.el-icon-bottom{
color: #12da33;
}
</style>

View File

@ -0,0 +1,921 @@
<template>
<XdPageContainer id="moneyUserShipmentStatReceiveCountryQuery" >
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="90px" label-position="left" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- 查询条件:客户名称、寄件公司、销售联系人、回款联系人、运单号、账单号、账期月、收款时间、收款登记人、 -->
<el-col :span="6">
<el-form-item label="寄件时间" prop="createTime" label-width="68px">
<elDateAdvPicker v-model="dateTimeRange" style="z-index:9999;width:260px" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="对比时间" prop="createTime" label-width="68px">
<elDateAdvPicker v-model="dateTimeRangeCompare" style="z-index:9999;width:260px" ></elDateAdvPicker>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="客户名称" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" style="width:100%" ></EmisMoneyUserPicker>
</el-form-item>
<el-form-item label="寄件国家" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
</el-form-item>
<el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" ></CountryPicker2>
</el-form-item>
<el-form-item label="销售主管" prop="salesExecutive" >
<EmpNamePicker1 :placeholder="$t('销售主管')" v-model="queryParams.salesExecutive" ></EmpNamePicker1>
</el-form-item>
<el-form-item label="销售联系人" prop="salesmen" >
<EmpNamePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></EmpNamePicker2>
</el-form-item>
<el-form-item label="销售支持" prop="salesSupport" >
<EmpNamePicker3 :placeholder="$t('销售支持')" v-model="queryParams.salesSupport" ></EmpNamePicker3>
</el-form-item>
</el-col>
</el-row>
</SearchForm>
<div slot="pageContent">
<xd-table
height="calc(100vh - 20rem)"
ref="refTable"
v-loading="loading"
border
size="mini"
storageName="MonthlyShipmentStatReceiveCountryList_main_2511_13"
:data="emisStatList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
show-summary
:summary-method="getSummaries"
highlight-current-row
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('客户名称')" align="left" prop="customerName" width="200" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('首次签约日期')" align="left" prop="firstSigningDay" width="110" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('总票数')" align="center" prop="totalTickets" width="110" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,null)">{{ scope.row.totalTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.totalTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.totalTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.totalTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="140" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.totalWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.totalWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.totalWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.totalWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="120" />
<el-table-column :label="$t('中国')" align="center" prop="china" min-width="120" >
<el-table-column :label="$t('票数')" align="center" prop="chinaTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'0086')">{{ scope.row.chinaTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.chinaTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.chinaTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.chinaTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="chinaWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.chinaWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.chinaWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.chinaWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.chinaWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('越南')" align="center" prop="vietnam" min-width="120" >
<el-table-column :label="$t('票数')" align="center" prop="vietnamTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'0084')">{{ scope.row.vietnamTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.vietnamTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.vietnamTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.vietnamTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="vietnamWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.vietnamWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.vietnamWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.vietnamWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.vietnamWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('柬埔寨')" align="center" prop="cambodia" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="cambodiaTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'0855')">{{ scope.row.cambodiaTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.cambodiaTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.cambodiaTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.cambodiaTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="cambodiaWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.cambodiaWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.cambodiaWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.cambodiaWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.cambodiaWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('缅甸')" align="center" prop="myanmar" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="myanmarTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'0095')">{{ scope.row.myanmarTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.myanmarTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.myanmarTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.myanmarTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="myanmarWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.myanmarWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.myanmarWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.myanmarWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.myanmarWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('孟加拉')" align="center" prop="bangladesh" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="bangladeshTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'0880')">{{ scope.row.bangladeshTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.bangladeshTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.bangladeshTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.bangladeshTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="bangladeshWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.bangladeshWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.bangladeshWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.bangladeshWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.bangladeshWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('老挝')" align="center" prop="laos" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="laosTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'0856')">{{ scope.row.laosTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.laosTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.laosTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.laosTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="laosWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.laosWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.laosWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.laosWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.laosWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('泰国')" align="center" prop="thailand" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="thailandTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'0066')">{{ scope.row.thailandTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.thailandTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.thailandTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.thailandTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="thailandWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.thailandWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.thailandWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.thailandWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.thailandWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('其他')" align="center" prop="other" width="100" >
<el-table-column :label="$t('票数')" align="center" prop="otherTickets" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span @click="handleShowBillList(scope.row,'other')">{{ scope.row.otherTickets }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.otherTicketsCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.otherTicketsCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.otherTicketsCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="otherWeight" min-width="120" sortable>
<template slot-scope="scope">
<div class="flex-center">
<span>{{ scope.row.otherWeight }}</span>
<div class="icon-content" >
<i class="el-icon-right" v-if="scope.row.otherWeightCompareFlag == 0" ></i>
<i class="el-icon-top" v-if="scope.row.otherWeightCompareFlag == 1" ></i>
<i class="el-icon-bottom" v-if="scope.row.otherWeightCompareFlag == 2"></i>
</div>
</div>
</template>
</el-table-column>
</el-table-column>
</xd-table>
</div>
</XdPageContainer>
</template>
<script>
import { moneyUserShipmentStat } from "@/api/emis/emisMoneyUser";
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import EmisMoneyUserPicker from "../EmisBaseTools/EmisMoneyUserPicker.vue";
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import { timeFormat } from '@/utils/dateUtils';
export default {
name: "MoneyUserShipmentStatReceiveCountryQuery",
components: { EmpNamePicker1,EmpNamePicker2,EmpNamePicker3,elDateAdvPicker,EmisMoneyUserPicker,CountryPicker1,CountryPicker2 },
dicts: ['emis_payment_status'],
data() {
return {
// 调整表格的高度,不允许滚动
tableHeight: 200,
// 遮罩层
loading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 对比时间
dateTimeRangeCompare:[],
// 总条数
total: 0,
recordTotal:0,
emisStatList: [],
emisStatRecordList:[],
selectionList:[],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
activeName: 'first',
openForm: false,
titleForm: "",
queryOrderType:null,
queryStatInfoMap:null,
titleEmisElectronicPagApply: "",
openEmisElectronicPagApply: false,
// 显示编辑框更多
moreInputVisible: false,
dataMap:new Map(),
// 弹出展示层
currentId:null,
id:null,
titleView:"",
openView: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
// custNo: null,
sendCountry: null,
receiveCountry: null,
salesExecutive: null, // 销售支持
salesmen: null, // 销售联系人
salesSupport: null, // 销售支持
params: {
beginSendDate: null,
endSendDate: null,
statType:'2',
moneyUserId: null,
}
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
}
};
},
created() {
let start = new Date()
start.setDate(1)
start.setHours(0, 0, 0, 0)
let end = new Date()
var currentMonth = end.getMonth()
var nextMonth = ++currentMonth
var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)
var oneDay = 1000 * 60 * 60 * 24
end = new Date(nextMonthFirstDay - oneDay)
end.setHours(23, 59, 59, 0)
this.dateTimeRange = [timeFormat(start), timeFormat(end)]
this.getList();
},
methods: {
initQueryParams(){
let thisQueryParams = {...this.queryParams};
thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRange,"SendDate");
thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRangeCompare,"CompareDate");
if(this.dateTimeRangeCompare && this.dateTimeRangeCompare.length > 0){
thisQueryParams.params.statType = 4;
}else{
thisQueryParams.params.statType = 2;
}
return thisQueryParams;
},
handleShowBillList(row, receiveCountry) {
//queryParams 的params 的moneyUserId 赋值
let params = {
...this.queryParams,
receiveCountry: receiveCountry,
params: {
...this.queryParams.params,
moneyUserId: row.id,
}
};
console.log("====>params====>", params);
this.$router.push(
{
path: '/BIStatData/moneyUserShipmentDetail',
query: {
query: JSON.stringify(params)
}
}
);
},
/** 查询统计信息 */
getList() {
this.loading = true;
let tempQueryParams = this.initQueryParams();
moneyUserShipmentStat(tempQueryParams).then(response => {
this.emisStatList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleQuery(){
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.selectionList=selection;
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
getProperty(obj, str) {
str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
let arr = str.split(".");
for (let i in arr) {
obj = obj[arr[i]] || "";
}
return obj;
},
sortFun: function (attr, rev) {
//第一个参数传入info里的prop表示排的是哪一列,第二个参数是升还是降排序
if (rev == undefined||rev==null) {
rev = 1;
} else {
rev = (rev) ? 1 : -1;
}
let that=this;
return function (a, b) {
a = that.getProperty(a,attr);
b = that.getProperty(b,attr);
if (a < b) {
return rev * -1;
}
if (a > b) {
return rev * 1;
}
return 0;
}
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.emisStatList = this.emisStatList.sort(
this.sortFun(column.prop, column.order === 'ascending')
);
},
//指定列求和
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (
column.property === 'totalTickets'
) {
const values = data.map(item => Number(item.totalTickets));
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(0);
}
else if (
column.property === 'totalWeight'
) {
const values = data.map(item => Number(item.totalWeight));
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);
}
else if (
column.property === 'chinaTickets'
) {
const values = data.map(item => Number(item.chinaTickets));
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(0);
}
else if (
column.property === 'chinaWeight'
) {
const values = data.map(item => Number(item.chinaWeight));
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);
} else if (
column.property === 'vietnamTickets'
) {
const values = data.map(item => Number(item.vietnamTickets));
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(0);
} else if (
column.property === 'vietnamWeight'
) {
const values = data.map(item => Number(item.vietnamWeight));
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);
} else if (
column.property === 'cambodiaTickets'
) {
const values = data.map(item => Number(item.cambodiaTickets));
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(0);
} else if (
column.property === 'cambodiaWeight'
) {
const values = data.map(item => Number(item.cambodiaWeight));
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);
} else if (
column.property === 'myanmarTickets'
) {
const values = data.map(item => Number(item.myanmarTickets));
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(0);
} else if (
column.property === 'myanmarWeight'
) {
const values = data.map(item => Number(item.myanmarWeight));
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);
} else if (
column.property === 'bangladeshTickets'
) {
const values = data.map(item => Number(item.bangladeshTickets));
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(0);
} else if (
column.property === 'bangladeshWeight'
) {
const values = data.map(item => Number(item.bangladeshWeight));
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);
}
else if (
column.property === 'otherTickets'
) {
const values = data.map(item => Number(item.otherTickets));
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(0);
} else if (
column.property === 'otherWeight'
) {
const values = data.map(item => Number(item.otherWeight));
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);
} else if (
column.property === 'laosTickets'
) {
const values = data.map(item => Number(item.laosTickets));
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(0);
} else if (
column.property === 'laosWeight'
) {
const values = data.map(item => Number(item.laosWeight));
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);
} else if (
column.property === 'thailandTickets'
) {
const values = data.map(item => Number(item.thailandTickets));
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(0);
} else if (
column.property === 'thailandWeight'
) {
const values = data.map(item => Number(item.thailandWeight));
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);
}
});
return sums
},
handleExportDtl(){
},
/** 导出按钮操作 */
handleExport() {
let qExportParam=this.initQueryParams();
qExportParam.pageNum=1;
qExportParam.pageSize=10000;
this.download('/emis/emisCustomerUser/exportMoneyShipmentStat', {
...qExportParam
}, `按目的国家统计导出.xlsx`)
// const loadingInstance = this.$loading({
// text: '正在导出...'
// })
// const $e = this.$refs['refTable'].$el
// let $table = $e.querySelector('.el-table__fixed')
// if(!$table) {
// $table = $e
// }
// import('@/vendor/Export2Excel').then(excel => {
// excel.table_to_book($table,"月结客户出货统计.xlsx");
// loadingInstance.close()
// })
// loadingInstance.close();
// let qExportParam = this.initQueryParams();;
// qExportParam.pageNum=1;
// qExportParam.pageSize=20000;
// monthlyShipmentStat(qExportParam).then(response => {
// if (response.code === 200) {
// this.exportData(response.rows,loadingInstance);
// }
// });
},
exportData(selData,loadingInstance){
const curList =selData
import('@/vendor/Export2Excel').then(excel => {
const exportParam=this.$refs.refTable.getExportParam();
const tHeader = exportParam.header;
const filterVal = exportParam.filter;
const data = this.formatJson(filterVal, curList, selData)
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 === 'paymentStatus') {
return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
}
if (j === 'openBillStatus') {
if(v[j] == 0){
return '未开票';
}
else if(v[j] == 1){
return '已开票';
}
else if(v[j] == 2){
return '部分开票';
}
else if(v[j] == 3){
return '不开票';
}
else{
return '/';
}
}
if (j === 'settleType') {
if(v[j] == 1){
return '现金';
}
else if(v[j] == 2){
return '月结';
}
}
return v[j]
}))
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
.ellipsis {
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
white-space: nowrap;
}
.flex-center{
display: flex;
align-items: center;
width: 90%;
margin: 0 auto;
}
.icon-content{
margin-left: 10px;
margin-left: auto;
font-size: 18px;
font-weight: bold;
}
.el-icon-right{
color: #409EFF;
}
.el-icon-top{
color: #dd0c1e;
}
.el-icon-bottom{
color: #12da33;
}
</style>

View File

@ -76,7 +76,7 @@
<el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" />
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
<!-- <el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" /> -->
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
@ -99,6 +99,7 @@
<el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('月结客户')" align="center" prop="custNo" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('现金客户')" align="center" prop="moneyUserCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
@ -478,6 +479,7 @@ export default {
billCode: element['运单号'],
sendDate: parseTime(new Date()),
custNo: element['月结客户'],
moneyUserCompany: element['现金客户'],
receiveName: element['收件人'],
receiveCompany:element['收件公司'],
receiveMobile:element['收件电话'],
@ -513,7 +515,7 @@ export default {
feeRemark:element['费用备注'],
payee: element['回款联系人'],
salesmen: element['销售联系人'],
salesSupport: element['销售支持'],
// salesSupport: element['销售支持'],
operateEmployeeCode: element['取件员/操作员'],
remark: element['录单备注'],
blMessage: element['寄件/签收短信'],
@ -525,27 +527,27 @@ export default {
uploadStatus: 0,
errorInfo:'',
}
if (orderData.salesSupport) {
//判断销售支持是否属于销售联系人
let queryParams = {
pageNum: 1,
pageSize: 100,
status: 1,
salesmen: orderData.salesmen,
salesSupport: orderData.salesSupport,
params: {
userStatus: 1,
sendDate: parseTime(new Date()),
},
}
getSalesmanSupportList(queryParams).then(response => {
let supportList = response.rows;
if (supportList.findIndex(t => t.salesSupport === orderData.salesSupport) === -1) {
orderData.errorInfo = '销售支持不属于销售联系人';
orderData.uploadStatus = -1;
}
});
}
// if (orderData.salesSupport) {
// //判断销售支持是否属于销售联系人
// let queryParams = {
// pageNum: 1,
// pageSize: 100,
// status: 1,
// salesmen: orderData.salesmen,
// salesSupport: orderData.salesSupport,
// params: {
// userStatus: 1,
// sendDate: parseTime(new Date()),
// },
// }
// getSalesmanSupportList(queryParams).then(response => {
// let supportList = response.rows;
// if (supportList.findIndex(t => t.salesSupport === orderData.salesSupport) === -1) {
// orderData.errorInfo = '销售支持不属于销售联系人';
// orderData.uploadStatus = -1;
// }
// });
// }
this.tmpDataList.push(orderData);
}

View File

@ -266,8 +266,10 @@
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" ></EmisMoneyUserPicker>
</el-form-item>
</el-col>
<el-col :span="6">
@ -405,10 +407,10 @@
<div v-else>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
</span>
<span v-else >
</span>
<span v-else >
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
</span>
</span>
</div>
</div>
</div>
@ -476,8 +478,12 @@
<el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
<!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('客户名称')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<el-table-column :label="$t('现金客户')" align="center" prop="waybillOther.moneyCompany" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{scope.row.waybillOther?.moneyCompany}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.custName}}</span>
<span v-else></span>
@ -485,8 +491,11 @@
</el-table-column>
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="waybillOther.salesSupport" min-width="100" >
<template slot-scope="scope">
{{ scope.row.waybillOther?.salesSupport }}
</template>
</el-table-column>
<el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
@ -661,6 +670,7 @@ import { formatSearchStr,deepClone } from '@/utils/index'
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
export default {
name: "CenterWaybillList",
@ -688,7 +698,8 @@ export default {
TraceWaybillDetailView,
TransLineAllPicker,
TransProductAllPicker,
AllMonthpayAccountPicker
AllMonthpayAccountPicker,
EmisMoneyUserPicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
@ -918,7 +929,8 @@ export default {
expireNotSign:null,
problemQueryType:null,
problemQueryIds:null,
blUploadGoodsPic:null
blUploadGoodsPic:null,
moneyUserId:null,
}
},
};
@ -1213,6 +1225,12 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if(j === 'waybillOther.salesSupport'){
return v['waybillOther']['salesSupport'];
}
if(j === 'waybillOther.moneyCompany'){
return v['waybillOther']['moneyCompany'];
}
return v[j]
}))
},

View File

@ -245,7 +245,9 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" ></EmisMoneyUserPicker>
</el-form-item>
</el-col>
<el-col :span="6">
@ -388,12 +390,12 @@
<div v-else>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
</span>
<span v-else >
</span>
<span v-else >
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
</span>
</span>
</div>
</div>
</div>
</div>
</template>
</el-table-column>
@ -458,8 +460,12 @@
<el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
<!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('客户名称')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<el-table-column :label="$t('现金客户')" align="center" prop="waybillOther.moneyCompany" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{scope.row.waybillOther?.moneyCompany}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.custName}}</span>
<span v-else></span>
@ -467,8 +473,11 @@
</el-table-column>
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="waybillOther.salesSupport" min-width="100" >
<template slot-scope="scope">
{{ scope.row.waybillOther?.salesSupport }}
</template>
</el-table-column>
<el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
@ -638,6 +647,7 @@ import { formatSearchStr,deepClone } from '@/utils/index'
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
export default {
// name: "SendWaybillList",
@ -665,7 +675,8 @@ export default {
TraceWaybillDetailView,
TransLineAllPicker,
TransProductAllPicker,
AllMonthpayAccountPicker
AllMonthpayAccountPicker,
EmisMoneyUserPicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@ -875,7 +886,8 @@ export default {
expireNotSign:null,
problemQueryType:null,
problemQueryIds:null,
blUploadGoodsPic:null
blUploadGoodsPic:null,
moneyUserId:null,
}
},
};
@ -1176,6 +1188,12 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if(j === 'waybillOther.salesSupport'){
return v['waybillOther']['salesSupport'];
}
if(j === 'waybillOther.moneyCompany'){
return v['waybillOther']['moneyCompany'];
}
return v[j]
}))
},

View File

@ -248,7 +248,9 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" ></EmisMoneyUserPicker>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@ -390,15 +392,15 @@
<span style="color: red">{{ scope.row.problemTypeName }}</span>
</div>
<div v-else>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
</span>
<span v-else >
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
</span>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
</span>
<span v-else >
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
</span>
</div>
</div>
</div>
</div>
</template>
</el-table-column>
@ -459,16 +461,24 @@
</template>
</el-table-column>
<el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('客户名称')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.custName}}</span>
<span v-else></span>
<el-table-column :label="$t('现金客户')" align="center" prop="waybillOther.moneyCompany" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{scope.row.waybillOther?.moneyCompany}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.custName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="waybillOther.salesSupport" min-width="100" >
<template slot-scope="scope">
{{ scope.row.waybillOther?.salesSupport }}
</template>
</el-table-column>
<el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
@ -589,7 +599,7 @@
</XdPageContainer>
</template>
<script>
<script>
import 'element-ui/lib/theme-chalk/display.css';
import VirtualScroll from "el-table-virtual-scroll";
import { VirtualColumn } from "el-table-virtual-scroll";
@ -640,6 +650,7 @@ import { queryLastRecord } from "@/api/emis/emisTmsScanRecord";
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
import clip from '@/utils/clipboard'
import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
export default {
name: "SendWaybillList",
@ -674,6 +685,7 @@ export default {
TransProductAllPicker,
AllMonthpayAccountPicker,
TransProductMultipleAllPicker,
EmisMoneyUserPicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@ -887,6 +899,7 @@ export default {
querySendType:"1",
blUploadGoodsPic:null,
settleType:null,
moneyUserId:null,
}
},
};
@ -1255,6 +1268,12 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if(j === 'waybillOther.salesSupport'){
return v['waybillOther']['salesSupport'];
}
if(j === 'waybillOther.moneyCompany'){
return v['waybillOther']['moneyCompany'];
}
return v[j]
}))
},

View File

@ -253,8 +253,9 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" ></EmisMoneyUserPicker>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@ -384,13 +385,13 @@
<div v-else>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
</span>
<span v-else >
</span>
<span v-else >
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
</span>
</span>
</div>
</div>
</div>
</div>
</template>
</el-table-column>
@ -454,8 +455,12 @@
<el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
<!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('客户名称')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<el-table-column :label="$t('现金客户')" align="center" prop="waybillOther.moneyCompany" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{scope.row.waybillOther?.moneyCompany}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.custName}}</span>
<span v-else></span>
@ -463,8 +468,11 @@
</el-table-column>
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
<el-table-column :label="$t('销售支持')" align="center" prop="waybillOther.salesSupport" min-width="100" >
<template slot-scope="scope">
{{ scope.row.waybillOther.salesSupport }}
</template>
</el-table-column>
<el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
@ -647,6 +655,7 @@ import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPic
import TransProductMultipleAllPicker from "../EmisBaseTools/TransProductMultipleAllPicker.vue";
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
export default {
name: "SendWaybillListNew",
@ -680,7 +689,7 @@ export default {
TransProductAllPicker,
AllMonthpayAccountPicker,
TransProductMultipleAllPicker
,EmisMoneyUserPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@ -895,6 +904,7 @@ export default {
queryTabType:"1",
querySendType:"1",
blUploadGoodsPic:null,
moneyUserId:null,
}
},
};
@ -1208,6 +1218,12 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if(j === 'waybillOther.salesSupport'){
return v['waybillOther']['salesSupport'];
}
if(j === 'waybillOther.moneyCompany'){
return v['waybillOther']['moneyCompany'];
}
return v[j]
}))
},

View File

@ -35,7 +35,9 @@
<el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" >{{ form.custName }}</el-descriptions-item>
<el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
<el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
<el-descriptions-item label="销售支持">{{ form.salesSupport }}</el-descriptions-item>
<el-descriptions-item label="销售支持">
{{ form?.waybillOther?.salesSupport}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :title="$t('仓库收货信息')" size="small" :column="4" v-if="form.pickupMethod==1||form.pickupMethod==3">

View File

@ -69,12 +69,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item :label="$t('产品类型')" prop="productType">
<TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.destinationCountry" @onChange="onProductChange" ></TransProductCasPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item :label="$t('报关方式')" prop="customsEclaration">
<el-select v-model="form.customsEclaration" placeholder="" @change="calcBillFee">
<el-option
@ -86,7 +86,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item :label="$t('清关方式')" prop="customsClear">
<el-select v-model="form.customsClear" placeholder="" @change="calcBillFee">
<el-option
@ -98,7 +98,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('付款方式')" prop="paymentType" >
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('取件方式')" prop="pickupMethod">
<el-select v-model="form.pickupMethod" placeholder="" @change="calcBillFee">
@ -135,30 +146,45 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item :label="$t('付款方式')" prop="paymentType" >
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-form-item :label="$t('月结客户')" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
<el-col :span="6">
<el-form-item :label="$t('月结客户')" prop="custNo" v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
<EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="waybillOther.moneyUserId" v-else :rules="(form.paymentType == 1 || form.paymentType == 3 || form.paymentType == 6)?rules.waybillOther.moneyUserId:[]" >
<EmisMoneyUserPicker v-model="form.waybillOther.moneyUserId" @onChange="onSelectMoneyUser"></EmisMoneyUserPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="85px">
<PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
<PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker>
<el-col :span="6">
<el-form-item :label="$t('回款联系人')" prop="payee" >
<PayeePicker :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
<!-- <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker> -->
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
<SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
<SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" @change="onSalesmenChange"></SalemanPicker>
<el-col :span="6">
<el-form-item :label="$t('销售联系人')" prop="salesmen" >
<SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
<!-- <SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" @change="onSalesmenChange"></SalemanPicker> -->
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('销售支持')" prop="salesSupport" label-width="85px">
<SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
<SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen"></SalesSupportPicker>
<el-col :span="6">
<el-form-item :label="$t('销售支持')" prop="waybillOther.salesSupport" >
<SalesSupportPicker :placeholder="$t('销售支持')" v-model="form.waybillOther.salesSupport" :disabled="true" ></SalesSupportPicker>
<!-- <SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.waybillOther.salesSupport" :salesmen="form.salesmen"></SalesSupportPicker> -->
</el-form-item>
</el-col>
</el-row>
@ -616,7 +642,7 @@
</el-col>
<el-col :span="12" >
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
<!--
<el-col :span="12">
<el-form-item :label="$t('付款方式')" prop="paymentType" label-width="70px">
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
@ -656,7 +682,7 @@
<SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen"></SalesSupportPicker>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item :label="$t('计费方式')" prop="calcFeeType" label-width="70px">
<el-radio-group v-model="form.calcFeeType" @change="calcBillFee" >
@ -892,6 +918,7 @@ import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAdd
import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
@ -954,6 +981,7 @@ components: {
SeaSiteSimplePicker0,
SeaSiteSimplePicker1,
MasterBillCodePicker,
EmisMoneyUserPicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@ -1174,6 +1202,11 @@ data() {
custNo: [
{ required: true, message: "月结卡号不能为空", trigger: ["blur",'change'] }
],
waybillOther: {
moneyUserId: [
{ required: true, message: "现金客户不能为空", trigger: ["blur",'change'] }
],
},
payee: [
{ required: true, message: "销售回款人不能为空", trigger: ["blur",'change'] }
],
@ -1586,8 +1619,14 @@ methods: {
this.calcBillFee();
// 校验寄件人企业等级
this.checkEnterprise(this.form.sender.enterpriseName);
}else{
this.form.waybillOther.moneyUserId = null;
}
//特殊处理
if(this.form.waybillOther.moneyUserId=='0')
{
this.form.waybillOther.moneyUserId = null;
}
},
onCalcFeeTypeChange(){
@ -1601,7 +1640,7 @@ methods: {
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.salesSupport=item.salesSupport;
this.form.waybillOther.salesSupport=item.salesSupport;
this.form.paymentType= '2';
// 企业名称
this.form.sender.enterpriseName=item.enterpriseName;
@ -1616,11 +1655,18 @@ methods: {
this.form.paymentType= '1';
this.form.payee=null;
this.form.salesmen=null;
this.form.salesSupport=null;
this.form.waybillOther.salesSupport=null;
this.onPaymentTypeChange();
}
this.calcBillFee();
},
onSelectMoneyUser(item){
if (item != null) {
this.form.payee = item.payee;
this.form.salesmen = item.salesmen;
this.form.waybillOther.salesSupport = item.salesSupport;
}
},
handleAddFee(){
this.triggerCount++;
},
@ -1958,7 +2004,11 @@ methods: {
departurePort:null,
destinationPort:null,
boxQuantity:null,
carryType:null
carryType:null,
waybillOther:{
moneyUserId: null,
salesSupport: null,
}
};
this.resetForm("form");
},
@ -2872,7 +2922,7 @@ methods: {
},
// 销售联系人改变事件
onSalesmenChange(val) {
this.form.salesSupport = null;
this.form.waybillOther.salesSupport = null;
}
}
};

View File

@ -39,7 +39,7 @@
<!-- 运单录入 end -->
<!-- 运单修改 -->
<el-col :span="8" v-if="action=='modify'">
<el-col :span="6" v-if="action=='modify'">
<el-form-item :label="$t('运单号')" prop="billCode" >
<div style="display:inline-flex">
<div>
@ -69,12 +69,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item :label="$t('产品类型')" prop="productType">
<TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.destinationCountry" @onChange="onProductChange" ></TransProductCasPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item :label="$t('报关方式')" prop="customsEclaration">
<el-select v-model="form.customsEclaration" placeholder="" @change="calcBillFee">
<el-option
@ -86,7 +86,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item :label="$t('清关方式')" prop="customsClear">
<el-select v-model="form.customsClear" placeholder="" @change="calcBillFee">
<el-option
@ -98,7 +98,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('付款方式')" prop="paymentType" >
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('取件方式')" prop="pickupMethod">
<el-select v-model="form.pickupMethod" placeholder="" @change="calcBillFee">
@ -135,30 +146,45 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item :label="$t('付款方式')" prop="paymentType" >
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-form-item :label="$t('月结客户')" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
<el-col :span="6">
<el-form-item :label="$t('月结客户')" prop="custNo" v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
<EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="waybillOther.moneyUserId" v-else :rules="(form.paymentType == 1 || form.paymentType == 3 || form.paymentType == 6)?rules.waybillOther.moneyUserId:[]" >
<EmisMoneyUserPicker v-model="form.waybillOther.moneyUserId" @onChange="onSelectMoneyUser"></EmisMoneyUserPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="85px">
<PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
<PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker>
<el-col :span="6">
<el-form-item :label="$t('回款联系人')" prop="payee" >
<PayeePicker :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
<!-- <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker> -->
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
<SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
<SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" @change="onSalesmenChange" ></SalemanPicker>
<el-col :span="6">
<el-form-item :label="$t('销售联系人')" prop="salesmen" >
<SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
<!-- <SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" @change="onSalesmenChange" ></SalemanPicker> -->
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('销售支持')" prop="salesSupport" label-width="85px">
<SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" :sendDate="form.sendDate"></SalesSupportPicker>
<SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen" :sendDate="form.sendDate"></SalesSupportPicker>
<el-col :span="6">
<el-form-item :label="$t('销售支持')" prop="waybillOther.salesSupport" >
<SalesSupportPicker :placeholder="$t('销售支持')" v-model="form.waybillOther.salesSupport" :disabled="true" :sendDate="form.sendDate"></SalesSupportPicker>
<!-- <SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen" :sendDate="form.sendDate"></SalesSupportPicker> -->
</el-form-item>
</el-col>
</el-row>
@ -619,7 +645,7 @@
<el-col :span="12" >
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item :label="$t('付款方式')" prop="paymentType" label-width="70px">
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
<el-option
@ -658,7 +684,7 @@
<SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen"></SalesSupportPicker>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item :label="$t('计费方式')" prop="calcFeeType" label-width="70px">
<el-radio-group v-model="form.calcFeeType" @change="calcBillFee" >
@ -892,6 +918,7 @@ import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAdd
import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
@ -951,6 +978,7 @@ components: {
SeaSiteSimplePicker0,
SeaSiteSimplePicker1,
MasterBillCodePicker,
EmisMoneyUserPicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@ -1200,6 +1228,11 @@ data() {
custNo: [
{ required: true, message: "月结卡号不能为空", trigger: ["blur",'change'] }
],
waybillOther: {
moneyUserId: [
{ required: true, message: "现金客户不能为空", trigger: ["blur",'change'] }
],
},
payee: [
{ required: true, message: "销售回款人不能为空", trigger: ["blur",'change'] }
],
@ -1572,8 +1605,7 @@ methods: {
});
},
onPaymentTypeChange(){
//console.log("==onPaymentTypeChange==>")
onPaymentTypeChange(val){
// 非月结清空月结客户选择
if(this.form.paymentType == '1' ||
this.form.paymentType == '3' ||
@ -1588,8 +1620,14 @@ methods: {
// 校验寄件人企业等级
this.checkEnterprise(this.form.sender.enterpriseName);
}else{
this.form.waybillOther.moneyUserId = null;
}
//特殊处理
if(this.form.waybillOther.moneyUserId=='0')
{
this.form.waybillOther.moneyUserId = null;
}
},
onCalcFeeTypeChange(){
@ -1606,7 +1644,7 @@ methods: {
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.salesSupport=item.salesSupport;
this.form.waybillOther.salesSupport=item.salesSupport;
this.form.paymentType= '2';
// 企业名称
this.form.sender.enterpriseName=item.enterpriseName;
@ -1621,11 +1659,18 @@ methods: {
this.form.paymentType= '1';
this.form.payee=null;
this.form.salesmen=null;
this.form.salesSupport=null;
this.form.waybillOther.salesSupport=null;
this.onPaymentTypeChange();
}
this.calcBillFee();
},
onSelectMoneyUser(item){
if (item != null) {
this.form.payee = item.payee;
this.form.salesmen = item.salesmen;
this.form.waybillOther.salesSupport = item.salesSupport;
}
},
handleAddFee(){
this.triggerCount++;
},
@ -1953,7 +1998,11 @@ methods: {
boxQuantity:null,
carryType:null,
blVirtual:null,
masterBillCode:null
masterBillCode:null,
waybillOther: {
moneyUserId: null,
salesSupport: null,
},
};
this.resetForm("form");
},
@ -2877,7 +2926,7 @@ methods: {
},
// 销售联系人改变事件
onSalesmenChange(val) {
this.form.salesSupport = null;
this.form.waybillOther.salesSupport = null;
}
}
};

View File

@ -70,12 +70,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item :label="$t('产品类型')" prop="productType">
<TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.destinationCountry" @onChange="onProductChange" ></TransProductCasPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item :label="$t('报关方式')" prop="customsEclaration">
<el-select v-model="form.customsEclaration" placeholder="" @change="calcBillFee">
<el-option
@ -87,7 +87,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item :label="$t('清关方式')" prop="customsClear">
<el-select v-model="form.customsClear" placeholder="" @change="calcBillFee">
<el-option
@ -99,6 +99,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('付款方式')" prop="paymentType" >
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('取件方式')" prop="pickupMethod">
@ -112,6 +124,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.pickupMethod==2">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :siteCode="form.startSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
@ -136,9 +149,9 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('付款方式')" prop="paymentType" label-width="70px">
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
<!-- <el-col :span="6">
<el-form-item :label="$t('付款方式')" prop="paymentType" >
<el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
@ -147,33 +160,33 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-col :span="6">
<el-form-item :label="$t('月结客户')" prop="custNo" v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
<EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="customerCode" v-else :rules="(form.paymentType == 1 || form.paymentType == 3 || form.paymentType == 6)?rules.customerCode:[]" >
<EmisMoneyUserPicker v-model="form.customerCode" @onChange="onSelectMoneyUser"></EmisMoneyUserPicker>
<el-form-item :label="$t('现金客户')" prop="waybillOther.moneyUserId" v-else :rules="(form.paymentType == 1 || form.paymentType == 3 || form.paymentType == 6)?rules.waybillOther.moneyUserId:[]" >
<EmisMoneyUserPicker v-model="form.waybillOther.moneyUserId" @onChange="onSelectMoneyUser"></EmisMoneyUserPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="85px">
<el-col :span="6">
<el-form-item :label="$t('回款联系人')" prop="payee" >
<PayeePicker :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
<!-- <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker> -->
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
<el-col :span="6">
<el-form-item :label="$t('销售联系人')" prop="salesmen" >
<SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
<!-- <SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" @change="onSalesmenChange"></SalemanPicker> -->
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('销售支持')" prop="salesSupport" label-width="85px">
<SalesSupportPicker :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
<!-- <SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen"></SalesSupportPicker> -->
<el-col :span="6">
<el-form-item :label="$t('销售支持')" prop="waybillOther.salesSupport" >
<SalesSupportPicker :placeholder="$t('销售支持')" v-model="form.waybillOther.salesSupport" :disabled="true" ></SalesSupportPicker>
<!-- <SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.waybillOther.salesSupport" :salesmen="form.salesmen"></SalesSupportPicker> -->
</el-form-item>
</el-col>
@ -1233,9 +1246,11 @@ data() {
custNo: [
{ required: true, message: "月结卡号不能为空", trigger: ["blur",'change'] }
],
customerCode: [
{ required: true, message: "现金客户不能为空", trigger: ["blur",'change'] }
],
waybillOther: {
moneyUserId: [
{ required: true, message: "现金客户不能为空", trigger: ["blur",'change'] }
],
},
payee: [
{ required: true, message: "销售回款人不能为空", trigger: ["blur",'change'] }
],
@ -1622,6 +1637,8 @@ methods: {
this.calcBillFee();
// 校验寄件人企业等级
this.checkEnterprise(this.form.sender.enterpriseName);
}else{
this.form.waybillOther.moneyUserId = null;
}
},
@ -1633,11 +1650,11 @@ methods: {
this.calcBillFee();
},
onSelectMonthUser(item){
onSelectMonthUser(item){
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.salesSupport=item.salesSupport;
this.form.waybillOther.salesSupport=item.salesSupport;
this.form.paymentType= '2';
// 企业名称
this.form.sender.enterpriseName=item.enterpriseName;
@ -1653,7 +1670,7 @@ methods: {
this.form.paymentType= '1';
this.form.payee=null;
this.form.salesmen=null;
this.form.salesSupport=null;
this.form.waybillOther.salesSupport=null;
this.onPaymentTypeChange();
}
this.calcBillFee();
@ -1662,7 +1679,7 @@ methods: {
if (item != null) {
this.form.payee = item.payee;
this.form.salesmen = item.salesmen;
this.form.salesSupport = item.salesSupport;
this.form.waybillOther.salesSupport = item.salesSupport;
}
},
handleAddFee(){
@ -1969,7 +1986,11 @@ methods: {
boxQuantity:null,
carryType:null,
blVirtual:null,
masterBillCode:null
masterBillCode:null,
waybillOther:{
moneyUserId: null,
salesSupport: null,
}
};
this.resetForm("form");
},
@ -2906,7 +2927,7 @@ methods: {
},
// 销售联系人改变事件
onSalesmenChange(val) {
this.form.salesSupport = null;
this.form.waybillOther.salesSupport = null;
}
}
}

View File

@ -362,17 +362,20 @@
<el-form-item :label="$t('月结客户')" prop="custNo" v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" >
<EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="waybillOther.moneyUserId" v-else :rules="(form.paymentType == 1 || form.paymentType == 3 || form.paymentType == 6)?rules.moneyUserId:[]" >
<EmisMoneyUserPicker v-model="form.waybillOther.moneyUserId" @onChange="onSelectMoneyUser"></EmisMoneyUserPicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="85px">
<PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
<PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker>
<PayeePicker :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
<!-- <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker> -->
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
<SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
<SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" @onChange="onSalesmenChange"></SalemanPicker>
<SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
<!-- <SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" @onChange="onSalesmenChange"></SalemanPicker> -->
</el-form-item>
<el-form-item :label="$t('销售支持')" prop="salesSupport" label-width="85px">
<SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
<SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen" :sendDate="form.sendDate" ></SalesSupportPicker>
<el-form-item :label="$t('销售支持')" prop="waybillOther.salesSupport" label-width="85px">
<SalesSupportPicker :placeholder="$t('销售支持')" v-model="form.waybillOther.salesSupport" :disabled="true" ></SalesSupportPicker>
<!-- <SalesSupportPicker v-else :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen" :sendDate="form.sendDate" ></SalesSupportPicker> -->
</el-form-item>
</el-col>
</el-row>
@ -419,11 +422,11 @@
<span>销售支持</span>
</el-col>
<el-col :span="7" class="md-value">
<span >{{ billDetail.salesSupport }}</span>
<span >{{ billDetail.waybillOther.salesSupport }}</span>
</el-col>
<el-col :span="14">
<el-form-item :label="$t('销售支持')" prop="salesSupport" >
<SalesSupportPicker :placeholder="$t('销售支持')" v-model="form.salesSupport" :salesmen="form.salesmen" :sendDate="form.sendDate"></SalesSupportPicker>
<el-form-item :label="$t('销售支持')" prop="waybillOther.salesSupport" >
<SalesSupportPicker :placeholder="$t('销售支持')" v-model="form.waybillOther.salesSupport" :salesmen="form.salesmen" :sendDate="form.sendDate"></SalesSupportPicker>
</el-form-item>
</el-col>
</el-row>
@ -1255,6 +1258,7 @@ import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAdd
import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
@ -1321,6 +1325,7 @@ export default {
SeaSiteSimplePicker0,
SeaSiteSimplePicker1,
MasterBillCodePicker,
EmisMoneyUserPicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@ -1544,6 +1549,11 @@ export default {
custNo: [
{ required: true, message: "月结卡号不能为空", trigger: ["blur",'change'] }
],
waybillOther: {
moneyUserId: [
{ required: true, message: "现金客户不能为空", trigger: ["blur",'change'] }
],
},
payee: [
{ required: true, message: "销售回款人不能为空", trigger: ["blur",'change'] }
],
@ -1643,6 +1653,13 @@ export default {
this.initData();
},
methods: {
onSelectMoneyUser(item){
if (item != null) {
this.form.payee = item.payee;
this.form.salesmen = item.salesmen;
this.form.waybillOther.salesSupport = item.salesSupport;
}
},
handleAddFee(){
this.triggerCount++;
},
@ -1703,7 +1720,7 @@ export default {
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.salesSupport=item.salesSupport;
this.form.waybillOther.salesSupport=item.salesSupport;
// 企业名称
this.form.sender.enterpriseName=item.enterpriseName;
// 企业税号
@ -1859,6 +1876,10 @@ export default {
lockFlag:null,
lockReason:null,
blSelfBillCode:null,
waybillOther: {
moneyUserId: null,
salesSupport: null,
},
};
},
onChangeSelectSender(value){
@ -2355,14 +2376,19 @@ export default {
this.form.custNo = null;
this.form.customerCode = null;
//企业税号重新赋值
this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
this.form.sender.enterpriseName = this.selectedSenderEnterpriseName;
this.form.sender.enterpriseTaxId = this.selectedSenderEnterpriseTaxId;
this.calcBillFee();
// 校验寄件人企业等级
this.checkEnterprise(this.form.sender.enterpriseName);
} else {
this.form.waybillOther.moneyUserId = null;
}
//特殊处理
if (this.form.waybillOther.moneyUserId == '0') {
this.form.waybillOther.moneyUserId = null;
}
},
handleTransLineChange(val){
if(val){
@ -2564,7 +2590,7 @@ export default {
},
// 销售支持选择器改变事件
onSalesmenChange(val){
this.form.salesSupport = null;
this.form.waybillOther.salesSupport = null;
},
}
};