-
-
{{ 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