Merge remote-tracking branch 'origin/master'

src/views/myOrder/components/HighSearch.vue

@@ -293,7 +293,7 @@ export default {
       this.onQuickDateChoose(0, '')
       // console.log(this.moreSearchInfo)
       // this.moreSearchShow = false
-      // this.$emit('onsearch', this.moreSearchInfo)
+      this.$emit('onclean', this.moreSearchInfo)
     },
 
     showPost(type) {

src/views/myOrder/index.vue

@@ -51,7 +51,7 @@ export default {
     return {
       tabsTitle: [],
       moreSearchShow: false,
-      activeTab: 'home',
+      activeTab: 'all',
       moreSearchInfo: {
         supplier: {}, // 供应商
         consignor: [], // 货主
@@ -151,24 +151,24 @@ export default {
         'start': '1'
       }
       companyList.push(removeItem)
-      // let data = {
-      //   list: companyList
-      // }
       let data = {
-        'list': [
-          {
-            'length': '1',
-            'attr': {
-                'empid': '199476,1',
-                'userid': '23528',
-                'sysname': 'ERP',
-                'companyname': '上药控股有限公司'
-            },
-            'dbName': '',
-            'start': '1'
-          }
-        ]
+        list: companyList
       }
+      // let data = {
+      //   'list': [
+      //     {
+      //       'length': '1',
+      //       'attr': {
+      //           'empid': '199476,1',
+      //           'userid': '23528',
+      //           'sysname': 'ERP',
+      //           'companyname': '上药控股有限公司'
+      //       },
+      //       'dbName': '',
+      //       'start': '1'
+      //     }
+      //   ]
+      // }
       getEmployeeOrgQueryList(data).then(rt => {
         if (rt.code === 200) {
             this.postDataList = rt.data
@@ -270,6 +270,8 @@ export default {
       console.log(this.moreSearchInfo)
       this.moreSearchInfo = JSON.parse(JSON.stringify(data))
       this.$EventBus.$emit('myOrderMoreSearch', this.moreSearchInfo)
+      this.tabsTitle = []
+      this.activeTab = 'all'
     },
     /// 处理tabsTitle
     tabsTitleData() {