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-31 09:00:58 +08:00
parent 1baf6cf2e6 dcd0bd7356
commit 75578ba172
6 changed files with 576 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/api/assessment-records.js Normal file
View File

@ -0,0 +1,25 @@
import request from '@/utils/request'
export function getAssessmentRecorsList(params) {
return request({
url: '/member/manager/member-assess/assess-list',
method: 'get',
params
})
}
export function getAssessmentTypeEnum() {
return request({
url: '/system/pub/enums/assessmentType',
method: 'get'
})
}
export function getAssessmentStatusEnum() {
return request({
url: '/system/pub/enums/assess-status',
method: 'get'
})
}

6
src/router/index.js
View File

@ -2233,6 +2233,12 @@ export const constantRoutes = [
component: () => import('@/views/statistics/level-up-records/index'),
meta: { title: '会员升级记录' }
},
{
path: 'memberAssessmentRecords',
name: 'MemberAssessmentRecords',
component: () => import('@/views/statistics/member-assessment-records/index'),
meta: { title: '会员考核记录' }
},
{
path: 'placementCheck',
name: 'PlacementCheck',

109
src/views/configManage/advertisementBanner/index.vue
View File

@ -9,7 +9,7 @@
<div class="thetopbox">
<el-form ref="form" :model="queryParams" label-width="100px">
<el-row>
<el-col :span="4" style="margin-left: -30px">
<!-- <el-col :span="4" style="margin-left: -30px">
<el-form-item :label="'位置'" prop="status">
<el-select v-model="queryParams.sendType" clearable placeholder="">
<el-option
@ -20,9 +20,24 @@
/>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="4" style="margin-left: -30px">
<el-form-item
label="隶属体系"
prop="status"
>
<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="8">
<el-form-item :label="'发送时间'" prop="creationTime">
<el-form-item label="创建时间" prop="creationTime">
<el-date-picker
v-model="modifiedTime"
value-format="yyyy-MM-dd"
@ -49,7 +64,7 @@
</el-col>
<el-col :span="4">
<div class="searchbox">
<el-button class="my_search" @click="research()" style="margin-left: 40px"> {{ '搜索' }}</el-button>
<el-button class="my_search" style="margin-left: 40px" @click="research()"> {{ '搜索' }}</el-button>
<el-button class="my_reset" @click="reChongzhi"> {{ '重置' }}</el-button>
</div>
</el-col>
@ -59,13 +74,13 @@
<div class="main">
<div class="maintop">
<div class="mainbtn">
<el-button size="small" style="background-color: #48B2FD" class="thebtn1" @click="addRules">{{'添加'}}</el-button>
<el-button size="small" style="background-color: #48B2FD" class="thebtn1" @click="addRules">{{ '添加' }}</el-button>
</div>
</div>
<div class="maintable">
<el-table
:data="tableData"
v-loading="loading"
:data="tableData"
height="730px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
@ -75,25 +90,26 @@
>
<el-table-column type="selection" width="55" />
<el-table-column align="center" prop="sort" :label="'排序'" />
<el-table-column align="center" prop="phone" :label="'图片'" >
<el-table-column align="center" prop="phone" :label="'图片'">
<template slot-scope="scope">
<img :src="scope.row.picture" style="width: 44px;height: 44px;border-radius: 8px" />
<img :src="scope.row.picture" style="width: 44px;height: 44px;border-radius: 8px">
</template>
</el-table-column>
<el-table-column align="center" prop="positionVal" :label="'位置'" />
<el-table-column align="center" prop="vertexName" label="隶属体系" />
<!-- <el-table-column align="center" prop="positionVal" :label="'位置'" /> -->
<el-table-column align="center" prop="link" :label="'链接'" />
<el-table-column align="center" prop="creationTime" :label="'创建日期'" />
<el-table-column align="center" prop="effectiveDate" :label="'生效日期'" />
<el-table-column align="center" :label="'操作'" width="150">
<template slot-scope="scope">
<el-button
<!-- <el-button
class="colors"
type="text"
style="color: #108EE9"
size="small"
@click.native.prevent="moveUp(scope.row)"
>
{{'上移'}}
{{ '上移' }}
</el-button>
<el-button
class="colors"
@ -102,7 +118,7 @@
style="color: #108EE9"
@click.native.prevent="moveDown(scope.row)"
>
{{'下移'}}
{{ '下移' }}
</el-button>
<el-button
class="colors"
@ -111,8 +127,8 @@
style="color: #009B58"
@click.native.prevent="updateTop(scope.row)"
>
{{'置顶'}}
</el-button>
{{ '置顶' }}
</el-button> -->
<el-button
class="colors"
type="text"
@ -120,7 +136,7 @@
style="color: #FFAD41"
@click.native.prevent="updateShow(scope.row)"
>
{{ '查看' }}
编辑
</el-button>
<el-button
class="colors"
@ -129,7 +145,7 @@
style="color: #C73030"
@click.native.prevent="delRole(scope.row)"
>
{{ '删除' }}
删除
</el-button>
</template>
</el-table-column>
@ -145,7 +161,7 @@
:before-close="handleClose"
>
<el-form ref="forms" :rules="rules" :model="table" label-width="80px">
<el-form-item :label="'发布位置'" class="input-s" prop="position">
<!-- <el-form-item :label="'发布位置'" class="input-s" prop="position">
<el-select v-model="table.position" clearable placeholder="">
<el-option
v-for="item,index in getPostionList"
@ -154,7 +170,7 @@
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item :label="'排序'" prop="sort">
<el-input
v-model="table.sort"
@ -170,6 +186,16 @@
:placeholder="'请输入'"
/>
</el-form-item>
<el-form-item label="隶属体系" prop="pkVertex">
<el-select v-model="table.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-form-item :label="'生效日期'" prop="effectiveDate">
<el-date-picker
v-model="table.effectiveDate"
@ -201,22 +227,30 @@
<script>
import topBar from '@/components/topBar'
import { getbdmenuList, getPubenumsList } from '@/api/system'
import { getPubenumsList } from '@/api/system'
import { getgradeRanglist, getAwardsListChiose } from '@/api/level'
import * as api from '@/api/sms.js'
import { Message } from 'element-ui'
import { deleteAgreement } from '@/api/configManage'
import ImageUpload from '@/components/ImageUpload'
import { getvertexValue } from '@/api/member'
const initForm = {
position: 1,
picture: '',
sort: '',
effectiveDate: '',
link: '',
pkVertex: ''
}
export default {
name: 'Qxpz',
name: 'BannerConfig',
components: {
topBar,
ImageUpload
},
data() {
return {
modifiedTime:[],
modifiedTime1:[],
modifiedTime: [],
modifiedTime1: [],
title: '添加',
forms: '',
rules: {
@ -236,7 +270,9 @@ export default {
{ required: true, message: '请输入链接', trigger: 'blur' }
]
},
table: { position: '', picture: '', sort: '', effectiveDate: '', link: '' },
table: {
...initForm
},
ruleShow: false,
moren: 'advertisementBanner',
topList: [
@ -253,27 +289,35 @@ export default {
multipleSelection: [],
queryParams: {
pageNum: 1,
pageSize: 50
pageSize: 50,
pkVertex: ''
},
gradeRangList: [],
awardsList: [],
statusList: [{ 'name': '立即发送', 'id': '1' }, { 'name': '定时发送', 'id': '2' }],
statusList1: [{ 'name': '未发送', 'id': '0' }, { 'name': '已发送', 'id': '1' }],
menuOptions: [],
loading:false,
loading: false,
tableData: [],
total: 0,
types: '',
formId: '',
getPostionList: []
getPostionList: [],
vertexList: [] // 隶属体系
}
},
created() {
this.research()
this.getPostion()
this.getvertexValue()
},
methods: {
// 置顶
getvertexValue() {
getvertexValue().then((res) => {
this.vertexList = res.data
})
},
updateTop(item) {
api.getPostion({ 'pkId': item.pkId }).then((res) => {
if (res.code == '200') {
@ -332,8 +376,7 @@ export default {
api.getBannerDetails(item.pkId).then((res) => {
if (res.code === 200) {
this.ruleShow = true
this.table = { position: res.data.position, picture: res.data.picture,
sort: res.data.sort, effectiveDate: res.data.effectiveDate, link: res.data.link }
this.table = res.data
} else {
Message({
message: res.msg,
@ -381,7 +424,7 @@ export default {
type: 'success'
})
that.ruleShow = false
that.table = { position: '', picture: '', sort: '', effectiveDate: '', link: '' }
that.table = { ...initForm }
that.research()
} else {
Message({
@ -400,7 +443,7 @@ export default {
type: 'success'
})
that.ruleShow = false
that.table = { position: '', picture: '', sort: '', effectiveDate: '', link: '' }
that.table = { ...initForm }
that.research()
} else {
Message({
@ -420,7 +463,9 @@ export default {
},
handleClose() {
this.ruleShow = false
this.table = { position: '', picture: '', sort: '', effectiveDate: '', link: '' }
this.table = {
...initForm
}
},
changeBox(row) {
console.error(row)

53
src/views/configManage/level/index.vue
View File

@ -9,7 +9,6 @@
<div class="maintop">
<div class="mainbtn">
<el-button class="thebtn1" @click="adddate()">{{ '添加' }}</el-button>
<el-button class="thebtn2"> {{ '导出' }}</el-button>
</div>
</div>
<div class="maintable">
@ -32,14 +31,6 @@
>
</template>
</el-table-column>
<el-table-column align="center" prop="jxmc" :label="'国家'" width="180">
<template slot-scope="scope">
<div class="tem">
<img :src="scope.row.nationalFlag2" alt="">
<div>{{ scope.row.pkCountryName }}</div>
</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="gradeName"
@ -57,13 +48,29 @@
prop="registerAuthorityVal"
:label="'注册权限'"
/>
<el-table-column
align="center"
prop="registerAuthorityVal"
:label="'注册权限'"
/>
<el-table-column
align="center"
prop="algebra"
label="见点代数"
/>
<el-table-column
align="center"
prop="boxNumber"
label="加购数量"
/>
<el-table-column align="center" prop="pkAwardsVal" :label="'真实奖衔'" />
<el-table-column align="center" prop="anames" :label="'直推范围'" />
<el-table-column align="center" prop="anames" :label="'直推范围'" width="260" />
<el-table-column
align="center"
prop="time"
:label="'操作'"
fixed="right"
width="100"
>
<template slot-scope="scope">
<el-button
@ -113,7 +120,7 @@
style="padding-bottom: 40px"
>
<el-row style="display: flex; justify-content: space-between">
<el-col :span="10" style="margin-left: -50px">
<el-col :span="12">
<el-form-item :label="'注册等级'" prop="gradeName">
<el-input
v-model="form.gradeName"
@ -122,7 +129,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item :label="'统计类型'" prop="censusValue">
<el-select v-model="form.censusValue" clearable placeholder="">
<el-option
@ -136,7 +143,7 @@
</el-col>
</el-row>
<el-row style="display: flex; justify-content: space-between">
<el-col :span="10" style="margin-left: -50px">
<el-col :span="12">
<el-form-item :label="'统计数值'" prop="startValue">
<el-input
v-model="form.startValue"
@ -145,7 +152,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item :label="'真实奖衔'" prop="pkAwards">
<el-select v-model="form.pkAwards" clearable placeholder="">
<el-option
@ -158,8 +165,8 @@
</el-form-item>
</el-col>
</el-row>
<el-row style="display: flex; justify-content: space-between">
<el-col :span="10" style="margin-left: -50px">
<el-row>
<el-col :span="12">
<el-form-item :label="'注册权限'" prop="registerAuthority">
<el-select
v-model="form.registerAuthority"
@ -175,7 +182,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item required label="等级属性" prop="gradeValue">
<el-select
v-model="form.gradeValue"
@ -191,6 +198,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item required label="见点代数" prop="algebra">
<el-input v-model="form.algebra" clearable placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item required label="加购数量" prop="boxNumber">
<el-input v-model="form.boxNumber" clearable placeholder="" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
@ -204,7 +221,7 @@
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item :label="'上传图片'" prop="image">
<imageUpload v-model="form.image" />
</el-form-item>

19
src/views/statistics/level-up-records/index.vue
View File

@ -1,5 +1,10 @@
<template>
<div class="page">
<topBar
v-if="topList.length > 0"
:top-list="topList"
:moren="moren"
/>
<div class="main">
<el-form
ref="select"
@ -135,10 +140,22 @@
import { getLevelUpRecordList } from '@/api/statistics.js'
import { mapGetters } from 'vuex'
import { LEVEL_UP_RECORD_TYPE } from './constant'
import topBar from '@/components/topBar'
export default {
name: 'BonusExpansionDelay',
name: 'LevelUpRecords',
components: {
topBar
},
data() {
return {
moren: 'levelUpRecords',
topList: [
{
name: '会员升级记录',
path: 'levelUpRecords'
}
],
queryParams: {
pageNum: 1,
pageSize: 50

415
src/views/statistics/member-assessment-records/index.vue Normal file
View File

@ -0,0 +1,415 @@
<template>
<div class="page">
<topBar
v-if="topList.length > 0"
:top-list="topList"
:moren="moren"
/>
<div class="main">
<el-form
ref="select"
style="padding:0 10px 0 10px;background: #fff"
label-width="auto"
>
<el-row :gutter="20">
<!-- 一层 -->
<el-col :span="4">
<el-form-item label="会员编号">
<el-input
v-model="form.memberCode"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="考核类型">
<el-select
v-model="form.assessTypeList"
clearable
collapse-tags
multiple
>
<el-option
v-for="item in assessmentEnum"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="考核状态">
<el-select
v-model="form.assessStatus"
clearable
>
<el-option
v-for="item in assessmentStatusEnum"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="考核日期">
<el-date-picker
v-model="form.dateStr"
style="width: 100%"
type="month"
value-format="yyyyMM"
/>
</el-form-item>
</el-col>
<el-col
:span="4"
>
<el-button
type="primary"
size="small"
class="my_search"
@click="getDataList"
> 搜索</el-button>
<el-button
class="my_reset"
@click="reset"
> 重置</el-button>
</el-col>
</el-row>
</el-form>
<div class="mainTable">
<div class="itemTrading">
<el-table
ref="mainTable"
v-loading="loading"
:data="tableData"
height="730px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
>
<!-- <el-table-column
type="selection"
width="55"
/> -->
<el-table-column
align="center"
prop="memberCode"
width="150"
label="会员编号"
/>
<el-table-column
align="center"
prop="memberName"
width="120"
label="会员姓名"
/>
<el-table-column
align="center"
prop="vertexName"
label="隶属体系"
width="120"
/>
<el-table-column
align="center"
prop="awardsName"
width="120"
label="奖衔"
/>
<el-table-column
align="center"
prop="assessTypeVal"
width="120"
label="考核类型"
/>
<el-table-column
align="center"
prop="assessStatusVal"
width="120"
label="考核状态"
/>
<el-table-column
align="center"
prop="assessAwardsName"
width="120"
label="考核奖衔"
/>
<el-table-column
align="center"
prop="assessTarget"
label="考核目标"
/>
<el-table-column
align="center"
prop="monthAdd"
label="新增业绩"
/>
<el-table-column
align="center"
prop="startDate"
label="通过时间"
>
<template #default="{ row }">
{{ row.startDate ? row.startDate : '-' }}
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getDataList"
/>
</div>
</template>
<script>
import { getAssessmentRecorsList, getAssessmentTypeEnum, getAssessmentStatusEnum } from '@/api/assessment-records'
import { mapGetters } from 'vuex'
import topBar from '@/components/topBar'
const initForm = {
memberCode: '',
dateStr: '',
assessTypeList: [],
assessStatus: ''
}
export default {
name: 'MemberAssessmentRecords',
components: {
topBar
},
data() {
return {
moren: 'memberAssessmentRecords',
topList: [
{
name: '会员考核记录',
path: 'memberAssessmentRecords'
}
],
queryParams: {
pageNum: 1,
pageSize: 50
},
assessmentEnum: [],
assessmentStatusEnum: [],
total: 0,
tableData: [],
loading: false,
form: {
...initForm
}
}
},
computed: {
...mapGetters(['getUser'])
},
created() {
// dateStr默认当月
this.form.dateStr = new Date().getFullYear() + (new Date().getMonth() + 1).toString().padStart(2, '0')
console.log(this.form.dateStr)
},
mounted() {
this.getDataList()
this.getAssessmentTypeEnum()
this.getAssessmentStatusEnum()
},
methods: {
getAssessmentStatusEnum() {
getAssessmentStatusEnum()
.then((res) => {
if (res.code === 200) {
this.assessmentStatusEnum = res.data || []
}
})
},
assessTypeFormat(val) {
return this.assessmentEnum.find(item => item.value === val)?.label || '-'
},
reset() {
this.form = {
...initForm
}
this.queryParams.pageNum = 1
this.queryParams.pageSize = 50
this.getDataList()
},
getAssessmentTypeEnum() {
getAssessmentTypeEnum()
.then((res) => {
if (res.code === 200) {
this.assessmentEnum = res.data || []
}
})
},
getDataList() {
this.loading = true
console.log(this.form.dateStr)
const params = Object.assign({}, this.queryParams, this.form, {
assessTypeList: this.form.assessTypeList.join(',')
})
getAssessmentRecorsList(params)
.then((res) => {
this.tableData = res.rows
this.total = res.total
}).finally(() => {
this.loading = false
})
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 === 1) {
return 'warning-row'
} else if (rowIndex % 2 === 0) {
return 'success-row'
}
return ''
}
}
}
</script>
<style scoped lang="scss">
::v-deep .el-range-editor.el-input__inner {
width: 100%;
}
::v-deep .el-button {
//height: 32px;
//line-height: 32px;
padding: 8px 20px;
}
::v-deep .el-date-editor .el-range__close-icon {
margin-top: -10px;
}
::v-deep .el-date-editor .el-range-separator {
margin-top: -10px;
}
::v-deep .el-date-editor .el-range__icon {
margin-top: -10px;
}
::v-deep .el-cascader input {
height: 32px !important;;
//line-height: 28px;
}
::v-deep .el-form-item {
margin-bottom: 0;
}
::v-deep .el-form-item__label {
color: #333;
font-weight: inherit;
}
::v-deep .el-table .warning-row {
background: #f9f9f9;
}
::v-deep .el-table .success-row {
background: #ffffff;
}
::v-deep .el-table thead {
color: #000000;
}
::v-deep .el-select {
width: 100%;
}
.uploadIcon ::v-deep .el-upload--picture-card {
display: none !important; /* 上传按钮隐藏 */
}
.page {
padding: 20px;
background: #f9f9f9;
font-size: 14px;
.main {
background: #f9f9f9;
//border-radius: 8px;
//box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
overflow: hidden;
display: flex;
flex-direction: column;
.maintop {
display: flex;
//padding: 10px 20px;
//padding: 10px 0;
justify-content: space-between;
align-items: center;
.mainbtn {
.thebtn1 {
background: #3181e5;
color: #ffffff;
}
.thebtn2 {
background: #ffad41;
color: #ffffff;
}
}
.maintitle {
font-size: 10px;
font-family: MicrosoftYaHei;
color: #999999;
}
}
.mainTable{
flex: 1;
overflow-y: auto;
}
}
.tem {
display: flex;
align-items: center;
justify-content: center;
img {
width: 28px;
height: 20px;
margin-right: 3px;
}
}
.isRed {
color: #ed1d25;
}
.isGreen {
color: #1ab62b;
}
.bgImg {
width: 48px;
height: 48px;
}
}
.openClose {
text-align: right;
margin-right: 10px;
color: #3181e5;
}
.kuang {
padding: 5px 20px;
background: rgba(255, 255, 255, 0);
border-radius: 4px;
border: 1px solid #cccccc;
}
.heji {
margin-top: 10px;
.dis {
display: flex;
justify-content: right;
padding: 5px 10px;
font-size: 14px;
color: #333333;
:nth-child(1) {
font-size: 14px;
font-weight: bold;
color: #333333;
margin-right: 20px;
}
}
}
</style>