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

@@ -167,6 +167,9 @@ export default {
       getDetail({ bsmReport: this.dataReport.bsmReport }).then((res) => {
         if (res.code == 200) {
           this.headerList = res.result;
+          this.activeName = res.result[0].soleurl
+          this.bsmYwsjb = this.headerList[0].bsmYwsjb;
+          this.editItem = this.loadView(this.activeName);
         }
       });
     },
@@ -177,11 +180,11 @@ export default {
       this.index = _index;
       this.bsmYwsjb = this.headerList[val.index].bsmYwsjb;
       this.editItem = this.loadView(this.activeName);
-      this.diaData.list.forEach((item) => {
-        if (item.soleurl == this.activeName) {
-          this.dataTable = item.dataTable;
-        }
-      });
+      // this.diaData.list.forEach((item) => {
+      //   if (item.soleurl == this.activeName) {
+      //     this.dataTable = item.dataTable;
+      //   }
+      // });
     },
     loadView (view) {
       return (r) =>

@@ -29,7 +29,7 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table v-loading="loading" :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current"
+      <lb-table :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current"
         :total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
       </lb-table>
@@ -59,7 +59,6 @@ export default {
   },
   data () {
     return {
-      loading: false,
       form: {
         YWH: '',
         BDCDYH: '',
@@ -120,7 +119,6 @@ export default {
     },
     async featchData () {
       try {
-        this.loading = true
         let { result: { list, total, pages: pageSize, pageNum: current }
         } = await business.getQlfQlDyaqList(this.form)
         this.tableData.data = list;
@@ -133,7 +131,6 @@ export default {
         this.message = error
         this.$refs.msg.messageShow()
       }
-      this.loading = false
     },
     handlDatadetails (index, row) {
     },

@@ -38,9 +38,9 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current"
-        :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
-        :column="tableData.columns" :data="tableData.data">
+      <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
+        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
+        :data="tableData.data">
       </lb-table>
       <message-tips ref="msg" :message="message" />
     </div>
@@ -68,7 +68,6 @@ export default {
   },
   data () {
     return {
-      loading: false,
       form: {
         YWH: '',
         QLLX: '',
@@ -131,7 +130,6 @@ export default {
     },
     async featchData () {
       try {
-        this.loading = true
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
         } = await business.getQltQlGjzwsyqList(this.form)
@@ -145,7 +143,6 @@ export default {
         this.message = error
         this.$refs.msg.messageShow()
       }
-      this.loading = false
     },
     async handlDatadetails (index, row) {
       let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)