Merge pull request '提成统计' (#171) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/171
This commit is contained in:
wuteng 2025-12-17 19:28:30 +08:00
commit d8fab48451

View File

@ -7,6 +7,16 @@
<el-form-item label="提成员工" prop="empName">
<EmpNamePicker :placeholder="$t('提成员工')" v-model="queryParams.empName" ></EmpNamePicker>
</el-form-item>
<el-form-item label="岗位类型" prop="postType">
<el-select v-model="queryParams.postType" placeholder="岗位类型" clearable filterable >
<el-option
v-for="item in dict.type.emis_commission_post"
v-bind:key="item.value"
v-bind:label="item.label"
v-bind:value="item.value"
/>
</el-select>
</el-form-item>
</SearchForm>
<XdTable
@ -84,20 +94,21 @@
<!-- <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="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="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="money" width="120" sortable>
<template slot-scope="scope">
<div class="link-type" @click="handleShowDtlList(scope.row,'1,3,6')">{{ scope.row.money }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('月结提成')" align="center" prop="monthMoney" width="100" >
<template slot-scope="scope">
<el-table-column :label="$t('月结提成')" align="center" prop="monthMoney" width="120" sortable>
<template slot-scope="scope">
<div class="link-type" @click="handleShowDtlList(scope.row,'2,4,5')">{{ scope.row.monthMoney }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" />
<el-table-column :label="$t('更新时间')" align="center" prop="updateTime" width="170" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" sortable />
<el-table-column :label="$t('更新时间')" align="center" prop="updateTime" width="170" sortable />
<!-- <el-table-column :label="$t('结算开始时间')" align="center" prop="startDate" min-width="100" /> -->
<!-- <el-table-column :label="$t('结算结束时间')" align="center" prop="endDate" min-width="100" /> -->
@ -146,13 +157,12 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisCommissionProfitView from '@/views/emis/emisCommissionProfit/emisCommissionProfitView';
import emisCommissionProfitForm from '@/views/emis/emisCommissionProfit/emisCommissionProfitForm';
import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
export default {
name: "EmisCommissionProfit",
components: { elDateSimplePicker,emisCommissionProfitForm,EmpNamePicker },
dicts: [
],
dicts: ['emis_commission_post'],
data() {
return {
// 遮罩层