aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-05-13 19:58:30 +08:00
parent a4d5b918a1
commit 81e3eaed95
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/emis/emisCommissionDtl/index.vue
View File

@ -152,6 +152,12 @@
<dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
</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">
<span v-if="scope.row.waybillDetail.paymentType==1 || scope.row.waybillDetail.paymentType==3 || scope.row.waybillDetail.paymentType==6">现金</span>
<span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">月结</span>
</template>
</el-table-column>
<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.receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sortable="true" :show-overflow-tooltip="true"/>
@ -499,7 +505,7 @@ export default {
else{
let qExportParam={...this.queryParams};
qExportParam.pageNum=1;
qExportParam.pageSize=10000;
qExportParam.pageSize=100000;
listEmisCommissionDtl(qExportParam).then(response => {
if (response.code === 200) {
@ -534,7 +540,7 @@ export default {
return ++index
}
if (j === 'kjlx') {
return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
// return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
}
if (j === 'fjr') {
return v['sendName']+'--'+v['receiveName'];
@ -637,6 +643,16 @@ export default {
return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
}
if (j === 'waybillDetail.paymentType') {
let paymentType=v['waybillDetail']['paymentType'];
if(paymentType == 1 || paymentType==3 || paymentType==6){
return '现金';
}
else if(paymentType == 2 || paymentType==4 || paymentType==5){
return '月结';
}
}
if (j === 'waybillDetail.paymentStatus') {
return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
}

19
src/views/emis/emisCommissionProfit/index.vue
View File

@ -21,7 +21,7 @@
:data="emisCommissionProfitList"
ref="refTable"
storageName="emisCommissionProfitList_main"
storageName="emisCommissionProfitList_main_2"
:showSearch.sync="showSearch"
@ -83,10 +83,11 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column :label="$t('提成编号')" align="center" prop="profitNo" min-width="100" /> -->
<!-- <el-table-column :label="$t('提成名称')" align="center" prop="profitName" min-width="100" /> -->
<!-- <el-table-column :label="$t('提成类型')" align="center" prop="settleType" min-width="100" /> -->
<el-table-column :label="$t('员工名称')" align="center" prop="empName" width="100" />
<el-table-column :label="$t('月份')" align="center" prop="billMonth" width="100" />
<el-table-column :label="$t('提成金额')" align="center" prop="money" width="100" />
<el-table-column :label="$t('现金提成')" align="center" prop="money" width="100" />
<el-table-column :label="$t('月结提成')" align="center" prop="monthMoney" width="100" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" />
<el-table-column :label="$t('更新时间')" align="center" prop="updateTime" width="170" />
@ -318,7 +319,7 @@ export default {
else{
let qExportParam=this.initQueryParams();
qExportParam.pageNum=1;
qExportParam.pageSize=5000;
qExportParam.pageSize=100000;
listEmisCommissionProfit(qExportParam).then(response => {
if (response.code === 200) {
@ -474,9 +475,13 @@ export default {
}
}
if (j === 'settleType') {
if(v['settleType'] == 1){
return '现金';
}else{
return '月结';
}
}
if (j === 'waybillDetail.blMessage') {
if(v['waybillDetail']['blMessage'] == 1){

1
src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
View File

@ -78,7 +78,6 @@
</el-row>
</SearchForm>
<XdTable
v-loading="loading"