diff --git a/src/router/index.js b/src/router/index.js index 83e4b48..f9cd7fd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2065,17 +2065,23 @@ export const constantRoutes = [ ] }, { - path: 'memberRetailRegion', - name: 'memberRetailRegion', - meta: { title: i18n.t('会员区域配置') }, + path: 'memberRetailRegionConfig', + name: 'memberRetailRegionConfig', + meta: { title: i18n.t('会员区域管理') }, component: ParentView, - redirect: 'memberRetailRegion/index', + redirect: 'memberRetailRegionConfig/memberRetailRegion', children: [ { path: 'memberRetailRegion', name: 'memberRetailRegion', component: () => import('@/views/configManage/memberRetailRegion/index'), - meta: { title: i18n.t('会员区域配置') } + meta: { title: i18n.t('会员区域信息') } + }, + { + path: 'distributionCenter', + name: 'DistributionCenter', + component: () => import('@/views/configManage/memberRetailRegion/DistributionCenter'), + meta: { title: i18n.t('配送中心配置') } } ] diff --git a/src/views/configManage/memberRetailRegion/DistributionCenter.vue b/src/views/configManage/memberRetailRegion/DistributionCenter.vue new file mode 100644 index 0000000..ee95e63 --- /dev/null +++ b/src/views/configManage/memberRetailRegion/DistributionCenter.vue @@ -0,0 +1,761 @@ + + + + diff --git a/src/views/configManage/memberRetailRegion/index.vue b/src/views/configManage/memberRetailRegion/index.vue index e4a465b..5ec1ca8 100644 --- a/src/views/configManage/memberRetailRegion/index.vue +++ b/src/views/configManage/memberRetailRegion/index.vue @@ -108,13 +108,6 @@
- {{ '添加' }} @@ -189,98 +181,9 @@ :label="$t('修改时间')" width="160" /> - - - -
- - - - - - - - - -
- - {{ '取消' }} - - {{ '确认' }} - -
- - import topBar from '@/components/topBar' -import { getbdmenuList, getPubenumsList } from '@/api/system' -import { getgradeRanglist, getAwardsListChiose } from '@/api/level' import * as con from '@/api/configManage.js' import * as api from '@/api/manage.js' -import { Message } from 'element-ui' -import { deleteAgreement } from '@/api/configManage' -import ImageUpload from '@/components/ImageUpload' import { areaList } from '@/api/site' export default { - name: 'Qxpz', + name: 'MemberRetailRegion', components: { - topBar, - ImageUpload + topBar }, data() { return { @@ -343,7 +240,7 @@ export default { moren: 'memberRetailRegion', topList: [ { - name: this.$t('收益区域配置'), + name: '会员区域信息', path: 'memberRetailRegion' } ], @@ -387,28 +284,25 @@ export default { if (!this.memberInfo || Object.keys(this.memberInfo).length === 0 || ![60, 70, 80].includes(this.memberInfo.pkSettleGradeValue)) { return [] } - console.log(this.memberInfo.pkSettleGradeValue, 'memberInfo') - if ([60, 70].includes(this.memberInfo.pkSettleGradeValue)) { - return this.areaData - } + return this.areaData - const list = this.areaData.map(item => { - const province = item - let city = null - if (province.children && province.children.length > 0) { - city = province.children.map(child => { - return { - ...child, - children: null - } - }) - } - return { - ...province, - children: city - } - }) - return list + // const list = this.areaData.map(item => { + // const province = item + // let city = null + // if (province.children && province.children.length > 0) { + // city = province.children.map(child => { + // return { + // ...child, + // children: null + // } + // }) + // } + // return { + // ...province, + // children: city + // } + // }) + // return list } }, created() { @@ -425,8 +319,8 @@ export default { }).then((_) => { this.download( '/member/manage/cu-member-retail-region/export', - { ...this.queryParams }, - `${this.$t('会员收益区域配置')}}${new Date().getTime()}.xlsx` + { ...this.queryParams, businessType: 1 }, + `${this.$t('会员区域信息')}${new Date().getTime()}.xlsx` ) }) }, @@ -454,136 +348,13 @@ export default { this.queryParams.city = value[1] this.queryParams.county = value[2] }, - flChange1(value) { - this.table.county = '' - this.table.province = '' - this.table.city = '' - this.table.province = value[0] - this.table.city = value[1] - this.table.county = value[2] - }, + getsignSource() { api.noticeWebsiteType().then((res) => { this.sourceList = res.data }) }, - addRules() { - this.types = 1 - this.ruleShow = true - this.title = '添加' - }, - submitBtn() { - // 添加角色 - this.ruleSubmit() - }, - updateShow(item) { - this.getmemberinfo(item.memberCode) - this.types = 2 - this.title = '修改' - this.table = item - let arr = [item.province + '', item.city + ''] - if (item.county && item.county !== -1) { - arr.push(item.county + '') - } - arr = arr.filter((item) => item != '') - this.$set(this.table, 'addressd', arr) - this.$forceUpdate() - console.log(this.table.addressd, 'table') - this.pkIds = item.pkId - this.ruleShow = true - }, - delRole(item) { - this.$confirm(this.$t('确认要删除该配置吗?'), '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - con.delRetailRegion(item.pkId).then((res) => { - if (res.code === 200) { - Message({ - message: res.msg, - type: 'success' - }) - this.research() - } else { - Message({ - message: res.msg, - type: 'error' - }) - } - }) - }) - }, - ruleSubmit() { - const datas = {} - const that = this - this.$refs['forms'].validate((valid) => { - if (!valid) { - return false - } else { - if (this.types === 1) { - datas.pkMember = this.table.pkMember - datas.province = this.table.addressd[0] - datas.city = this.table.addressd[1] - datas.county = this.table.addressd[2] - datas.effectiveEndDate = this.table.effectiveEndDate - con.retailRegionAdd(datas).then((res) => { - if (res.code === 200) { - Message({ - message: res.msg, - type: 'success' - }) - that.ruleShow = false - that.table = { - pkMember: '', - addressd: ['', '', ''] - } - that.research() - } - }) - } - if (this.types === 2) { - datas.pkMember = this.table.pkMember - datas.pkId = this.pkIds - datas.province = this.table.addressd[0] - datas.city = this.table.addressd[1] - datas.county = this.table.addressd[2] - datas.effectiveEndDate = this.table.effectiveEndDate - con.retailRegionUpdate(datas).then((res) => { - if (res.code === 200) { - Message({ - message: res.msg, - type: 'success' - }) - that.ruleShow = false - that.table = { - pkMember: '', - addressd: ['', '', ''] - } - that.research() - } - }) - } - } - }) - }, - statusChange(value) { - if (this.table.status.length > 1) { - this.table.status.splice(0, 1) - } - }, - handleClose() { - this.ruleShow = false - this.table = { - pkMember: '', - addressd: ['', '', ''] - } - }, - changeBox(row) { - console.error(row) - }, - addFrom() {}, - addRule() {}, + changeTime(value) { this.queryParams.startDate = value[0] ? value[0] : '' this.queryParams.endDate = value[1] ? value[1] : '' @@ -596,51 +367,13 @@ export default { this.queryParams.effectiveStaDateStr = value[0] ? value[0] : '' this.queryParams.effectiveEndDateStr = value[1] ? value[1] : '' }, - changeTime3(value) { - this.table.effectiveEndDate = value - }, - disabledDates(time) { - const now = new Date() // 当前时间 - const currentDateTime = new Date( - now.getFullYear(), - now.getMonth(), - now.getDate(), - now.getHours(), - now.getMinutes(), - now.getSeconds() - ) - return time.getTime() < currentDateTime.getTime() // 禁止当前时间之前的日期和时间 - }, - handleChangeMunu(value) { - console.log('🌈', value[value.length - 1]) - this.queryParams.menuId = value[value.length - 1] - }, - // 菜单下拉选 - getPubenumsList() { - getPubenumsList().then((res) => { - this.menuOptions = res.data - }) - }, - // 等级范围选择 - getgradeRanglist() { - getgradeRanglist().then((res) => { - this.gradeRangList = res.data - }) - }, - // 奖衔下拉列表 - getAwardsListChiose() { - getAwardsListChiose().then((res) => { - this.awardsList = res.rows - }) - }, + research() { - // // 日期传入改为起止两个字段 - // if ("" != this.queryParams.creationTime) { - // this.queryParams.creationTimeStart = this.queryParams.creationTime[0]; - // this.queryParams.creationTimeEnd = this.queryParams.creationTime[1]; - // } this.loading = true - con.getRetailRegionList(this.queryParams).then((res) => { + con.getRetailRegionList({ + ...this.queryParams, + businessType: 1 // 写死 1 会员区域管理 2配送中心 + }).then((res) => { this.tableData = res.rows this.total = res.total this.loading = false @@ -661,21 +394,6 @@ export default { handleSelectionChange(val) { this.multipleSelection = val }, - objectSpanMethod({ row, column, rowIndex, columnIndex }) { - // if (columnIndex === 0) { - // if (rowIndex % 2 === 0) { - // return { - // rowspan: 2, - // colspan: 1, - // }; - // } else { - // return { - // rowspan: 0, - // colspan: 0, - // }; - // } - // } - }, tableRowClassName({ row, rowIndex }) { if (rowIndex % 2 == 1) { return 'warning-row'