diff --git a/src/api/blackCus.js b/src/api/blackCus.js index 178bad1..e3d1fae 100644 --- a/src/api/blackCus.js +++ b/src/api/blackCus.js @@ -2,6 +2,7 @@ * 黑名单管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询黑名单 export function getBlackList(params) { @@ -21,11 +22,16 @@ } // 移除黑名单 -export function delBlack(params) { +export function delBlack(ids) { return request({ url: '/black/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/api/blackCus.js b/src/api/blackCus.js index 178bad1..e3d1fae 100644 --- a/src/api/blackCus.js +++ b/src/api/blackCus.js @@ -2,6 +2,7 @@ * 黑名单管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询黑名单 export function getBlackList(params) { @@ -21,11 +22,16 @@ } // 移除黑名单 -export function delBlack(params) { +export function delBlack(ids) { return request({ url: '/black/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/api/customer.js b/src/api/customer.js index 2519dc4..5f60616 100644 --- a/src/api/customer.js +++ b/src/api/customer.js @@ -2,6 +2,7 @@ * 客户管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询客户 export function getCustomerList(params) { @@ -20,7 +21,7 @@ }) } // 编辑客户 -export function editCustomer(params) { +export function updateCustomer(params) { return request({ url: '/customer/update', method: 'post', @@ -29,11 +30,16 @@ } // 删除客户 -export function delCustomer(params) { +export function delCustomer(ids) { return request({ url: '/customer/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/api/blackCus.js b/src/api/blackCus.js index 178bad1..e3d1fae 100644 --- a/src/api/blackCus.js +++ b/src/api/blackCus.js @@ -2,6 +2,7 @@ * 黑名单管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询黑名单 export function getBlackList(params) { @@ -21,11 +22,16 @@ } // 移除黑名单 -export function delBlack(params) { +export function delBlack(ids) { return request({ url: '/black/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/api/customer.js b/src/api/customer.js index 2519dc4..5f60616 100644 --- a/src/api/customer.js +++ b/src/api/customer.js @@ -2,6 +2,7 @@ * 客户管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询客户 export function getCustomerList(params) { @@ -20,7 +21,7 @@ }) } // 编辑客户 -export function editCustomer(params) { +export function updateCustomer(params) { return request({ url: '/customer/update', method: 'post', @@ -29,11 +30,16 @@ } // 删除客户 -export function delCustomer(params) { +export function delCustomer(ids) { return request({ url: '/customer/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/router/index.js b/src/router/index.js index e50c4de..7b20a84 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,7 @@ import { caseRouters } from './modules/case' import { knowledgeRouters } from './modules/knowledge' import { customerRouters } from './modules/customer' +import { monitorRouters } from './modules/statistic' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -76,5 +77,6 @@ ...knowledgeRouters, ...customerRouters, ...systemRouters, + ...monitorRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/api/blackCus.js b/src/api/blackCus.js index 178bad1..e3d1fae 100644 --- a/src/api/blackCus.js +++ b/src/api/blackCus.js @@ -2,6 +2,7 @@ * 黑名单管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询黑名单 export function getBlackList(params) { @@ -21,11 +22,16 @@ } // 移除黑名单 -export function delBlack(params) { +export function delBlack(ids) { return request({ url: '/black/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/api/customer.js b/src/api/customer.js index 2519dc4..5f60616 100644 --- a/src/api/customer.js +++ b/src/api/customer.js @@ -2,6 +2,7 @@ * 客户管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询客户 export function getCustomerList(params) { @@ -20,7 +21,7 @@ }) } // 编辑客户 -export function editCustomer(params) { +export function updateCustomer(params) { return request({ url: '/customer/update', method: 'post', @@ -29,11 +30,16 @@ } // 删除客户 -export function delCustomer(params) { +export function delCustomer(ids) { return request({ url: '/customer/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/router/index.js b/src/router/index.js index e50c4de..7b20a84 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,7 @@ import { caseRouters } from './modules/case' import { knowledgeRouters } from './modules/knowledge' import { customerRouters } from './modules/customer' +import { monitorRouters } from './modules/statistic' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -76,5 +77,6 @@ ...knowledgeRouters, ...customerRouters, ...systemRouters, + ...monitorRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js index faf2eec..92aa574 100644 --- a/src/router/modules/customer.js +++ b/src/router/modules/customer.js @@ -21,7 +21,7 @@ { path: '/blacklist', name: 'BlackList', - component: () => import('@/views/customerManage/customerList'), + component: () => import('@/views/blackList/blackList'), meta: { title: '黑名单', icon: '', permission: '/customer/blacklist' } } ] diff --git a/src/api/blackCus.js b/src/api/blackCus.js index 178bad1..e3d1fae 100644 --- a/src/api/blackCus.js +++ b/src/api/blackCus.js @@ -2,6 +2,7 @@ * 黑名单管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询黑名单 export function getBlackList(params) { @@ -21,11 +22,16 @@ } // 移除黑名单 -export function delBlack(params) { +export function delBlack(ids) { return request({ url: '/black/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/api/customer.js b/src/api/customer.js index 2519dc4..5f60616 100644 --- a/src/api/customer.js +++ b/src/api/customer.js @@ -2,6 +2,7 @@ * 客户管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询客户 export function getCustomerList(params) { @@ -20,7 +21,7 @@ }) } // 编辑客户 -export function editCustomer(params) { +export function updateCustomer(params) { return request({ url: '/customer/update', method: 'post', @@ -29,11 +30,16 @@ } // 删除客户 -export function delCustomer(params) { +export function delCustomer(ids) { return request({ url: '/customer/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/router/index.js b/src/router/index.js index e50c4de..7b20a84 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,7 @@ import { caseRouters } from './modules/case' import { knowledgeRouters } from './modules/knowledge' import { customerRouters } from './modules/customer' +import { monitorRouters } from './modules/statistic' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -76,5 +77,6 @@ ...knowledgeRouters, ...customerRouters, ...systemRouters, + ...monitorRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js index faf2eec..92aa574 100644 --- a/src/router/modules/customer.js +++ b/src/router/modules/customer.js @@ -21,7 +21,7 @@ { path: '/blacklist', name: 'BlackList', - component: () => import('@/views/customerManage/customerList'), + component: () => import('@/views/blackList/blackList'), meta: { title: '黑名单', icon: '', permission: '/customer/blacklist' } } ] diff --git a/src/views/blackList/blackList.vue b/src/views/blackList/blackList.vue index 0d74a44..61a94e6 100644 --- a/src/views/blackList/blackList.vue +++ b/src/views/blackList/blackList.vue @@ -7,7 +7,7 @@ 新增 - 移除 + 移除 - + @@ -31,12 +31,12 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CaseListTable from '@/views/caseManage/caseCommon/caseListTable' import NormalTable from '@/components/NomalTable' -import { getCustomerList, delCustomer } from '@/api/customer' -import EditCustomer from './editBlack' +import { getBlackList, delBlack } from '@/api/blackCus' +import EditBlack from './editBlack' export default { name: 'CustomerList', - components: { EditCustomer, AppContainer, SearchArea, SearchItem, CaseListTable, NormalTable }, + components: { EditBlack, AppContainer, SearchArea, SearchItem, CaseListTable, NormalTable }, data() { return { list: [], @@ -62,6 +62,16 @@ text: '备注', value: 'name', align: 'center' + }, + { + text: '操作人', + value: 'operatorName', + align: 'center' + }, + { + text: '操作时间', + value: 'ts', + align: 'center' } ], // 显示列 checkStateList: [], // 审核状态 @@ -99,20 +109,8 @@ this.listQuery.offset = 1 } this.listLoading = true - getCustomerList(this.listQuery).then(response => { + getBlackList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'name': '李四', - 'typeName': '', - 'tel1': '1310000000', - 'tel2': '1562323221', - 'cardNo': '110123199601019281', - 'address': '北京海淀', - 'remarks': '' - } - ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -143,9 +141,10 @@ } ).then(() => { const list = this.multipleSelection.map(item => item.id) - delCustomer(list).then(response => { + delBlack(list).then(response => { if (response.code === 200) { - this.$message.success('删除成功') + this.$message.success('移除成功') + this.fetchData() } }) }) @@ -177,6 +176,10 @@ } else { return true } + }, + watchChild() { + console.log('watchChild') + this.fetchData() } } } diff --git a/src/api/blackCus.js b/src/api/blackCus.js index 178bad1..e3d1fae 100644 --- a/src/api/blackCus.js +++ b/src/api/blackCus.js @@ -2,6 +2,7 @@ * 黑名单管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询黑名单 export function getBlackList(params) { @@ -21,11 +22,16 @@ } // 移除黑名单 -export function delBlack(params) { +export function delBlack(ids) { return request({ url: '/black/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/api/customer.js b/src/api/customer.js index 2519dc4..5f60616 100644 --- a/src/api/customer.js +++ b/src/api/customer.js @@ -2,6 +2,7 @@ * 客户管理接口 */ import request from '@/utils/request' +import qs from 'qs' // 查询客户 export function getCustomerList(params) { @@ -20,7 +21,7 @@ }) } // 编辑客户 -export function editCustomer(params) { +export function updateCustomer(params) { return request({ url: '/customer/update', method: 'post', @@ -29,11 +30,16 @@ } // 删除客户 -export function delCustomer(params) { +export function delCustomer(ids) { return request({ url: '/customer/delete', method: 'post', - params + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } }) } diff --git a/src/router/index.js b/src/router/index.js index e50c4de..7b20a84 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,7 @@ import { caseRouters } from './modules/case' import { knowledgeRouters } from './modules/knowledge' import { customerRouters } from './modules/customer' +import { monitorRouters } from './modules/statistic' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -76,5 +77,6 @@ ...knowledgeRouters, ...customerRouters, ...systemRouters, + ...monitorRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js index faf2eec..92aa574 100644 --- a/src/router/modules/customer.js +++ b/src/router/modules/customer.js @@ -21,7 +21,7 @@ { path: '/blacklist', name: 'BlackList', - component: () => import('@/views/customerManage/customerList'), + component: () => import('@/views/blackList/blackList'), meta: { title: '黑名单', icon: '', permission: '/customer/blacklist' } } ] diff --git a/src/views/blackList/blackList.vue b/src/views/blackList/blackList.vue index 0d74a44..61a94e6 100644 --- a/src/views/blackList/blackList.vue +++ b/src/views/blackList/blackList.vue @@ -7,7 +7,7 @@ 新增 - 移除 + 移除 - + @@ -31,12 +31,12 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CaseListTable from '@/views/caseManage/caseCommon/caseListTable' import NormalTable from '@/components/NomalTable' -import { getCustomerList, delCustomer } from '@/api/customer' -import EditCustomer from './editBlack' +import { getBlackList, delBlack } from '@/api/blackCus' +import EditBlack from './editBlack' export default { name: 'CustomerList', - components: { EditCustomer, AppContainer, SearchArea, SearchItem, CaseListTable, NormalTable }, + components: { EditBlack, AppContainer, SearchArea, SearchItem, CaseListTable, NormalTable }, data() { return { list: [], @@ -62,6 +62,16 @@ text: '备注', value: 'name', align: 'center' + }, + { + text: '操作人', + value: 'operatorName', + align: 'center' + }, + { + text: '操作时间', + value: 'ts', + align: 'center' } ], // 显示列 checkStateList: [], // 审核状态 @@ -99,20 +109,8 @@ this.listQuery.offset = 1 } this.listLoading = true - getCustomerList(this.listQuery).then(response => { + getBlackList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'name': '李四', - 'typeName': '', - 'tel1': '1310000000', - 'tel2': '1562323221', - 'cardNo': '110123199601019281', - 'address': '北京海淀', - 'remarks': '' - } - ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -143,9 +141,10 @@ } ).then(() => { const list = this.multipleSelection.map(item => item.id) - delCustomer(list).then(response => { + delBlack(list).then(response => { if (response.code === 200) { - this.$message.success('删除成功') + this.$message.success('移除成功') + this.fetchData() } }) }) @@ -177,6 +176,10 @@ } else { return true } + }, + watchChild() { + console.log('watchChild') + this.fetchData() } } } diff --git a/src/views/blackList/editBlack.vue b/src/views/blackList/editBlack.vue index ce0faf2..22b84ad 100644 --- a/src/views/blackList/editBlack.vue +++ b/src/views/blackList/editBlack.vue @@ -1,50 +1,19 @@