Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
635174cd by 任超
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

2 parents c26959ae b56af25e
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
119 this.$startLoading() 119 this.$startLoading()
120 this.searchForm.ywh = this.queryForm.ywh 120 this.searchForm.ywh = this.queryForm.ywh
121 this.iterationData() 121 this.iterationData()
122 searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => { 122 searchTaskToDo({ ...this.queryForm, ...this.otherForm, ...this.pageData }).then(res => {
123 this.$endLoading() 123 this.$endLoading()
124 if (res.code === 200) { 124 if (res.code === 200) {
125 let { total, records } = res.result 125 let { total, records } = res.result
......
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
113 this.$startLoading() 113 this.$startLoading()
114 this.searchForm.ywh = this.queryForm.ywh 114 this.searchForm.ywh = this.queryForm.ywh
115 this.iterationData() 115 this.iterationData()
116 searchTaskDone({ ...this.queryForm, ...this.pageData }).then(res => { 116 searchTaskDone({ ...this.queryForm,...this.otherForm, ...this.pageData }).then(res => {
117 this.$endLoading() 117 this.$endLoading()
118 if (res.code === 200) { 118 if (res.code === 200) {
119 let { total, records } = res.result 119 let { total, records } = res.result
......