angelo
/
web-zk-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test

This commit is contained in:
woody 2025-09-26 10:43:28 +08:00
parent 3bd44b7a81 1ab58e6189
commit 6fe69ee12e
7 changed files with 497 additions and 949 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/archityecture.js
View File

@ -61,3 +61,20 @@ export function getChildList(params) {
params
})
}
// 查询推荐架构列表
export function getAzFrameworkList(params) {
return request({
url: '/member/manage/member-structure/three-framework-list',
method: 'get',
params
})
}
export function getAzFramewrokNodeInfo(params) {
return request({
url: '/member/manage/member-structure/pointDetail',
method: 'get',
params
})
}

1235
src/views/framework/architecture/azjg2.vue
View File

File diff suppressed because it is too large Load Diff

10
src/views/framework/architecture/index.vue
View File

@ -184,7 +184,7 @@ export default {
moren: 'azjg',
queryParams: {
memberSettlePeriodId: '', // 期数
memberCode: 'KG71227311', // 会员编号
memberCode: '', // 会员编号
stage: 1,
stageStatus: '',
childNode: ''
@ -326,11 +326,7 @@ export default {
</div>
) : (
<div class='empty-node'>
<div class='empty-avatar'>
<i class='el-icon-plus'></i>
</div>
<div class='empty-text'>空点位</div>
<div class='status-indicator inactive'></div>
</div>
)}
</div>
@ -392,14 +388,14 @@ export default {
},
resetHandle() {
this.$refs.topMemberSelect.reset()
this.queryParams = {
memberSettlePeriodId: '', // 期数
memberCode: '', // 会员编号
stage: 7,
type: 1
}
this.getSearch()
this.data = {}
this.childNodeList = []
},
getChildNodeList() {
if (!this.queryParams.memberCode) {

8
src/views/framework/architecture/mixins/tab-bar.js
View File

@ -5,11 +5,11 @@ export default {
{
name: '方案一',
path: 'azjg'
},
{
name: '方案二',
path: 'azjg2'
}
// {
// name: '方案五',
// path: 'azjg5'
// }
]
}
}

3
src/views/information/member/index.vue
View File

@ -398,9 +398,6 @@
:data="tableData"
:height="isActive ? '480px' : '630px'"
>
v-loading="loading" style="width: 100%" :header-cell-style="{
background: '#EEEEEE' }" :row-class-name="tableRowClassName"
@selection-change="handleSelectionChange" >
<el-table-column type="selection" />
<el-table-column
v-if="allTxt.memberCode"

76
src/views/settlementCenter/bonusDetail/index.vue
View File

@ -183,91 +183,25 @@
/>
<el-table-column
align="center"
prop="retailRangeIncomeOri"
prop="directIncome"
width="130"
:label="$t('直推收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailSameLevelIncomeOri"
prop="storeIncome"
width="130"
:label="$t('平级收益') + `(${isLocalSymbol()})`"
:label="$t('阶段收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailAreaIncomeOri"
prop="globalPoints"
width="130"
:label="$t('区域分红') + `(${isLocalSymbol()})`"
:label="$t('见点收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitRangeIncomeOri"
width="130"
:label="$t('福利级差收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="repurRangeIncome"
width="130"
:label="$t('复购级差收益') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailMonthRepurchaseIncomeOri"
width="160"
:label="$t('月复购级差收益') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="coachIncomeOri"
width="130"
:label="$t('培育津贴') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitAvgIncomeOri"
width="160"
:label="$t('福利分红平均收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitIncomeOri"
width="160"
:label="$t('福利分红加权收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="backPointsOri"
width="130"
:label="$t('重消收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
align="center"
prop="retailRealSubtotalOri"
width="130"
:label="$t('收益小计') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/> -->
<!-- <el-table-column
align="center"
prop="globalPointsOri"
width="130"
:label="$t('直推极差') + '(￥)'"
:formatter="stateFormat"
/> -->
<el-table-column
align="center"

97
src/views/settlementCenter/totalBonus/index.vue
View File

@ -164,109 +164,22 @@
/>
<el-table-column
align="center"
prop="retailRangeIncome"
width="130"
prop="directIncome"
:label="$t('直推收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailSameLevelIncome"
width="130"
:label="$t('平级收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailAreaIncome"
width="130"
:label="$t('区域分红') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitRangeIncome"
width="130"
:label="$t('福利级差收益') + `(${isLocalSymbol()})`"
prop="storeIncome"
:label="$t('阶段收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="repurRangeIncome"
width="130"
:label="$t('复购级差收益') + '(￥)'"
prop="globalPoints"
:label="$t('见点收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailMonthRepurchaseIncome"
width="160"
:label="$t('月复购级差收益') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="coachIncome"
width="130"
:label="$t('培育津贴') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitAvgIncome"
width="160"
:label="$t('福利分红平均收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitIncome"
width="160"
:label="$t('福利分红加权收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="backPoints"
width="130"
:label="$t('重消收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
align="center"
prop="globalPointsOri"
width="130"
:label="$t('直推级差') + '(￥)'"
:formatter="stateFormat"
/> -->
<!-- <el-table-column
align="center"
prop="realIncomeTotalOri"
width="130"
v-if="allTxt.realIncomeTotalOri"
:label="'实发收益总计' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.realIncomeTotal"
align="center"
prop="realIncomeTotal"
width="130"
:label="'实发收益总计' + '($)'"
:formatter="stateFormat"
/> -->
<!-- <el-table-column
align="center"
prop="settleDate"
width="200"
:label="'开始日期'"
v-if="allTxt.settleDate"
/> -->
<el-table-column
v-if="allTxt.realIncomeTotal"
align="center"