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

Merge pull request '提成统计岗位类型调整' (#172) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/172
This commit is contained in:
wuteng 2025-12-18 16:50:01 +08:00
commit 4cf0161e7e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,10 +93,14 @@
<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="empName" width="120" sortable />
<el-table-column :label="$t('月份')" align="center" prop="billMonth" width="100" sortable />
<el-table-column :label="$t('岗位类型')" align="center" prop="postType" width="120" sortable />
<el-table-column :label="$t('岗位类型')" align="center" prop="postType" width="120" sortable >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/>
</template>
</el-table-column>
<el-table-column :label="$t('现金提成')" align="center" prop="money" width="120" sortable>
<template slot-scope="scope">
<div class="link-type" @click="handleShowDtlList(scope.row,'1,3,6')">{{ scope.row.money }}</div>
@ -369,7 +373,6 @@ export default {
let index = 0
return jsonData.map(v => filterVal.map(j => {
console.log("===>1111===>",v);
if (j === 'index') {
return ++index
@ -528,6 +531,9 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
if (j === 'postType') {
return this.selectDictLabel(this.dict.type.emis_commission_post,v['postType']);
}
return v[j]
}))
},