diff --git a/src/api/ebiz/productionSay/productionSay.js b/src/api/ebiz/productionSay/productionSay.js index 0fa925451..2e8c08c26 100644 --- a/src/api/ebiz/productionSay/productionSay.js +++ b/src/api/ebiz/productionSay/productionSay.js @@ -10,28 +10,52 @@ export function getProdectSaidList(data) { }) } -// 查询分享轨迹(转发记录) -export function getShareList(data) { +// 查询机构列表 +export function getBranchComList(data) { return request({ - url: getUrl('/customer/shop/getShareList', 1), + url: getUrl('/data/performance/getBranchComList', 1), method: 'post', data }) } -// 分享轨迹保存 -export function saveShareTrack(data) { +// 查询产说会详情 +export function getProdectSaidById(data) { return request({ - url: getUrl('/customer/shop/saveShareTrack', 1), + url: getUrl('/agent/prodectsaid/getProdectSaidById', 1), method: 'post', data }) } -// 获取账号密码以用于回显 -export function getPassword(data) { +// 创建或编辑产说会 +export function addOrUpdate(data) { return request({ - url: getUrl('/customer/shop/getPassword', 1), + url: getUrl('/agent/prodectsaid/addOrUpdate', 1), + method: 'post', + data + }) +} +// 查询主讲产品列表和所属机构 +export function getList(data) { + return request({ + url: getUrl('/agent/ebizprodectsaid/getList', 1), + method: 'post', + data + }) +} +// 查询统计列表 +export function selectAllStatistical(data) { + return request({ + url: getUrl('/agent/prodectsaid/selectAllStatistical', 1), + method: 'post', + data + }) +} +// 查询统计详情 +export function selectStatisticalByCon(data) { + return request({ + url: getUrl('/agent/prodectsaid/selectStatisticalByCon', 1), method: 'post', data }) diff --git a/src/components/ebiz/productionSay/statisticsTable.vue b/src/components/ebiz/productionSay/statisticsTable.vue new file mode 100644 index 000000000..ea53e3316 --- /dev/null +++ b/src/components/ebiz/productionSay/statisticsTable.vue @@ -0,0 +1,101 @@ + + + + + \ No newline at end of file diff --git a/src/router/ebiz/productionSay.js b/src/router/ebiz/productionSay.js index 453fb8a4f..6eb320804 100644 --- a/src/router/ebiz/productionSay.js +++ b/src/router/ebiz/productionSay.js @@ -1,6 +1,8 @@ //产说会列表 定义相关组件 const List = () => import('@/views/ebiz/productionSay/List') const createChangeItem = () => import('@/views/ebiz/productionSay/createChangeItem') +const statistics = () => import('@/views/ebiz/productionSay/statistics') +const statisticsItem = () => import('@/views/ebiz/productionSay/statisticsItem') export default [ { @@ -19,5 +21,21 @@ export default [ title: '创建产说会', index: 2 } + },{ + path: '/productionSay/statistics', + name: 'statistics', + component: statistics, + meta: { + title: '产说会统计表', + index: 3 + } + },{ + path: '/productionSay/statisticsItem', + name: 'statisticsItem', + component: statisticsItem, + meta: { + title: '查询产说会', + index: 4 + } }, ] diff --git a/src/views/ebiz/productionSay/List.vue b/src/views/ebiz/productionSay/List.vue index 5af621af3..7026ada77 100644 --- a/src/views/ebiz/productionSay/List.vue +++ b/src/views/ebiz/productionSay/List.vue @@ -17,7 +17,7 @@
-
-
{{ item.riskName }}
+
+
{{ item.mainSaidProduct }}
召开机构:{{ item.convokeOrgCn }}
召开时间:{{ item.convokeStartTime }} 至 {{ item.convokeEndTime }}
预估人数:{{ item.estimatePeople }} 人
@@ -60,7 +60,7 @@ - 我的产说会 + 我的产说会
@@ -70,11 +70,11 @@ - + - +
@@ -83,7 +83,7 @@ import { Search, List, Icon, Sticky, Tabs, Tab, DatetimePicker, Checkbox } from 'vant' import FieldDatePicter from '@/components/ebiz/FieldDatePicter' import utils from '@/assets/js/business-common' -import { getProdectSaidList } from '@/api/ebiz/productionSay/productionSay.js' +import { getProdectSaidList, getBranchComList } from '@/api/ebiz/productionSay/productionSay.js' export default { name: 'List', data() { @@ -108,7 +108,7 @@ export default { minDate: new Date(1900, 0, 1), showDataPicker: false, dateType: '', - filterIndex: '', + filterIndex: 'firstCode', filterName: { //筛选机构名称 first: '全部', @@ -124,10 +124,18 @@ export default { }, } }, - created(){ - localStorage.orderNo = ''; + computed: { + orderList() { + return this.saleList.filter((item) => { + return item.mainSaidProduct.search(this.searchName) != -1 + }) + }, + }, + created() { + localStorage.orderNo = '' }, mounted() { + this.loadMore() EWebBridge.webCallAppInJs('webview_right_button', { btns: [ { @@ -154,9 +162,58 @@ export default { } }, // 统计图 - statistics() {}, + statistics() { + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#/productionSay/statistics', + }, + routerInfo: { + path: '/productionSay/statistics', + }, + }) + }, + // 取消选择 + onCancel() { + let str = '' + for (let key in this.filterName) { + if (key.indexOf('Code') == -1) { + if (this.filterName[key] == '全部') { + break + } + str = key + } + } + this.filterIndex = str + this.popupShow = false + }, // 确认选择 - onConfirm(val) {}, + onConfirm(val) { + console.log(val) + switch (this.filterIndex) { + case 'first': + this.filterName['second'] = '全部' + this.filterName['third'] = '全部' + this.filterName['fourth'] = '全部' + this.filterName['fifth'] = '全部' + break + case 'second': + this.filterName['third'] = '全部' + this.filterName['fourth'] = '全部' + this.filterName['fifth'] = '全部' + break + case 'third': + this.filterName['fourth'] = '全部' + this.filterName['fifth'] = '全部' + break + case 'fourth': + this.filterName['fifth'] = '全部' + break + } + this.popupShow = false + this.filterName[this.filterIndex] = val.text + this.filterName[this.filterIndex + 'Code'] = val.id + }, filterDateClick(type) { if (type == 'start') { this.showDataPicker = true @@ -180,30 +237,91 @@ export default { } }, toSelect(type) { - this.popupShow = true - this.filterIndex = type + 'Code' + this.filterIndex = type switch (type) { case 'first': - this.columns = [] + // this.getBranchComList('86', '01') + this.popupShow = true + this.columns = [ + { id: '', text: '全部' }, + { id: '86', text: '全国' }, + ] + break + case 'second': + if (this.filterName['first'] == '全部') return this.$toast('请先选择上一级机构') + this.getBranchComList(this.filterName['firstCode'], '01') + break + case 'third': + if (this.filterName['second'] == '全部') return this.$toast('请先选择上一级机构') + this.getBranchComList(this.filterName['secondCode'], '02') + break + case 'fourth': + if (this.filterName['third'] == '全部') return this.$toast('请先选择上一级机构') + this.getBranchComList(this.filterName['thirdCode'], '03') + break + case 'fifth': + if (this.filterName['fourth'] == '全部') return this.$toast('请先选择上一级机构') + this.getBranchComList(this.filterName['fourthCode'], '04') break } }, + getBranchComList(manageCode, manageLv) { + let data = { + bussinessType: 'normal', + manageCode, + manageLv, + } + getBranchComList(data).then((res) => { + res.content.forEach((item) => { + item.id = item.code + item.text = item.name + }) + res.content.unshift({ id: '', text: '全部' }) + this.popupShow = true + this.columns = res.content + }) + }, // 筛选弹窗显示 filterCilck() { this.showSideBar = true }, // 筛选确认按钮 submit() { + this.saleList = [] + this.currentPage = 1 + this.loadMore() this.showSideBar = false }, // 筛选重置按钮 reset() { + this.filterCreateDate = '' //筛选起始时间 + this.filterEndDate = '' //筛选结束时间 + this.isCreate = '' //是否创建人 + this.filterIndex = 'firstCode' + this.filterName['first'] = '全部' + this.filterName['second'] = '全部' + this.filterName['third'] = '全部' + this.filterName['fourth'] = '全部' + this.filterName['fifth'] = '全部' + this.filterName['firstCode'] = '' + this.filterName['secondCode'] = '' + this.filterName['thirdCode'] = '' + this.filterName['fourthCode'] = '' + this.filterName['fifthCode'] = '' + this.showSideBar = false + this.saleList = [] + this.currentPage = 1 + this.loadMore() this.showSideBar = false }, // 搜索列表 searchList() {}, // 切换tab - tabChange() {}, + tabChange() { + this.saleList = [] + this.currentPage = 1 + this.loadMore() + }, // 查看详情 goDetail(item) { localStorage.orderNo = item.id @@ -226,7 +344,7 @@ export default { status: this.active, //状态 startTime: this.filterCreateDate, //开始时间 endTime: this.filterEndDate, //结束时间 - convokeOrganization: this.filterName[this.filterIndex], //召开机构 + convokeOrganization: this.filterName[this.filterIndex + 'Code'], //召开机构 isCreate: this.isCreate ? '0' : '1', //是否创建人 } this.getOrderList(pageInfo) @@ -245,9 +363,10 @@ export default { console.log(res) if (res.result == 0) { this.currentPage++ - this.saleList = res.content.list + this.saleList = this.saleList.concat(res.content.list) this.loading = false - if ((res.content.nextPage = 0)) { + this.finished = false + if (res.content.nextPage == 0) { this.finished = true this.finishedText = '已经全部加载' } diff --git a/src/views/ebiz/productionSay/createChangeItem.vue b/src/views/ebiz/productionSay/createChangeItem.vue index 4a55b69a5..8cea901ff 100644 --- a/src/views/ebiz/productionSay/createChangeItem.vue +++ b/src/views/ebiz/productionSay/createChangeItem.vue @@ -2,16 +2,7 @@

产说会计划

- + - - - - + + + +

实际召开情况

- + - - - - - - + + + + + +
{{ isEdit == 1 ? '保存' : '创建完成' }} + + + + +
\ No newline at end of file diff --git a/src/views/ebiz/productionSay/statistics.vue b/src/views/ebiz/productionSay/statistics.vue new file mode 100644 index 000000000..e808be591 --- /dev/null +++ b/src/views/ebiz/productionSay/statistics.vue @@ -0,0 +1,117 @@ + + + + + \ No newline at end of file diff --git a/src/views/ebiz/productionSay/statisticsItem.vue b/src/views/ebiz/productionSay/statisticsItem.vue new file mode 100644 index 000000000..88a0aeb5d --- /dev/null +++ b/src/views/ebiz/productionSay/statisticsItem.vue @@ -0,0 +1,82 @@ + + + + + \ No newline at end of file