md
This commit is contained in:
linfso
parent
f862bba06e
commit
13513f786a
@ -24,11 +24,11 @@
|
||||
<el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
|
||||
<EmisSiteSimplePicker2 v-model="queryParams.params.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="settleType==2" label="月结客户" prop="custNo">
|
||||
<el-form-item v-if="actionType==2 || actionType==3 " label="月结客户" prop="custNo">
|
||||
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="付款方式" prop="params.paymentType" >
|
||||
<el-select v-if="settleType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-select v-if="actionType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))"
|
||||
:key="dict.value"
|
||||
@ -37,7 +37,7 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
|
||||
<el-select v-if="settleType==2" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-select v-if="actionType==2 || actionType==3 " clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="dict in dict.type.emis_payment_type.filter(item=>['2','4','5'].includes(item.value))"
|
||||
:key="dict.value"
|
||||
@ -79,6 +79,7 @@
|
||||
<el-tab-pane label="已确认" name="hasConfirm" />
|
||||
<el-tab-pane label="确认不出账" name="confirmNotBill" />
|
||||
<el-tab-pane label="财务置账单异常" name="billError" />
|
||||
<el-tab-pane label="业务置账单异常" name="siteBillError" />
|
||||
|
||||
</el-tabs>
|
||||
|
||||
@ -89,7 +90,7 @@
|
||||
ref="refTable"
|
||||
|
||||
row-key="id"
|
||||
storageName="SubBillConfirmByMoneyList_main"
|
||||
:storageName="storageName"
|
||||
|
||||
:data="emisSettleSubBillList"
|
||||
:showSearch.sync="showSearch"
|
||||
@ -106,7 +107,7 @@
|
||||
show-summary :summary-method="getSummaries"
|
||||
>
|
||||
|
||||
<div slot="toolbar">
|
||||
<div slot="toolbar" v-if="settleType==1 || settleType==2">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
@ -173,10 +174,46 @@
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
<div slot="toolbar" v-if="settleType==3">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleConfirmBySite"
|
||||
v-hasPermi="['emis:emisSettleSubBill:confirmBillBySite']"
|
||||
>批量确认</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleSetBillErrorBySite"
|
||||
v-hasPermi="['emis:emisSettleSubBill:setBillErrorBySite']"
|
||||
>置账单异常</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5" v-if="activeTab!='waitConfirm'">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleCancelConfirmByCenter"
|
||||
v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
|
||||
>取消确认</el-button>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
|
||||
<div slot="statInfo" style="font-size: 13px;">
|
||||
总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
|
||||
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee.toFixed(2):0}}</span>
|
||||
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
|
||||
</div>
|
||||
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
@ -225,6 +262,12 @@
|
||||
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column v-if="settleType!=1" :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span type="normal">{{ scope.row.customerName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- <el-table-column :label="$t('取件员/操作员')" align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
|
||||
@ -260,7 +303,7 @@
|
||||
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
|
||||
<el-tag v-else type="info">否</el-tag>
|
||||
<span v-else >/</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
|
||||
@ -276,9 +319,21 @@
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManName" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmDate" min-width="170" />
|
||||
|
||||
<el-table-column :label="$t('财务备注')" align="center" prop="confirmNote" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.blSiteConfirm=='0'" >未确认</span>
|
||||
<el-tag v-if="scope.row.blSiteConfirm=='1'" type="success">已确认</el-tag>
|
||||
<el-tag v-if="scope.row.blSiteConfirm=='2'" type="error">确认不出账</el-tag>
|
||||
<el-tag v-if="scope.row.blSiteConfirm=='3'" type="error">账单异常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('业务确认时间')" align="center" prop="siteConfirmDate" min-width="170" />
|
||||
<el-table-column :label="$t('业务确认人')" align="center" prop="siteConfirmManName" min-width="100" />
|
||||
<el-table-column :label="$t('业务备注')" align="center" prop="siteConfirmNote" min-width="100" />
|
||||
|
||||
|
||||
</XdTable>
|
||||
|
||||
<el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false" v-dialogDrag append-to-body>
|
||||
@ -383,8 +438,11 @@ export default {
|
||||
// 结算子账单表格数据
|
||||
emisSettleSubBillList: [],
|
||||
|
||||
actionType:null,
|
||||
settleType:null,
|
||||
|
||||
storageName:null,
|
||||
|
||||
queryStatInfoMap:null,
|
||||
|
||||
currentId:null,
|
||||
@ -581,34 +639,68 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.queryParams.blConfirm='0';
|
||||
this.settleType=this.$route.query.settleType;
|
||||
this.actionType=this.$route.query.actionType;
|
||||
|
||||
this.initData();
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
|
||||
initData(){
|
||||
if(this.actionType==1){
|
||||
this.storageName="SubBillConfirmByMoneyList_main";
|
||||
}
|
||||
else if(this.actionType==2){
|
||||
this.storageName="SubBillConfirmByMonthList_main";
|
||||
}
|
||||
else if(this.actionType==3){
|
||||
this.storageName="SubBillConfirmBySitehList_main";
|
||||
}
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
// console.log(tab, event);
|
||||
if (tab.name == 'all') {
|
||||
if(this.actionType==1|| this.actionType==2){
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
this.queryParams.blConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blConfirm='1';
|
||||
}
|
||||
else if (tab.name == 'confirmNotBill') {
|
||||
this.queryParams.blConfirm='2';
|
||||
}
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blConfirm='3';
|
||||
}
|
||||
else if (tab.name == 'siteBillError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
|
||||
|
||||
if (tab.name == 'all') {
|
||||
this.queryParams.blConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blConfirm='1';
|
||||
}
|
||||
else if (tab.name == 'confirmNotBill') {
|
||||
this.queryParams.blConfirm='2';
|
||||
}
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blConfirm='3';
|
||||
}
|
||||
else if (tab.name == 'siteBillError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
|
||||
}
|
||||
else if(this.actionType==2){
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
this.queryParams.blConfirm=1;
|
||||
if (tab.name == 'all') {
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blSiteConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blSiteConfirm='1';
|
||||
}
|
||||
// else if (tab.name == 'confirmNotBill') {
|
||||
// this.queryParams.blSiteConfirm='2';
|
||||
// }
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
}
|
||||
this.getList();
|
||||
},
|
||||
|
||||
@ -631,7 +723,13 @@ export default {
|
||||
/** 查询结算子账单列表 */
|
||||
|
||||
initQueryParams(){
|
||||
this.queryParams.settleType=this.settleType;
|
||||
if(this.actionType==3){
|
||||
this.queryParams.params.salesmen=this.$store.getters.empName
|
||||
}else if(this.actionType==2){
|
||||
this.queryParams.settleType=2;
|
||||
}else if(this.actionType==1){
|
||||
this.queryParams.settleType=1;
|
||||
}
|
||||
this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
|
||||
},
|
||||
getList() {
|
||||
@ -831,12 +929,56 @@ export default {
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleView(row) {
|
||||
this.id=row.id;
|
||||
this.titleView="查看";
|
||||
this.openView=true;
|
||||
// this.router.push({ path: '/emis/emisSettleSubBill/viewDetail', query: { id: row.id }})
|
||||
|
||||
handleConfirmBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否确认').then(function() {
|
||||
return confirmBillBySite(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleCancelConfirmBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否取消确认').then(function() {
|
||||
return cancelConfirmBillBySite(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleConfirmNoBillBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$prompt('请输入不出账原因', "操作确认", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
closeOnClickModal: false,
|
||||
inputPattern: /^.{1,30}$/,
|
||||
inputErrorMessage: "原因长度必须介于 1 和 30 之间"
|
||||
}).then(({ value }) => {
|
||||
confirmNoBillBySite(ids,value).then(response => {
|
||||
this.$modal.msgSuccess("操作成功" );
|
||||
this.getList();
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleSetBillErrorBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$prompt('请输入账单异常原因', "操作确认", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
closeOnClickModal: false,
|
||||
inputPattern: /^.{1,30}$/,
|
||||
inputErrorMessage: "原因长度必须介于 1 和 30 之间"
|
||||
}).then(({ value }) => {
|
||||
setBillErrorBySite(ids,value).then(response => {
|
||||
this.$modal.msgSuccess("操作成功" );
|
||||
this.getList();
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
|
||||
handleFormChanged(){
|
||||
this.openForm = false;
|
||||
this.getList();
|
||||
|
||||
@ -15,20 +15,20 @@
|
||||
:rows="2"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="发货时间" prop="">
|
||||
<el-form-item label="寄件日期" prop="sendDate">
|
||||
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="寄件网点" prop="waybillDetail.sendSiteCode">
|
||||
<EmisSiteSimplePicker1 v-model="queryParams.params.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
|
||||
<el-form-item label="寄件网点" prop="params.sendSiteCode">
|
||||
<EmisSiteSimplePicker1 v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
|
||||
</el-form-item>
|
||||
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
|
||||
<el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
|
||||
<EmisSiteSimplePicker2 v-model="queryParams.params.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="settleType==2" label="月结客户" prop="custNo">
|
||||
<el-form-item v-if="actionType==2 || actionType==3 " label="月结客户" prop="custNo">
|
||||
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="付款方式" prop="paymentType" >
|
||||
<el-select v-if="settleType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-form-item label="付款方式" prop="params.paymentType" >
|
||||
<el-select v-if="actionType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))"
|
||||
:key="dict.value"
|
||||
@ -37,7 +37,7 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
|
||||
<el-select v-if="settleType==2" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-select v-if="actionType==2 || actionType==3 " clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="dict in dict.type.emis_payment_type.filter(item=>['2','4','5'].includes(item.value))"
|
||||
:key="dict.value"
|
||||
@ -46,13 +46,13 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('回款联系人')" prop="payee">
|
||||
<el-form-item :label="$t('回款联系人')" prop="params.payee">
|
||||
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee" ></PayeePicker>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('销售联系人')" prop="salesmen">
|
||||
<el-form-item :label="$t('销售联系人')" prop="params.salesmen">
|
||||
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="寄件公司" prop="sendCompany">
|
||||
<el-form-item label="寄件公司" prop="params.sendCompany">
|
||||
<el-input
|
||||
v-model="queryParams.params.sendCompany"
|
||||
:placeholder="$t('寄件公司')"
|
||||
@ -61,7 +61,7 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="收件公司" prop="receiveCompany">
|
||||
<el-form-item label="收件公司" prop="params.receiveCompany">
|
||||
<el-input
|
||||
v-model="queryParams.params.receiveCompany"
|
||||
:placeholder="$t('收件公司')"
|
||||
@ -79,17 +79,10 @@
|
||||
<el-tab-pane label="已确认" name="hasConfirm" />
|
||||
<el-tab-pane label="确认不出账" name="confirmNotBill" />
|
||||
<el-tab-pane label="财务置账单异常" name="billError" />
|
||||
<!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
|
||||
<el-tab-pane label="业务置账单异常" name="siteBillError" />
|
||||
|
||||
</el-tabs>
|
||||
|
||||
<!-- <div v-show="activeTab==='waitConfirm'">
|
||||
</div>
|
||||
<div v-show="activeTab==='hasConfirm'">
|
||||
</div> -->
|
||||
<!-- <div v-show="activeTab==='confirmNotBill'">
|
||||
</div> -->
|
||||
|
||||
<XdTable v-loading="loading"
|
||||
border
|
||||
size="mini"
|
||||
@ -97,7 +90,7 @@
|
||||
ref="refTable"
|
||||
|
||||
row-key="id"
|
||||
storageName="SubBillConfirmByMonthList_main"
|
||||
:storageName="storageName"
|
||||
|
||||
:data="emisSettleSubBillList"
|
||||
:showSearch.sync="showSearch"
|
||||
@ -110,9 +103,11 @@
|
||||
:row-style="tableRowClassName"
|
||||
|
||||
highlight-current-row
|
||||
|
||||
show-summary :summary-method="getSummaries"
|
||||
>
|
||||
|
||||
<div slot="toolbar">
|
||||
<div slot="toolbar" v-if="settleType==1 || settleType==2">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
@ -179,6 +174,42 @@
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
<div slot="toolbar" v-if="settleType==3">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleConfirmBySite"
|
||||
v-hasPermi="['emis:emisSettleSubBill:confirmBillBySite']"
|
||||
>批量确认</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleSetBillErrorBySite"
|
||||
v-hasPermi="['emis:emisSettleSubBill:setBillErrorBySite']"
|
||||
>置账单异常</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5" v-if="activeTab!='waitConfirm'">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleCancelConfirmByCenter"
|
||||
v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
|
||||
>取消确认</el-button>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
|
||||
<div slot="statInfo" style="font-size: 13px;">
|
||||
总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
|
||||
@ -190,7 +221,7 @@
|
||||
<template slot-scope="scope">
|
||||
<div style="padding: 8px 50px;background: white;">
|
||||
|
||||
<div style="display:inline-flex" >
|
||||
<div style="display:inline-flex;padding: 15px 0px;" >
|
||||
<div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
|
||||
<div>
|
||||
<el-button
|
||||
@ -222,20 +253,75 @@
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
|
||||
<el-table-column :label="$t('子账单号')" align="center" prop="billNo" min-width="130" />
|
||||
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="120" >
|
||||
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
|
||||
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column v-if="settleType!=1" :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span type="normal">{{ scope.row.customerName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- <el-table-column :label="$t('取件员/操作员')" align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
|
||||
<span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
||||
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
|
||||
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
|
||||
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
|
||||
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
|
||||
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
|
||||
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
|
||||
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
|
||||
<span v-else >/</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="120" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.blConfirm=='0'" >未确认</span>
|
||||
<el-tag v-if="scope.row.blConfirm=='1'" type="success">已确认</el-tag>
|
||||
<el-tag v-if="scope.row.blConfirm=='2'" type="error">确认不出账</el-tag>
|
||||
<el-tag v-if="scope.row.blConfirm=='3'" type="error">账单异常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('财务备注')" align="center" prop="confirmNote" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManName" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmDate" min-width="170" />
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManName" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmDate" min-width="170" />
|
||||
<el-table-column :label="$t('财务备注')" align="center" prop="confirmNote" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
|
||||
<el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.blSiteConfirm=='0'" >未确认</span>
|
||||
<el-tag v-if="scope.row.blSiteConfirm=='1'" type="success">已确认</el-tag>
|
||||
@ -243,226 +329,17 @@
|
||||
<el-tag v-if="scope.row.blSiteConfirm=='3'" type="error">账单异常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('业务备注')" align="center" prop="siteConfirmNote" min-width="100" />
|
||||
<el-table-column :label="$t('业务确认时间')" align="center" prop="siteConfirmDate" min-width="170" />
|
||||
<el-table-column :label="$t('业务确认人')" align="center" prop="siteConfirmManName" min-width="100" />
|
||||
<el-table-column :label="$t('业务备注')" align="center" prop="siteConfirmNote" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('结算类型')" align="center" prop="settleType" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.settleType=='1'" type="normal">现金</el-tag>
|
||||
<el-tag v-if="scope.row.settleType=='2'" type="success">月结</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.settleType=='2'" type="normal">{{ scope.row.customerName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="100" /> -->
|
||||
|
||||
<el-table-column :label="$t('账单费用')" align="center" prop="billFee" min-width="100" />
|
||||
<el-table-column :label="$t('费用币种')" align="center" prop="currency" min-width="100" />
|
||||
<el-table-column :label="$t('出账时间')" align="center" prop="billDate" min-width="170" />
|
||||
<el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="100" />
|
||||
|
||||
|
||||
<!-- <el-table-column :label="$t('站点确认人')" align="center" prop="siteConfirmManCode" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('父账单号')" align="center" prop="parentBillNo" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('总结算账单号')" align="center" prop="settleBillNo" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('是否已拆单')" align="center" prop="blSplit" min-width="100" />
|
||||
<el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认日期')" align="center" prop="confirmDate" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认站点')" align="center" prop="confirmSite" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManCode" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认备注')" align="center" prop="confirmNote" min-width="100" />
|
||||
<el-table-column :label="$t('站点确认日期')" align="center" prop="siteConfirmDate" min-width="100" />
|
||||
<el-table-column :label="$t('网点确认备注')" align="center" prop="siteConfirmNote" min-width="100" /> -->
|
||||
|
||||
|
||||
<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.waybillDetail.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.waybillDetail.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.waybillDetail.sendName }}--{{ scope.row.waybillDetail.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.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="170" >
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.waybillDetail.estimateDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('发货日期')" align="center" prop="waybillDetail.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.waybillDetail.takePieceEmployeeName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('合同号')" align="center" prop="waybillDetail.custOrderId" width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('操作员')" align="center" prop="waybillDetail.operateEmployeeName" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('时效')" align="center" prop="waybillDetail.timeType" min-width="80" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('报关方式')" align="center" prop="waybillDetail.customsEclaration" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.waybillDetail.customsEclaration"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('清关方式')" align="center" prop="waybillDetail.customsClear" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.waybillDetail.customsClear"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('录入人')" align="center" prop="waybillDetail.registerManName" min-width="80" :show-overflow-tooltip="true" />
|
||||
|
||||
<el-table-column :label="$t('客户名称')" align="center" prop="waybillDetail.customerName" min-width="80" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.customerName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
|
||||
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('是否问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
|
||||
<el-tag v-else type="info">否</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件财务中心')" align="center" prop="waybillDetail.sendSiteFincailName" min-width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件手机')" align="center" prop="waybillDetail.sendMobile" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件国家')" align="center" prop="waybillDetail.sendCountryName" min-width="80" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('寄件省')" align="center" prop="waybillDetail.sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件市')" align="center" prop="waybillDetail.sendCityName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件区')" align="center" prop="waybillDetail.sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件地址')" align="center" prop="waybillDetail.sendAddress" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件/签收短信')" align="center" prop="waybillDetail.blMessage" min-width="150" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.waybillDetail.blMessage==1" >发送</div>
|
||||
<div v-else>不发送</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('收货人')" align="center" prop="waybillDetail.receiveName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货电话')" align="center" prop="waybillDetail.receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货公司')" align="center" prop="waybillDetail.receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货国家')" align="center" prop="waybillDetail.receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货省')" align="center" prop="waybillDetail.receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货市')" align="center" prop="waybillDetail.receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货区')" align="center" prop="waybillDetail.receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货地址')" align="center" prop="waybillDetail.receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('派货短信')" align="center" prop="waybillDetail.blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.waybillDetail.blAcceptMessage==1" >发送</div>
|
||||
<div v-else>不发送</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('目的地')" align="center" prop="waybillDetail.destinationName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('目的网点')" align="center" prop="waybillDetail.dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
|
||||
|
||||
<el-table-column :label="$t('货物名称')" align="center" prop="waybillDetail.goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('包装类型')" align="center" prop="waybillDetail.packType" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.waybillDetail.packType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
|
||||
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
|
||||
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
|
||||
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
|
||||
|
||||
<el-table-column :label="$t('派件方式')" align="center" prop="waybillDetail.dispatchMethod" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.waybillDetail.dispatchMethod==1" >派送</div>
|
||||
<div v-else>自提</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.waybillDetail.paymentType==3">{{scope.row.waybillDetail.freight}}</span>
|
||||
<span v-else>0</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
|
||||
<el-table-column :label="$t('保价金额')" align="center" prop="waybillDetail.insureValue" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<!-- <el-table-column :label="$t('保费')" align="center" prop="waybillDetail.insureFee" min-width="80" :show-overflow-tooltip="true"/> -->
|
||||
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="80" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.waybillDetail.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="waybillDetail.signDate" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('签收人')" align="center" prop="waybillDetail.signMan" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('派件员')" align="center" prop="waybillDetail.dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('派件网点')" align="center" prop="waybillDetail.dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('录单网点')" align="center" prop="waybillDetail.registerSiteName" min-width="80" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
|
||||
|
||||
<!-- <el-table-column :label="$t('数据来源')" align="center" prop="waybillDetail.dataFrom" min-width="80" /> -->
|
||||
|
||||
<!-- <el-table-column label="创建人" align="center" prop="waybillDetail.createByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="创建网点" align="center" prop="waybillDetail.createSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="创建时间" align="center" prop="waybillDetail.createTime" width="170"/>
|
||||
<el-table-column label="修改人" align="center" prop="waybillDetail.updateByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="修改网点" align="center" prop="waybillDetail.updateSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="修改时间" align="center" prop="waybillDetail.updateTime" width="170"/> -->
|
||||
|
||||
</XdTable>
|
||||
|
||||
<!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||
<emisSettleSubBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleSubBillForm>
|
||||
</el-dialog> -->
|
||||
|
||||
<el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false" v-dialogDrag append-to-body>
|
||||
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
|
||||
</el-dialog>
|
||||
<!--
|
||||
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
|
||||
<emisSettleSubBillView :id="id" ></EmisSettleSubBillView>
|
||||
</el-dialog>
|
||||
-->
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
@ -561,8 +438,11 @@ export default {
|
||||
// 结算子账单表格数据
|
||||
emisSettleSubBillList: [],
|
||||
|
||||
actionType:null,
|
||||
settleType:null,
|
||||
|
||||
storageName:null,
|
||||
|
||||
queryStatInfoMap:null,
|
||||
|
||||
currentId:null,
|
||||
@ -759,34 +639,68 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.queryParams.blConfirm='0';
|
||||
this.settleType=this.$route.query.settleType;
|
||||
this.actionType=this.$route.query.actionType;
|
||||
|
||||
this.initData();
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
|
||||
initData(){
|
||||
if(this.actionType==1){
|
||||
this.storageName="SubBillConfirmByMoneyList_main";
|
||||
}
|
||||
else if(this.actionType==2){
|
||||
this.storageName="SubBillConfirmByMonthList_main";
|
||||
}
|
||||
else if(this.actionType==3){
|
||||
this.storageName="SubBillConfirmBySitehList_main";
|
||||
}
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
// console.log(tab, event);
|
||||
if (tab.name == 'all') {
|
||||
if(this.actionType==1|| this.actionType==2){
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
this.queryParams.blConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blConfirm='1';
|
||||
}
|
||||
else if (tab.name == 'confirmNotBill') {
|
||||
this.queryParams.blConfirm='2';
|
||||
}
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blConfirm='3';
|
||||
}
|
||||
else if (tab.name == 'siteBillError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
|
||||
|
||||
if (tab.name == 'all') {
|
||||
this.queryParams.blConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blConfirm='1';
|
||||
}
|
||||
else if (tab.name == 'confirmNotBill') {
|
||||
this.queryParams.blConfirm='2';
|
||||
}
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blConfirm='3';
|
||||
}
|
||||
else if (tab.name == 'siteBillError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
|
||||
}
|
||||
else if(this.actionType==2){
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
this.queryParams.blConfirm=1;
|
||||
if (tab.name == 'all') {
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blSiteConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blSiteConfirm='1';
|
||||
}
|
||||
// else if (tab.name == 'confirmNotBill') {
|
||||
// this.queryParams.blSiteConfirm='2';
|
||||
// }
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
}
|
||||
this.getList();
|
||||
},
|
||||
|
||||
@ -809,7 +723,13 @@ export default {
|
||||
/** 查询结算子账单列表 */
|
||||
|
||||
initQueryParams(){
|
||||
this.queryParams.settleType=this.settleType;
|
||||
if(this.actionType==3){
|
||||
this.queryParams.params.salesmen=this.$store.getters.empName
|
||||
}else if(this.actionType==2){
|
||||
this.queryParams.settleType=2;
|
||||
}else if(this.actionType==1){
|
||||
this.queryParams.settleType=1;
|
||||
}
|
||||
this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
|
||||
},
|
||||
getList() {
|
||||
@ -829,6 +749,98 @@ export default {
|
||||
});
|
||||
|
||||
},
|
||||
//指定列求和
|
||||
getSummaries(param) {
|
||||
const { columns, data } = param;
|
||||
console.log("===>getSummaries==>",param)
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = '合计';
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
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.volumeWeight'
|
||||
|
||||
) {
|
||||
const values = data.map(item => Number(item.waybillDetail.volumeWeight));
|
||||
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
sums[index] = sums[index].toFixed(2); //保留2位小数
|
||||
}
|
||||
else if (
|
||||
column.property === 'waybillDetail.freight'
|
||||
|
||||
) {
|
||||
const values = data.map(item => Number(item.waybillDetail.freight));
|
||||
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
sums[index] = sums[index].toFixed(2); //保留2位小数
|
||||
}
|
||||
|
||||
else if (
|
||||
column.property === 'waybillDetail.totalVolume'
|
||||
) {
|
||||
const values = data.map(item => Number(item.waybillDetail.totalVolume));
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
sums[index] = sums[index].toFixed(5); //保留2位小数
|
||||
}
|
||||
else if(
|
||||
column.property === 'waybillDetail.parcelQty'
|
||||
){
|
||||
const values = data.map(item => Number(item.waybillDetail.parcelQty));
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
sums[index];
|
||||
}
|
||||
});
|
||||
console.log(sums);
|
||||
return sums
|
||||
},
|
||||
|
||||
handleShowTraceInfo(row){
|
||||
this.openTraceInfoTitle="运单详情【"+row.billCode+"】";
|
||||
@ -917,12 +929,56 @@ export default {
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleView(row) {
|
||||
this.id=row.id;
|
||||
this.titleView="查看";
|
||||
this.openView=true;
|
||||
// this.router.push({ path: '/emis/emisSettleSubBill/viewDetail', query: { id: row.id }})
|
||||
|
||||
handleConfirmBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否确认').then(function() {
|
||||
return confirmBillBySite(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleCancelConfirmBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否取消确认').then(function() {
|
||||
return cancelConfirmBillBySite(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleConfirmNoBillBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$prompt('请输入不出账原因', "操作确认", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
closeOnClickModal: false,
|
||||
inputPattern: /^.{1,30}$/,
|
||||
inputErrorMessage: "原因长度必须介于 1 和 30 之间"
|
||||
}).then(({ value }) => {
|
||||
confirmNoBillBySite(ids,value).then(response => {
|
||||
this.$modal.msgSuccess("操作成功" );
|
||||
this.getList();
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleSetBillErrorBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$prompt('请输入账单异常原因', "操作确认", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
closeOnClickModal: false,
|
||||
inputPattern: /^.{1,30}$/,
|
||||
inputErrorMessage: "原因长度必须介于 1 和 30 之间"
|
||||
}).then(({ value }) => {
|
||||
setBillErrorBySite(ids,value).then(response => {
|
||||
this.$modal.msgSuccess("操作成功" );
|
||||
this.getList();
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
|
||||
handleFormChanged(){
|
||||
this.openForm = false;
|
||||
this.getList();
|
||||
@ -994,7 +1050,7 @@ export default {
|
||||
|
||||
.feeItem{
|
||||
|
||||
border: 1px solid #d4d4d4;
|
||||
border: 1px solid #dfe6ec;
|
||||
|
||||
ul{
|
||||
list-style: none;
|
||||
@ -1003,7 +1059,7 @@ export default {
|
||||
width: 590px;
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
border: 1px solid #ffffff;
|
||||
border: 1px solid #dfe6ec;
|
||||
border-top: 0px;
|
||||
font-size: 12px;
|
||||
|
||||
@ -1012,7 +1068,7 @@ export default {
|
||||
display:block; width:33%; float:left;text-indent:2em
|
||||
}
|
||||
.th{
|
||||
background:#F1FADE; font-weight:bold; border-top:1px
|
||||
background:#FFF; font-weight:bold; border-top:1px
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -15,20 +15,20 @@
|
||||
:rows="2"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="发货时间" prop="">
|
||||
<el-form-item label="寄件日期" prop="sendDate">
|
||||
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="寄件网点" prop="waybillDetail.sendSiteCode">
|
||||
<EmisSiteSimplePicker1 v-model="queryParams.params.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
|
||||
<el-form-item label="寄件网点" prop="params.sendSiteCode">
|
||||
<EmisSiteSimplePicker1 v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
|
||||
</el-form-item>
|
||||
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
|
||||
<el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
|
||||
<EmisSiteSimplePicker2 v-model="queryParams.params.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="settleType==2" label="月结客户" prop="custNo">
|
||||
<el-form-item v-if="actionType==2 || actionType==3 " label="月结客户" prop="custNo">
|
||||
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="付款方式" prop="paymentType" >
|
||||
<el-select v-if="settleType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-form-item label="付款方式" prop="params.paymentType" >
|
||||
<el-select v-if="actionType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))"
|
||||
:key="dict.value"
|
||||
@ -37,7 +37,7 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
|
||||
<el-select v-if="settleType==2" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-select v-if="actionType==2 || actionType==3 " clearable v-model="queryParams.params.paymentType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="dict in dict.type.emis_payment_type.filter(item=>['2','4','5'].includes(item.value))"
|
||||
:key="dict.value"
|
||||
@ -46,13 +46,13 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('回款联系人')" prop="payee">
|
||||
<el-form-item :label="$t('回款联系人')" prop="params.payee">
|
||||
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee" ></PayeePicker>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('销售联系人')" prop="salesmen">
|
||||
<el-form-item :label="$t('销售联系人')" prop="params.salesmen">
|
||||
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="寄件公司" prop="sendCompany">
|
||||
<el-form-item label="寄件公司" prop="params.sendCompany">
|
||||
<el-input
|
||||
v-model="queryParams.params.sendCompany"
|
||||
:placeholder="$t('寄件公司')"
|
||||
@ -61,7 +61,7 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="收件公司" prop="receiveCompany">
|
||||
<el-form-item label="收件公司" prop="params.receiveCompany">
|
||||
<el-input
|
||||
v-model="queryParams.params.receiveCompany"
|
||||
:placeholder="$t('收件公司')"
|
||||
@ -83,13 +83,6 @@
|
||||
|
||||
</el-tabs>
|
||||
|
||||
<!-- <div v-show="activeTab==='waitConfirm'">
|
||||
</div>
|
||||
<div v-show="activeTab==='hasConfirm'">
|
||||
</div> -->
|
||||
<!-- <div v-show="activeTab==='confirmNotBill'">
|
||||
</div> -->
|
||||
|
||||
<XdTable v-loading="loading"
|
||||
border
|
||||
size="mini"
|
||||
@ -97,7 +90,7 @@
|
||||
ref="refTable"
|
||||
|
||||
row-key="id"
|
||||
storageName="SubBillConfirmBySiteList_main"
|
||||
:storageName="storageName"
|
||||
|
||||
:data="emisSettleSubBillList"
|
||||
:showSearch.sync="showSearch"
|
||||
@ -110,9 +103,78 @@
|
||||
:row-style="tableRowClassName"
|
||||
|
||||
highlight-current-row
|
||||
|
||||
show-summary :summary-method="getSummaries"
|
||||
>
|
||||
|
||||
<div slot="toolbar">
|
||||
<div slot="toolbar" v-if="settleType==1 || settleType==2">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleConfirmByCenter"
|
||||
v-hasPermi="['emis:emisSettleSubBill:confirmBillByCenter']"
|
||||
>批量确认</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleConfirmNoBillByCenter"
|
||||
v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']"
|
||||
>确认不出账</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleSetBillErrorByCenter"
|
||||
v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']"
|
||||
>置账单异常</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5" v-if="activeTab!='waitConfirm'">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleCancelConfirmByCenter"
|
||||
v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillByCenter']"
|
||||
>取消确认</el-button>
|
||||
</el-col>
|
||||
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleSplit"
|
||||
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
|
||||
>拆分子账单</el-button>
|
||||
</el-col> -->
|
||||
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['emis:emisSettleSubBill:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
<div slot="toolbar" v-if="settleType==3">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
|
||||
<el-button
|
||||
@ -145,28 +207,7 @@
|
||||
>取消确认</el-button>
|
||||
</el-col>
|
||||
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleSplit"
|
||||
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
|
||||
>拆分子账单</el-button>
|
||||
</el-col> -->
|
||||
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['emis:emisSettleSubBill:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
|
||||
@ -180,7 +221,7 @@
|
||||
<template slot-scope="scope">
|
||||
<div style="padding: 8px 50px;background: white;">
|
||||
|
||||
<div style="display:inline-flex" >
|
||||
<div style="display:inline-flex;padding: 15px 0px;" >
|
||||
<div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
|
||||
<div>
|
||||
<el-button
|
||||
@ -212,20 +253,75 @@
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
|
||||
<el-table-column :label="$t('子账单号')" align="center" prop="billNo" min-width="130" />
|
||||
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="120" >
|
||||
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
|
||||
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column v-if="settleType!=1" :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span type="normal">{{ scope.row.customerName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- <el-table-column :label="$t('取件员/操作员')" align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
|
||||
<span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
||||
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
|
||||
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
|
||||
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
|
||||
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
|
||||
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
|
||||
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
|
||||
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
|
||||
<span v-else >/</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="120" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.blConfirm=='0'" >未确认</span>
|
||||
<el-tag v-if="scope.row.blConfirm=='1'" type="success">已确认</el-tag>
|
||||
<el-tag v-if="scope.row.blConfirm=='2'" type="error">确认不出账</el-tag>
|
||||
<el-tag v-if="scope.row.blConfirm=='3'" type="error">账单异常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('财务备注')" align="center" prop="confirmNote" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManName" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmDate" min-width="170" />
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManName" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmDate" min-width="170" />
|
||||
<el-table-column :label="$t('财务备注')" align="center" prop="confirmNote" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
|
||||
<el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.blSiteConfirm=='0'" >未确认</span>
|
||||
<el-tag v-if="scope.row.blSiteConfirm=='1'" type="success">已确认</el-tag>
|
||||
@ -233,226 +329,17 @@
|
||||
<el-tag v-if="scope.row.blSiteConfirm=='3'" type="error">账单异常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('业务备注')" align="center" prop="siteConfirmNote" min-width="100" />
|
||||
<el-table-column :label="$t('业务确认时间')" align="center" prop="siteConfirmDate" min-width="170" />
|
||||
<el-table-column :label="$t('业务确认人')" align="center" prop="siteConfirmManName" min-width="100" />
|
||||
<el-table-column :label="$t('业务备注')" align="center" prop="siteConfirmNote" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('结算类型')" align="center" prop="settleType" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.settleType=='1'" type="normal">现金</el-tag>
|
||||
<el-tag v-if="scope.row.settleType=='2'" type="success">月结</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.settleType=='2'" type="normal">{{ scope.row.customerName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="100" /> -->
|
||||
|
||||
<el-table-column :label="$t('账单费用')" align="center" prop="billFee" min-width="100" />
|
||||
<el-table-column :label="$t('费用币种')" align="center" prop="currency" min-width="100" />
|
||||
<el-table-column :label="$t('出账时间')" align="center" prop="billDate" min-width="170" />
|
||||
<el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="100" />
|
||||
|
||||
|
||||
<!-- <el-table-column :label="$t('站点确认人')" align="center" prop="siteConfirmManCode" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('父账单号')" align="center" prop="parentBillNo" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('总结算账单号')" align="center" prop="settleBillNo" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('是否已拆单')" align="center" prop="blSplit" min-width="100" />
|
||||
<el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认日期')" align="center" prop="confirmDate" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认站点')" align="center" prop="confirmSite" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManCode" min-width="100" />
|
||||
<el-table-column :label="$t('财务确认备注')" align="center" prop="confirmNote" min-width="100" />
|
||||
<el-table-column :label="$t('站点确认日期')" align="center" prop="siteConfirmDate" min-width="100" />
|
||||
<el-table-column :label="$t('网点确认备注')" align="center" prop="siteConfirmNote" min-width="100" /> -->
|
||||
|
||||
|
||||
<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.waybillDetail.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.waybillDetail.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.waybillDetail.sendName }}--{{ scope.row.waybillDetail.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.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="170" >
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.waybillDetail.estimateDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('发货日期')" align="center" prop="waybillDetail.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.waybillDetail.takePieceEmployeeName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('合同号')" align="center" prop="waybillDetail.custOrderId" width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('操作员')" align="center" prop="waybillDetail.operateEmployeeName" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('时效')" align="center" prop="waybillDetail.timeType" min-width="80" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('报关方式')" align="center" prop="waybillDetail.customsEclaration" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.waybillDetail.customsEclaration"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('清关方式')" align="center" prop="waybillDetail.customsClear" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.waybillDetail.customsClear"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('录入人')" align="center" prop="waybillDetail.registerManName" min-width="80" :show-overflow-tooltip="true" />
|
||||
|
||||
<el-table-column :label="$t('客户名称')" align="center" prop="waybillDetail.customerName" min-width="80" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.customerName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
|
||||
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
|
||||
|
||||
<el-table-column :label="$t('是否问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
|
||||
<el-tag v-else type="info">否</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件财务中心')" align="center" prop="waybillDetail.sendSiteFincailName" min-width="150" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件手机')" align="center" prop="waybillDetail.sendMobile" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件国家')" align="center" prop="waybillDetail.sendCountryName" min-width="80" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('寄件省')" align="center" prop="waybillDetail.sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件市')" align="center" prop="waybillDetail.sendCityName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件区')" align="center" prop="waybillDetail.sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件地址')" align="center" prop="waybillDetail.sendAddress" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('寄件/签收短信')" align="center" prop="waybillDetail.blMessage" min-width="150" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.waybillDetail.blMessage==1" >发送</div>
|
||||
<div v-else>不发送</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('收货人')" align="center" prop="waybillDetail.receiveName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货电话')" align="center" prop="waybillDetail.receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货公司')" align="center" prop="waybillDetail.receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货国家')" align="center" prop="waybillDetail.receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货省')" align="center" prop="waybillDetail.receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货市')" align="center" prop="waybillDetail.receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货区')" align="center" prop="waybillDetail.receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收货地址')" align="center" prop="waybillDetail.receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('派货短信')" align="center" prop="waybillDetail.blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.waybillDetail.blAcceptMessage==1" >发送</div>
|
||||
<div v-else>不发送</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('目的地')" align="center" prop="waybillDetail.destinationName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('目的网点')" align="center" prop="waybillDetail.dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
|
||||
|
||||
<el-table-column :label="$t('货物名称')" align="center" prop="waybillDetail.goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('包装类型')" align="center" prop="waybillDetail.packType" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.waybillDetail.packType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
|
||||
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
|
||||
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
|
||||
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
|
||||
|
||||
<el-table-column :label="$t('派件方式')" align="center" prop="waybillDetail.dispatchMethod" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.waybillDetail.dispatchMethod==1" >派送</div>
|
||||
<div v-else>自提</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.waybillDetail.paymentType==3">{{scope.row.waybillDetail.freight}}</span>
|
||||
<span v-else>0</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
|
||||
<el-table-column :label="$t('保价金额')" align="center" prop="waybillDetail.insureValue" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<!-- <el-table-column :label="$t('保费')" align="center" prop="waybillDetail.insureFee" min-width="80" :show-overflow-tooltip="true"/> -->
|
||||
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="80" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.waybillDetail.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="waybillDetail.signDate" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('签收人')" align="center" prop="waybillDetail.signMan" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('派件员')" align="center" prop="waybillDetail.dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('派件网点')" align="center" prop="waybillDetail.dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('录单网点')" align="center" prop="waybillDetail.registerSiteName" min-width="80" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
|
||||
|
||||
<!-- <el-table-column :label="$t('数据来源')" align="center" prop="waybillDetail.dataFrom" min-width="80" /> -->
|
||||
|
||||
<!-- <el-table-column label="创建人" align="center" prop="waybillDetail.createByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="创建网点" align="center" prop="waybillDetail.createSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="创建时间" align="center" prop="waybillDetail.createTime" width="170"/>
|
||||
<el-table-column label="修改人" align="center" prop="waybillDetail.updateByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="修改网点" align="center" prop="waybillDetail.updateSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="修改时间" align="center" prop="waybillDetail.updateTime" width="170"/> -->
|
||||
|
||||
</XdTable>
|
||||
|
||||
<!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||
<emisSettleSubBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleSubBillForm>
|
||||
</el-dialog> -->
|
||||
|
||||
<el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false" v-dialogDrag append-to-body>
|
||||
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
|
||||
</el-dialog>
|
||||
<!--
|
||||
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
|
||||
<emisSettleSubBillView :id="id" ></EmisSettleSubBillView>
|
||||
</el-dialog>
|
||||
-->
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
@ -551,8 +438,11 @@ export default {
|
||||
// 结算子账单表格数据
|
||||
emisSettleSubBillList: [],
|
||||
|
||||
actionType:null,
|
||||
settleType:null,
|
||||
|
||||
storageName:null,
|
||||
|
||||
queryStatInfoMap:null,
|
||||
|
||||
currentId:null,
|
||||
@ -749,32 +639,68 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.queryParams.blConfirm='0';
|
||||
this.settleType=this.$route.query.settleType;
|
||||
this.actionType=this.$route.query.actionType;
|
||||
|
||||
this.initData();
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
|
||||
initData(){
|
||||
if(this.actionType==1){
|
||||
this.storageName="SubBillConfirmByMoneyList_main";
|
||||
}
|
||||
else if(this.actionType==2){
|
||||
this.storageName="SubBillConfirmByMonthList_main";
|
||||
}
|
||||
else if(this.actionType==3){
|
||||
this.storageName="SubBillConfirmBySitehList_main";
|
||||
}
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
// console.log(tab, event);
|
||||
if (tab.name == 'all') {
|
||||
if(this.actionType==1|| this.actionType==2){
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blSiteConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blSiteConfirm='1';
|
||||
}
|
||||
// else if (tab.name == 'confirmNotBill') {
|
||||
// this.queryParams.blSiteConfirm='2';
|
||||
// }
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
|
||||
|
||||
|
||||
this.queryParams.blConfirm=null;
|
||||
if (tab.name == 'all') {
|
||||
this.queryParams.blConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blConfirm='1';
|
||||
}
|
||||
else if (tab.name == 'confirmNotBill') {
|
||||
this.queryParams.blConfirm='2';
|
||||
}
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blConfirm='3';
|
||||
}
|
||||
else if (tab.name == 'siteBillError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
|
||||
}
|
||||
else if(this.actionType==2){
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
this.queryParams.blConfirm=1;
|
||||
if (tab.name == 'all') {
|
||||
this.queryParams.blSiteConfirm=null;
|
||||
}
|
||||
else if (tab.name == 'waitConfirm') {
|
||||
this.queryParams.blSiteConfirm='0';
|
||||
}
|
||||
else if (tab.name == 'hasConfirm') {
|
||||
this.queryParams.blSiteConfirm='1';
|
||||
}
|
||||
// else if (tab.name == 'confirmNotBill') {
|
||||
// this.queryParams.blSiteConfirm='2';
|
||||
// }
|
||||
else if (tab.name == 'billError') {
|
||||
this.queryParams.blSiteConfirm='3';
|
||||
}
|
||||
}
|
||||
this.getList();
|
||||
},
|
||||
|
||||
@ -797,8 +723,13 @@ export default {
|
||||
/** 查询结算子账单列表 */
|
||||
|
||||
initQueryParams(){
|
||||
this.queryParams.settleType=this.settleType;
|
||||
this.queryParams.params.salesmen=this.$store.getters.empName
|
||||
if(this.actionType==3){
|
||||
this.queryParams.params.salesmen=this.$store.getters.empName
|
||||
}else if(this.actionType==2){
|
||||
this.queryParams.settleType=2;
|
||||
}else if(this.actionType==1){
|
||||
this.queryParams.settleType=1;
|
||||
}
|
||||
this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
|
||||
},
|
||||
getList() {
|
||||
@ -818,6 +749,98 @@ export default {
|
||||
});
|
||||
|
||||
},
|
||||
//指定列求和
|
||||
getSummaries(param) {
|
||||
const { columns, data } = param;
|
||||
console.log("===>getSummaries==>",param)
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = '合计';
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
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.volumeWeight'
|
||||
|
||||
) {
|
||||
const values = data.map(item => Number(item.waybillDetail.volumeWeight));
|
||||
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
sums[index] = sums[index].toFixed(2); //保留2位小数
|
||||
}
|
||||
else if (
|
||||
column.property === 'waybillDetail.freight'
|
||||
|
||||
) {
|
||||
const values = data.map(item => Number(item.waybillDetail.freight));
|
||||
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
sums[index] = sums[index].toFixed(2); //保留2位小数
|
||||
}
|
||||
|
||||
else if (
|
||||
column.property === 'waybillDetail.totalVolume'
|
||||
) {
|
||||
const values = data.map(item => Number(item.waybillDetail.totalVolume));
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
sums[index] = sums[index].toFixed(5); //保留2位小数
|
||||
}
|
||||
else if(
|
||||
column.property === 'waybillDetail.parcelQty'
|
||||
){
|
||||
const values = data.map(item => Number(item.waybillDetail.parcelQty));
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
sums[index];
|
||||
}
|
||||
});
|
||||
console.log(sums);
|
||||
return sums
|
||||
},
|
||||
|
||||
handleShowTraceInfo(row){
|
||||
this.openTraceInfoTitle="运单详情【"+row.billCode+"】";
|
||||
@ -858,6 +881,55 @@ export default {
|
||||
this.openForm = true;
|
||||
this.titleForm = "修改";
|
||||
},
|
||||
handleConfirmByCenter(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否确认').then(function() {
|
||||
return confirmBillByCenter(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleCancelConfirmByCenter(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否取消确认').then(function() {
|
||||
return cancelConfirmBillByCenter(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleConfirmNoBillByCenter(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$prompt('请输入不出账原因', "操作确认", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
closeOnClickModal: false,
|
||||
inputPattern: /^.{1,30}$/,
|
||||
inputErrorMessage: "原因长度必须介于 1 和 30 之间"
|
||||
}).then(({ value }) => {
|
||||
confirmNoBillByCenter(ids,value).then(response => {
|
||||
this.$modal.msgSuccess("操作成功" );
|
||||
this.getList();
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleSetBillErrorByCenter(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$prompt('请输入账单异常原因', "操作确认", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
closeOnClickModal: false,
|
||||
inputPattern: /^.{1,30}$/,
|
||||
inputErrorMessage: "原因长度必须介于 1 和 30 之间"
|
||||
}).then(({ value }) => {
|
||||
setBillErrorByCenter(ids,value).then(response => {
|
||||
this.$modal.msgSuccess("操作成功" );
|
||||
this.getList();
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
|
||||
handleConfirmBySite(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否确认').then(function() {
|
||||
@ -906,12 +978,7 @@ export default {
|
||||
});
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleView(row) {
|
||||
this.id=row.id;
|
||||
this.titleView="查看";
|
||||
this.openView=true;
|
||||
// this.router.push({ path: '/emis/emisSettleSubBill/viewDetail', query: { id: row.id }})
|
||||
},
|
||||
|
||||
handleFormChanged(){
|
||||
this.openForm = false;
|
||||
this.getList();
|
||||
@ -983,7 +1050,7 @@ export default {
|
||||
|
||||
.feeItem{
|
||||
|
||||
border: 1px solid #d4d4d4;
|
||||
border: 1px solid #dfe6ec;
|
||||
|
||||
ul{
|
||||
list-style: none;
|
||||
@ -992,7 +1059,7 @@ export default {
|
||||
width: 590px;
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
border: 1px solid #ffffff;
|
||||
border: 1px solid #dfe6ec;
|
||||
border-top: 0px;
|
||||
font-size: 12px;
|
||||
|
||||
@ -1001,7 +1068,7 @@ export default {
|
||||
display:block; width:33%; float:left;text-indent:2em
|
||||
}
|
||||
.th{
|
||||
background:#F1FADE; font-weight:bold; border-top:1px
|
||||
background:#FFF; font-weight:bold; border-top:1px
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user