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

Merge branch 'bd-test' of gitee.com:cabbage_qd/web-base-admin into bd-online

This commit is contained in:
woody 2025-07-08 09:23:44 +08:00
parent fa20ebc10d 0f42248590
commit d41c7a3b09
10 changed files with 38 additions and 2064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/product.js
View File

@ -677,14 +677,8 @@ export function repurchaseType(params) {
params
})
}
// 团队信息
export function memberTeamInfo(params) {
return request({
url: '/member/manager/member/member-team-info',
method: 'get',
params
})
}
// 计算商品业绩
export function computePrice(data) {
return request({

36
src/api/statistics.js
View File

@ -18,24 +18,6 @@ export function getUmbrellaAwardsList(params) {
})
}
// 真实奖衔分析
export function getUmbrellaAnalysisList(params) {
return request({
url: '/report/manager/member-awards/analysis-list',
method: 'get',
params
})
}
// 真实奖衔分析穿透
export function getUmbrellaAnalysisDetailList(params) {
return request({
url: '/report/manager/member-awards/analysis-details-list',
method: 'get',
params
})
}
// 安置反查
export function getPlaceCheckList(data) {
return request({
@ -142,14 +124,7 @@ export function getShippingSummaryDetail(params) {
params
})
}
// 直推统计列表
export function directPushStatList(params) {
return request({
url: '/report/manager/member-awards/directPushStatList',
method: 'get',
params
})
}
// 会员订单分布统计
export function memberOrderScatter(params) {
return request({
@ -556,14 +531,7 @@ export function getProductSalesStat(params) {
params
})
}
// 晋升方式
export function getUpListList(params) {
return request({
url: '/system/pub/enums/upgradeType',
method: 'get',
params
})
}
// 专区商品销量统计
export function waresSales(params) {
return request({

28
src/router/index.js
View File

@ -132,22 +132,6 @@ export const constantRoutes = [
]
},
{
path: 'teamInfo',
name: 'TeamInfo',
meta: { title: '团队信息' },
component: ParentView,
redirect: 'teamInfo/index',
children: [
{
path: 'teamInfo',
name: 'TeamInfo',
component: () => import('@/views/information/teamInfo/index'),
meta: { title: '团队信息' }
}
]
},
{
path: 'realInfo',
name: 'RealInfo',
@ -2221,12 +2205,6 @@ export const constantRoutes = [
component: () => import('@/views/statistics/realPerAddAwards'),
meta: { title: '真实业绩新增奖衔' }
},
{
path: 'awardAnalysis',
name: 'AwardAnalysis',
component: () => import('@/views/statistics/awardAnalysis'),
meta: { title: '真实奖衔分析' }
},
{
path: 'levelUpRecords',
name: 'LevelUpRecords',
@ -2270,12 +2248,6 @@ export const constantRoutes = [
component: () => import('@/views/statistics/reportSummary'),
meta: { title: '报单汇总' }
},
{
path: 'directStatistics',
name: 'DirectStatistics',
component: () => import('@/views/statistics/directStatistics'),
meta: { title: '直推统计' }
},
{
path: 'incomeDetail',
name: 'IncomeDetail',

7
src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
View File

@ -540,13 +540,16 @@
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="'标签提示'">
<el-col :span="8">
<el-form-item :label="'自定义标签'">
<el-input
v-model="form.warnMessage"
clearable
:disabled="methods==0"
:placeholder="'请输入'"
:maxlength="4"
:minlength="2"
show-word-limit
/>
</el-form-item>
</el-col>

7
src/views/goodsManage/goodsRelease/jcsz.vue
View File

@ -510,12 +510,15 @@
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="'标签提示'">
<el-col :span="8">
<el-form-item :label="'自定义标签'">
<el-input
v-model="form.warnMessage"
clearable
:placeholder="'请输入'"
:maxlength="4"
:minlength="2"
show-word-limit
/>
</el-form-item>
</el-col>

4
src/views/information/business/order.vue
View File

@ -420,14 +420,14 @@
scope.row.howLong < 7
&& scope.row.orderType != 30
" -->
<el-button
<!-- <el-button
v-if="![1, 2, 7, 24, 25, 26, 30].includes(scope.row.orderType) && scope.row.howLong < 7"
v-hasButtons="['OrderBusinessCancel']"
style="color: rgba(72, 178, 253, 1)"
type="text"
size="small"
@click="backOrder(scope.row.orderCode, 4)"
>撤销产品</el-button>
>撤销产品</el-button> -->
<el-button
v-show="(scope.row.orderType == 1 || scope.row.orderType == 24 || scope.row.orderType == 7) && scope.row.returnFlag ==0 && scope.row.orderType != 30"
v-hasButtons="['OrderBusinessReturn']"

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

@ -474,6 +474,27 @@
:label="'会员姓名'"
width="180"
/>
<el-table-column
v-if="getColumnsVisible('pkSettleGradeVal') && allTxt.pkSettleGradeVal"
align="center"
prop="pkSettleGradeVal"
:label="'结算等级'"
width="180"
/>
<el-table-column
v-if="allTxt.pkAwardsVal"
align="center"
prop="pkAwardsVal"
:label="'荣誉奖衔'"
width="180"
/>
<el-table-column
v-if="getColumnsVisible('vertexName') && allTxt.vertexName"
align="center"
prop="vertexName"
:label="'隶属体系'"
width="180"
/>
<el-table-column
v-if="allTxt.phone"
align="center"
@ -517,13 +538,6 @@
:label="'安置姓名'"
width="180"
/>
<el-table-column
v-if="allTxt.pkAwardsVal"
align="center"
prop="pkAwardsVal"
:label="'荣誉奖衔'"
width="180"
/>
<el-table-column
v-if="allTxt.orderSourceVal"
@ -555,13 +569,7 @@
:label="'注册等级'"
width="180"
/>
<el-table-column
v-if="getColumnsVisible('pkSettleGradeVal') && allTxt.pkSettleGradeVal"
align="center"
prop="pkSettleGradeVal"
:label="'结算等级'"
width="180"
/>
<el-table-column
v-if="getColumnsVisible('consumeMoney') && allTxt.consumeMoney"
align="center"
@ -584,13 +592,6 @@
{{ scope.row.consumeAchieve | numberToCurrency }}
</template>
</el-table-column>
<el-table-column
v-if="getColumnsVisible('vertexName') && allTxt.vertexName"
align="center"
prop="vertexName"
:label="'隶属体系'"
width="180"
/>
<el-table-column
v-if="getColumnsVisible('teamName') && allTxt.teamName"
align="center"

1159
src/views/information/teamInfo/index.vue
View File

File diff suppressed because it is too large Load Diff

468
src/views/statistics/awardAnalysis.vue
View File

@ -1,468 +0,0 @@
<template>
<div class="page">
<topBar
v-if="topList.length > 0"
:top-list="topList"
:moren="moren"
/>
<div class="thetopbox">
<el-form label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item :label="'会员编号'">
<el-input v-model="queryParams.memberCode" clearable />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'会员姓名'">
<el-input v-model="queryParams.memberName" clearable />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'联系方式'">
<el-input v-model="queryParams.phone" clearable />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'注册等级'">
<el-select
v-model="queryParams.pkRegisterGrade"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in gradeRangList"
:key="item.pkId"
:label="item.gradeName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'荣誉奖衔'">
<el-select
v-model="queryParams.pkAwards"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in awardsList"
:key="item.pkId"
:label="item.awardsName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'隶属体系'">
<el-select
v-model="queryParams.pkVertex"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in vertexList"
:key="item.pkId"
:label="item.vertexName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'隶属团队'">
<el-select
v-model="queryParams.pkTeamCode"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in memberTeamList"
:key="item.pkId"
:label="item.teamName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="晋升方式">
<el-select
v-model="queryParams.upType"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in upList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'晋升日期'">
<el-date-picker
v-model="queryParams.thetimes"
value-format="yyyy-MM-dd"
type="daterange"
:clearable="false"
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="searchbox">
<el-button
class="my_search"
@click="
() => {
getSearch();
getCzNum();
}
"
>
{{ '搜索' }}</el-button>
<el-button class="my_reset" @click="reChongzhi">
{{ '重置' }}</el-button>
</div>
</el-col>
</el-row>
</el-form>
</div>
<div class="main">
<div class="maintop">
<div class="mainbtn">
<el-button size="small" class="thebtn1" @click="handleExport">
{{ '导出' }}</el-button>
</div>
</div>
<div class="maintable">
<el-table
v-loading="loading"
:data="tableData"
height="680px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
@selection-change="handleSelectionChange"
>
<el-table-column prop="colsele" type="selection" width="55" />
<el-table-column
align="center"
prop="memberCode"
:label="'会员编号'"
min-width="120px"
/>
<el-table-column
align="center"
prop="memberName"
:label="'会员姓名'"
min-width="120px"
/>
<el-table-column
align="center"
prop="phone"
:label="'联系方式'"
min-width="120px"
/>
<el-table-column
align="center"
prop="pkRegisterGradeVal"
:label="'注册等级'"
/>
<el-table-column
align="center"
prop="pkAwardsVal"
:label="'荣誉奖衔'"
/>
<el-table-column
align="center"
prop="vertexName"
:label="'隶属体系'"
/>
<el-table-column
align="center"
prop="teamName"
:label="'隶属团队'"
/>
<el-table-column
align="center"
prop="asumRealPv"
min-width="130px"
:label="'左区真实累计业绩' + `(PV)`"
>
<template slot-scope="scope">
<span
style="
color: #48b2fd;
cursor: pointer;
text-decoration: underline;
"
@click="goDetail(1, scope.row)"
>{{ scope.row.asumRealPv | numFilter }}</span>
</template>
</el-table-column>
<el-table-column
align="center"
prop="bsumRealPv"
min-width="130px"
:label="'右区真实累计业绩' + `(PV)`"
>
<template slot-scope="scope">
<span
style="
color: #48b2fd;
cursor: pointer;
text-decoration: underline;
"
@click="goDetail(2, scope.row)"
>
{{ scope.row.bsumRealPv | numFilter }}</span>
</template>
</el-table-column>
<el-table-column
align="center"
prop="upTypeVal"
label="晋升方式"
/>
<el-table-column
min-width="150px"
align="center"
prop="creationTime"
:label="'晋升日期'"
/>
</el-table>
</div>
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getSearch"
/>
</div>
</template>
<script>
import topBar from '@/components/topBar'
import * as sta from '@/api/statistics'
import { getAwardsListChiose, getgradeRanglist } from '@/api/level'
import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
export default {
name: 'AwardAnalysis',
components: {
topBar
},
filters: {
numFilter(value) {
// 截取当前数据到小数点后两位
const realVal = parseFloat(value).toFixed(2)
return realVal
}
},
data() {
return {
moren: 'awardAnalysis',
topList: [
{
name: '荣誉奖衔分析',
path: 'awardAnalysis'
}
],
tableData: [],
loading: false,
queryParams: {
pageNum: 1,
pageSize: 50,
thetimes: [],
placeDept: '',
pkMember: ''
},
total: 0,
multipleSelection: [],
awardsList: [],
memberTeamList: [],
vertexList: [],
gradeRangList: [],
upList: []
}
},
created() {
this.getSearch()
this.getOthers()
},
methods: {
// 穿透到详情页 左区1右区2
goDetail(index, row) {
this.queryParams = {
pageNum: 1,
pageSize: 50,
thetimes: [],
placeDept: '',
pkMember: ''
}
this.queryParams.placeDept = index
this.queryParams.pkMember = row.pkMember
sta.getUmbrellaAnalysisDetailList(this.queryParams).then((res) => {
this.tableData = res.rows
})
},
isLocalSymbol,
isLocals,
changeTime(val) {
this.queryParams.startDate = val[0]
this.queryParams.endDate = val[1]
},
getOthers() {
getAwardsListChiose().then((res) => {
this.awardsList = res.rows
})
sta.getUpListList().then((res) => {
this.upList = res.data
})
getmemberTeamList().then((res) => {
this.memberTeamList = res.rows
})
getvertexValue().then((res) => {
this.vertexList = res.data
})
getgradeRanglist().then((res) => {
this.gradeRangList = res.data
})
},
// 导出
handleExport() {
this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then((_) => {
if (this.queryParams.pkMember) {
// 穿透页导出
this.download(
'/report/manager/member-awards/export-analysis-details',
{ ...this.queryParams },
`${'荣誉奖衔分析'}${new Date().getTime()}.xlsx`
)
} else {
this.download(
'/report/manager/member-awards/export-analysis',
{ ...this.queryParams },
`${'荣誉奖衔分析'}${new Date().getTime()}.xlsx`
)
}
})
},
handleSelectionChange(val) {
this.multipleSelection = val
},
reChongzhi() {
this.queryParams = {
pageNum: 1,
pageSize: 50,
thetimes: [],
placeDept: '',
pkMember: ''
}
this.getSearch()
},
getSearch() {
this.loading = true
sta.getUmbrellaAnalysisList(this.queryParams).then((res) => {
this.tableData = res.rows
this.total = res.total
this.loading = false
})
},
getCzNum() {
this.queryParams.pageNum = 1
}
}
}
</script>
<style lang="scss" scoped>
::v-deep .el-image-viewer__close {
right: 500px;
}
::v-deep .dizhi .el-cascader {
width: 100%;
}
::v-deep .el-range-editor.el-input__inner {
width: 100%;
}
::v-deep .el-table thead {
color: #000000;
}
::v-deep .el-table .warning-row {
background: #f9f9f9;
}
.page {
padding: 10px 20px;
background: #f9f9f9;
font-size: 14px;
.thetopbox {
padding: 15px 20px 15px 0;
background: #ffffff;
border-radius: 8px;
.searchbox {
display: flex;
align-items: center;
margin-left: 40px;
}
.searchtitle {
margin-right: 10px;
}
.searchbtn {
background: #08143f;
color: #ffffff;
}
}
.main {
//margin-top: 20px;
background: #f9f9f9;
//border-radius: 8px;
//box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
.maintop {
display: flex;
// padding: 10px 0;
justify-content: space-between;
align-items: center;
.mainbtn {
.thebtn1 {
color: #ffffff;
background: #ffad41;
width: 68px;
height: 32px;
}
.thebtn2 {
color: #ffffff;
background: #009b58;
width: 68px;
height: 32px;
}
.thebtn3 {
color: #ffffff;
background: #c8161d;
width: 68px;
height: 32px;
}
}
}
}
}
</style>

340
src/views/statistics/directStatistics.vue
View File

@ -1,340 +0,0 @@
<template>
<div class="page">
<topBar
v-if="topList.length > 0"
:top-list="topList"
:moren="moren"
/>
<div class="thetopbox">
<el-form label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item :label="'订单业绩'">
<el-input
v-model="select.orderAchieve"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'订单类型'">
<el-select
v-model="select.orderType"
>
<el-option
v-for="item in orderList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'注册日期'">
<el-date-picker
v-model="creationTime"
value-format="yyyy-MM-dd"
type="daterange"
:clearable="false"
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="searchbox">
<el-button
class="my_search"
@click="getSearch"
>
{{ '搜索' }}</el-button>
<el-button
class="my_reset"
@click="reChongzhi"
>
{{ '重置' }}</el-button>
</div>
</el-col>
</el-row>
</el-form>
</div>
<div class="main">
<div class="maintop">
<div class="mainbtn">
<el-button
size="small"
class="thebtn1"
@click="handleExport"
>
{{ '导出' }}</el-button>
</div>
</div>
<div class="maintable">
<el-table
v-loading="loading"
:data="tableData"
height="700px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
@selection-change="handleSelectionChange"
>
<el-table-column
prop="colsele"
type="selection"
width="55"
/>
<el-table-column
align="center"
prop="memberCode"
:label="'会员编号'"
min-width="120px"
/>
<el-table-column
align="center"
prop="memberName"
:label="'会员姓名'"
/>
<el-table-column
align="center"
prop="phone"
:label="'联系方式'"
min-width="120px"
/>
<el-table-column
align="center"
prop="pkRegisterGradeVal"
:label="'注册等级'"
/>
<el-table-column
align="center"
prop="pkAwardsVal"
:label="'荣誉奖衔'"
/>
<el-table-column
align="center"
prop="vertexName"
:label="'隶属体系'"
/>
<el-table-column
align="center"
prop="teamName"
:label="'隶属团队'"
/>
<el-table-column
align="center"
prop="parMemberCode"
min-width="120px"
:label="'推荐编号'"
/>
<el-table-column
align="center"
prop="parMemberName"
:label="'推荐姓名'"
/>
<el-table-column
align="center"
prop="placeMemberCode"
min-width="120px"
:label="'安置编号'"
/>
<el-table-column
align="center"
prop="placeMemberName"
:label="'安置姓名'"
/>
<el-table-column
align="center"
prop="orderAchieve"
min-width="100px"
:label="'订单业绩' + `(PV)`"
/>
<el-table-column
align="center"
prop="orderTypeVal"
:label="'订单类型'"
/>
<el-table-column
min-width="150px"
align="center"
prop="creationTime"
:label="'注册日期'"
/>
</el-table>
</div>
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getSearch"
/>
</div>
</template>
<script>
import topBar from '@/components/topBar'
import * as api from '@/api/statistics'
import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
export default {
name: 'DirectStatistics',
components: {
topBar
},
data() {
return {
moren: 'directStatistics',
topList: [
{
name: '直推统计',
path: 'directStatistics'
}
],
tableData: [],
loading: false,
queryParams: {
pageNum: 1,
pageSize: 50
},
select: {
orderType: 1
},
creationTime: [],
total: 0,
multipleSelection: [],
tableData: [],
orderList: []
}
},
created() {
this.getSearch()
this.getData()
},
methods: {
getData() {
api.orderBusiness().then(res => {
this.orderList = res.data
})
},
isLocalSymbol,
isLocals,
changeTime(val) {
this.select.startDate = val ? val[0] : ''
this.select.endDate = val ? val[1] : ''
},
// 导出
handleExport() {
this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then((_) => {
this.download(
'/report/manager/member-awards/export-directPush',
Object.assign({}, this.queryParams, this.select),
`${'直推统计'}${new Date().getTime()}.xlsx`
)
})
},
handleSelectionChange(val) {
this.multipleSelection = val
},
reChongzhi() {
this.select = {
orderType: 1
}
this.creationTime = []
this.getSearch()
},
getSearch() {
this.loading = true
api
.directPushStatList(Object.assign({}, this.queryParams, this.select))
.then((res) => {
this.tableData = res.rows
this.total = res.total
this.loading = false
})
}
}
}
</script>
<style lang="scss" scoped>
::v-deep .el-image-viewer__close {
right: 500px;
}
::v-deep .dizhi .el-cascader {
width: 100%;
}
::v-deep .el-range-editor.el-input__inner {
width: 100%;
}
::v-deep .el-table thead {
color: #000000;
}
::v-deep .el-table .warning-row {
background: #f9f9f9;
}
.page {
padding: 10px 20px;
background: #f9f9f9;
font-size: 14px;
.thetopbox {
padding: 15px 20px 15px 0;
background: #ffffff;
border-radius: 8px;
.searchbox {
display: flex;
align-items: center;
margin-left: 40px;
}
.searchtitle {
margin-right: 10px;
}
.searchbtn {
background: #08143f;
color: #ffffff;
}
}
.main {
//margin-top: 20px;
background: #f9f9f9;
//border-radius: 8px;
//box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
.maintop {
display: flex;
// padding: 10px 0;
justify-content: space-between;
align-items: center;
.mainbtn {
.thebtn1 {
color: #ffffff;
background: #ffad41;
width: 68px;
height: 32px;
}
.thebtn2 {
color: #ffffff;
background: #009b58;
width: 68px;
height: 32px;
}
.thebtn3 {
color: #ffffff;
background: #c8161d;
width: 68px;
height: 32px;
}
}
}
}
}
</style>