style:业务办理

@@ -43,7 +43,8 @@ export function searchTaskToDo (data) {
     return request({
         url: '/workBox/search/searchTaskToDo',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 // 待办箱删除接口
@@ -71,7 +72,8 @@ export function searchTaskDone (data) {
     return request({
         url: '/workBox/search/searchTaskDone',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 

@@ -7,13 +7,45 @@
 
     &-header {
         width: 100%;
-        padding: 15px 15px 0 15px;
+        padding: 10px 10px 3px 10px;
         box-sizing: border-box;
         background: #FFFFFF;
         border-radius: 2px;
         border: 1px solid #e8edf3;
     }
 
+    .advanced-search {
+        display: flex;
+        font-size: 12px;
+        flex-wrap: wrap;
+
+        span {
+            display: flex;
+            align-items: center;
+        }
+
+        i {
+            color: $light-blue;
+            margin-left: 5px;
+            cursor: pointer;
+        }
+
+        ul {
+            display: flex;
+            align-items: center;
+
+            li {
+                color: $light-blue;
+                border: 1px solid $light-blue;
+                border-radius: 10px;
+                padding: 2px 8px;
+            }
+        }
+
+        .clean-btn {
+            margin-left: 10px;
+        }
+    }
 
     &-content {
         width: 100%;
@@ -35,8 +67,7 @@
     }
 
     .el-form-item--small.el-form-item {
-        margin-bottom: 15px;
-
+        margin-bottom: 0px;
     }
 }
 

@@ -42,12 +42,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row class="advanced-search">
+          <span>高级搜索条件：</span>
+          <ul>
+            <li>不动产单元号:201252222<i class="el-icon-circle-close"></i></li>
+          </ul>
+          <el-button class="clean-btn" type="text">清除全部</el-button>
+        </el-row>
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :total="tableData.total"
-        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
-        :data="tableData.data">
+      <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.currentPage"
+        :heightNum="300" :total="tableData.total" @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
       </lb-table>
     </div>
   </div>
@@ -95,7 +102,6 @@ export default {
         //页面切换时，处理逻辑
       } else {//切换到该页面时执行
         if (window.location.hash == '#/ywbl/dbx') {
-          console.log('让我看看', window.location)
           this.fetchData()
         }
       }
@@ -107,10 +113,14 @@ export default {
           let { total, records } = res.result
           let str = ''
           records.forEach(item => {
-            console.log(item);
+            item.qlrmc = item.qlrmc.join(',')
+            item.ywh = item.ywh.join(',')
+            item.zl = item.zl.join(',')
+            item.fromstepdate = item.fromstepdate[0]
             item.qlrmcStr = item.qlrmc ? String(item.qlrmc) : ''
             item.ywrmcStr = item.ywrmc ? String(item.ywrmc) : ''
           })
+          console.log(records);
           this.tableData.total = total;
           this.tableData.data = records ? records : []
         }
@@ -119,8 +129,10 @@ export default {
     queryClick () {
       this.fetchData()
     },
-    handleSort (name, sort) {
-      console.log(name, sort);
+    handleSort (val) {
+      this.queryForm.sortField = val.prop
+      this.queryForm.sortOrder = val.order == "ascending" ? 'asc' : 'desc'
+      this.fetchData()
     },
     del (item) {
       let formdata = new FormData();
@@ -138,8 +150,8 @@ export default {
               message: '删除成功!'
             });
             this.fetchData()
-          }else {
-          this.$message.error(res.message);
+          } else {
+            this.$message.error(res.message);
           }
         })
       }).catch(() => {

@@ -13,7 +13,14 @@ class data extends filter {
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         prop: "ywlymc",
@@ -37,7 +44,7 @@ class data extends filter {
       {
         prop: "zbhj",
         label: "在办环节",
-        width: '80'
+        width: '70'
       },
       {
         label: '业务号',
@@ -91,14 +98,8 @@ class data extends filter {
       {
         label: "转入时间",
         sortable: 'custom',
-        width: '160',
-        render: (h, scope) => {
-          return (
-            <div>
-              <span>{scope.row.zrsj[0]}</span>
-            </div>
-          )
-        }
+        prop: 'fromstepdate',
+        width: '160'
       }
     ]
   }

@@ -98,6 +98,12 @@ export default {
         if (res.code === 200) {
           let { total, records } = res.result
           this.pageData.total = total;
+          records.forEach(item => {
+            item.qlrmc = item.qlrmc.join(',')
+            item.ywh = item.ywh.join(',')
+            item.zl = item.zl.join(',')
+            item.outstepdate = item.outstepdate[0]
+          })
           this.tableData.data = records
         }
       })
@@ -105,8 +111,10 @@ export default {
     queryClick () {
       this.fetchData()
     },
-    handleSort (name, sort) {
-      console.log(name, sort);
+    handleSort (val) {
+      this.queryForm.sortField = val.prop
+      this.queryForm.sortOrder = val.order == "ascending" ? 'asc' : 'desc'
+      this.fetchData()
     },
     ywhClick (item) {
       const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1');

@@ -13,7 +13,14 @@ class data extends filter {
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         prop: "ywlymc",
@@ -68,13 +75,7 @@ class data extends filter {
         label: "转出时间",
         width: '140',
         sortable: 'custom',
-        render: (h, scope) => {
-          return (
-            <div>
-              <span>{scope.row.zcsj[0]}</span>
-            </div>
-          )
-        }
+        prop: 'outstepdate'
       }
     ]
   }