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

Merge pull request '业务、现金、月结出账确认' (#96) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/96
This commit is contained in:
wuteng 2025-09-16 17:55:14 +08:00
commit 5180299afa
3 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
View File

@ -333,9 +333,12 @@
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('运费差')" align="center" prop="waybillDetail.fee" min-width="80" >
<el-table-column :label="$t('运费差')" align="center" prop="diffFee" min-width="80" >
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.realFee">{{ scope.row.waybillDetail.realFee-scope.row.waybillDetail.freight }}</span>
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">
{{scope.row.waybillDetail.freight-scope.row.waybillDetail.realFee}}
</span>
<span v-else>0</span>
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
@ -1437,6 +1440,21 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
if(j === 'diffFee'){
if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
}else{
return 0;
}
}
if(j === 'blSpecialQuote'){
if(v['waybillDetail']['blSpecialQuote'] == '0'){
return '否';
}
else if(v['waybillDetail']['blSpecialQuote'] == '1'){
return '是';
}
}
return v[j]
}))
},

26
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -355,13 +355,21 @@
<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="120" :sortable="true" />
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" >
<template slot-scope="scope">
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('运费差')" align="center" prop="diffFee" min-width="80" >
<template slot-scope="scope">
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">
{{scope.row.waybillDetail.freight-scope.row.waybillDetail.realFee}}
</span>
<span v-else>0</span>
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
@ -385,7 +393,6 @@
<el-tag v-if="scope.row.waybillDetail.blSpecialQuote=='1'" type="error">是</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" 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">
@ -1552,6 +1559,21 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
if(j === 'diffFee'){
if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
}else{
return 0;
}
}
if(j === 'blSpecialQuote'){
if(v['waybillDetail']['blSpecialQuote'] == '0'){
return '否';
}
else if(v['waybillDetail']['blSpecialQuote'] == '1'){
return '是';
}
}
return v[j]
}))
},

15
src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
View File

@ -1598,6 +1598,21 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
if(j === 'diffFee'){
if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
}else{
return 0;
}
}
if(j === 'blSpecialQuote'){
if(v['waybillDetail']['blSpecialQuote'] == '0'){
return '否';
}
else if(v['waybillDetail']['blSpecialQuote'] == '1'){
return '是';
}
}
return v[j]
}))
},