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

Merge pull request 'master-dev' (#95) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/95
This commit is contained in:
wuteng 2025-09-13 17:56:13 +08:00
commit 575eb145b8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -795,6 +795,9 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['paymentType']);
}
if (j === 'feeType') {
return this.selectDictLabel(this.dict.type.emis_commission_fee_type,v['feeType']);
}
return v[j]
}))
},

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

@ -326,12 +326,18 @@
<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>
<el-table-column :label="$t('运费差')" align="center" prop="waybillDetail.fee" min-width="80" >
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.realFee">{{ scope.row.waybillDetail.realFee-scope.row.waybillDetail.freight }}</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>
@ -356,7 +362,6 @@
</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">