diff --git a/src/api/assessment-records.js b/src/api/assessment-records.js new file mode 100644 index 0000000..dddd38d --- /dev/null +++ b/src/api/assessment-records.js @@ -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' + }) +} + diff --git a/src/router/index.js b/src/router/index.js index 12a1185..87f0f97 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -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', diff --git a/src/views/configManage/advertisementBanner/index.vue b/src/views/configManage/advertisementBanner/index.vue index 003383c..01a153e 100644 --- a/src/views/configManage/advertisementBanner/index.vue +++ b/src/views/configManage/advertisementBanner/index.vue @@ -9,7 +9,7 @@
- + + + + + + + - + @@ -59,13 +74,13 @@
- {{'添加'}} + {{ '添加' }}
- + - + + @@ -145,7 +161,7 @@ :before-close="handleClose" > - + + + + + + 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) diff --git a/src/views/configManage/level/index.vue b/src/views/configManage/level/index.vue index d0b83eb..1b68178 100644 --- a/src/views/configManage/level/index.vue +++ b/src/views/configManage/level/index.vue @@ -9,7 +9,6 @@
{{ '添加' }} - {{ '导出' }}
@@ -32,14 +31,6 @@ > - - - + + + - +