Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web
Showing
3 changed files
with
12 additions
and
15 deletions
... | @@ -167,6 +167,9 @@ export default { | ... | @@ -167,6 +167,9 @@ export default { |
167 | getDetail({ bsmReport: this.dataReport.bsmReport }).then((res) => { | 167 | getDetail({ bsmReport: this.dataReport.bsmReport }).then((res) => { |
168 | if (res.code == 200) { | 168 | if (res.code == 200) { |
169 | this.headerList = res.result; | 169 | this.headerList = res.result; |
170 | this.activeName = res.result[0].soleurl | ||
171 | this.bsmYwsjb = this.headerList[0].bsmYwsjb; | ||
172 | this.editItem = this.loadView(this.activeName); | ||
170 | } | 173 | } |
171 | }); | 174 | }); |
172 | }, | 175 | }, |
... | @@ -177,11 +180,11 @@ export default { | ... | @@ -177,11 +180,11 @@ export default { |
177 | this.index = _index; | 180 | this.index = _index; |
178 | this.bsmYwsjb = this.headerList[val.index].bsmYwsjb; | 181 | this.bsmYwsjb = this.headerList[val.index].bsmYwsjb; |
179 | this.editItem = this.loadView(this.activeName); | 182 | this.editItem = this.loadView(this.activeName); |
180 | this.diaData.list.forEach((item) => { | 183 | // this.diaData.list.forEach((item) => { |
181 | if (item.soleurl == this.activeName) { | 184 | // if (item.soleurl == this.activeName) { |
182 | this.dataTable = item.dataTable; | 185 | // this.dataTable = item.dataTable; |
183 | } | 186 | // } |
184 | }); | 187 | // }); |
185 | }, | 188 | }, |
186 | loadView (view) { | 189 | loadView (view) { |
187 | return (r) => | 190 | return (r) => | ... | ... |
... | @@ -29,7 +29,7 @@ | ... | @@ -29,7 +29,7 @@ |
29 | </el-form> | 29 | </el-form> |
30 | </div> | 30 | </div> |
31 | <div class="from-clues-content"> | 31 | <div class="from-clues-content"> |
32 | <lb-table v-loading="loading" :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current" | 32 | <lb-table :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current" |
33 | :total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange" | 33 | :total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange" |
34 | @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> | 34 | @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> |
35 | </lb-table> | 35 | </lb-table> |
... | @@ -59,7 +59,6 @@ export default { | ... | @@ -59,7 +59,6 @@ export default { |
59 | }, | 59 | }, |
60 | data () { | 60 | data () { |
61 | return { | 61 | return { |
62 | loading: false, | ||
63 | form: { | 62 | form: { |
64 | YWH: '', | 63 | YWH: '', |
65 | BDCDYH: '', | 64 | BDCDYH: '', |
... | @@ -120,7 +119,6 @@ export default { | ... | @@ -120,7 +119,6 @@ export default { |
120 | }, | 119 | }, |
121 | async featchData () { | 120 | async featchData () { |
122 | try { | 121 | try { |
123 | this.loading = true | ||
124 | let { result: { list, total, pages: pageSize, pageNum: current } | 122 | let { result: { list, total, pages: pageSize, pageNum: current } |
125 | } = await business.getQlfQlDyaqList(this.form) | 123 | } = await business.getQlfQlDyaqList(this.form) |
126 | this.tableData.data = list; | 124 | this.tableData.data = list; |
... | @@ -133,7 +131,6 @@ export default { | ... | @@ -133,7 +131,6 @@ export default { |
133 | this.message = error | 131 | this.message = error |
134 | this.$refs.msg.messageShow() | 132 | this.$refs.msg.messageShow() |
135 | } | 133 | } |
136 | this.loading = false | ||
137 | }, | 134 | }, |
138 | handlDatadetails (index, row) { | 135 | handlDatadetails (index, row) { |
139 | }, | 136 | }, | ... | ... |
... | @@ -38,9 +38,9 @@ | ... | @@ -38,9 +38,9 @@ |
38 | </el-form> | 38 | </el-form> |
39 | </div> | 39 | </div> |
40 | <div class="from-clues-content"> | 40 | <div class="from-clues-content"> |
41 | <lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current" | 41 | <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total" |
42 | :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" | 42 | @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" |
43 | :column="tableData.columns" :data="tableData.data"> | 43 | :data="tableData.data"> |
44 | </lb-table> | 44 | </lb-table> |
45 | <message-tips ref="msg" :message="message" /> | 45 | <message-tips ref="msg" :message="message" /> |
46 | </div> | 46 | </div> |
... | @@ -68,7 +68,6 @@ export default { | ... | @@ -68,7 +68,6 @@ export default { |
68 | }, | 68 | }, |
69 | data () { | 69 | data () { |
70 | return { | 70 | return { |
71 | loading: false, | ||
72 | form: { | 71 | form: { |
73 | YWH: '', | 72 | YWH: '', |
74 | QLLX: '', | 73 | QLLX: '', |
... | @@ -131,7 +130,6 @@ export default { | ... | @@ -131,7 +130,6 @@ export default { |
131 | }, | 130 | }, |
132 | async featchData () { | 131 | async featchData () { |
133 | try { | 132 | try { |
134 | this.loading = true | ||
135 | this.form = Object.assign(this.form, this.formData) | 133 | this.form = Object.assign(this.form, this.formData) |
136 | let { result: { list, total, pages: pageSize, pageNum: current } | 134 | let { result: { list, total, pages: pageSize, pageNum: current } |
137 | } = await business.getQltQlGjzwsyqList(this.form) | 135 | } = await business.getQltQlGjzwsyqList(this.form) |
... | @@ -145,7 +143,6 @@ export default { | ... | @@ -145,7 +143,6 @@ export default { |
145 | this.message = error | 143 | this.message = error |
146 | this.$refs.msg.messageShow() | 144 | this.$refs.msg.messageShow() |
147 | } | 145 | } |
148 | this.loading = false | ||
149 | }, | 146 | }, |
150 | async handlDatadetails (index, row) { | 147 | async handlDatadetails (index, row) { |
151 | let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB) | 148 | let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB) | ... | ... |
-
Please register or sign in to post a comment