Merge remote-tracking branch 'origin/master'

src/main.js

@@ -47,3 +47,5 @@ new Vue({
   store,
   render: h => h(App)
 })
+// 监听
+Vue.prototype.$EventBus = new Vue();

src/views/myOrder/components/HighSearch.vue

@@ -220,7 +220,6 @@ export default {
     },
     onSearchClick() {
       this.moreSearchShow = false
-      console.log(this.moreSearchInfo)
       this.$emit('onsearch', this.moreSearchInfo)
     },
     onCleanClick() {
@@ -236,8 +235,8 @@ export default {
         },
       }
       console.log(this.moreSearchInfo)
-      // this.moreSearchShow = false
-      // this.$emit('onsearch', this.moreSearchInfo)
+      this.moreSearchShow = false
+      this.$emit('onsearch', this.moreSearchInfo)
     },
     
     showPost(type) {

src/views/myOrder/index.vue

@@ -22,7 +22,7 @@
         v-for="(item, index) in tabsTitle"
         :key="index"
         :title="item.title">
-        <my-order-list @orderItemAction="orderItemAction"/>
+        <my-order-list :ref="item.name" :activeTab="activeTab" :more-search-info="moreSearchInfo" @orderItemAction="orderItemAction"/>
       </van-tab>
     </van-tabs>
     <high-search v-model="moreSearchShow" @onsearch="moreSearchConfirm" @onclean="moreSearchClean"/>
@@ -34,11 +34,11 @@ import myOrderList from './myOrderList.vue'
 import HighSearch from './components/HighSearch.vue'
 import {getFormateDate} from '@/utils/common'
 const allTabsTitle = [
-  {title: '全部', name: 'home'},
-  {title: '已开单', name: 'monitor'},
-  {title: '已发货', name: 'purchase'},
-  {title: '已完成', name: 'sales'},
-  {title: '已取消', name: 'stock'}
+  {title: '全部', name: 'all'},
+  {title: '已开单', name: 'billing'},
+  {title: '已发货', name: 'ship'},
+  {title: '已完成', name: 'carryOut'},
+  {title: '已取消', name: 'cancel'}
 ]
 export default {
   components: {
@@ -51,12 +51,12 @@ export default {
       moreSearchShow: false,
       activeTab: 'home',
       moreSearchInfo: {
-        // 接收搜索更多回传的数据
-        supplier: { comPartyId: '' }, // 供应商ID
-        goods: { comGoodsId: '' }, // 商品ID
-        orderNo: '', // 订单编号
+        supplier: '', // 供应商
+        consignor: [], // 货主
+        goods: '', // 商品
+        client: '', // 客户
+        orderNo: '',
         time: {
-          // 起始时间
           start: getFormateDate(new Date(), 'yyyy-MM-dd'),
           end: getFormateDate(new Date(), 'yyyy-MM-dd')
         }
@@ -156,28 +156,29 @@ export default {
     },
     // 高级搜索查询
     moreSearchConfirm(data) {
-      console.log('000000000')
+      this.tabsTitleData()
+      this.$nextTick(() => {
+        this.activeTab = 'all'
+        // console.log(Object.keys(this.$refs))
+        // this.$refs.all[0].httpAction(this.moreSearchInfo)
+      })
+      this.moreSearchInfo = JSON.parse(JSON.stringify(data))
+      this.$EventBus.$emit('myOrderMoreSearch', this.moreSearchInfo)
     },
     // 高级搜索取消
     moreSearchClean(data) {
-      this.moreSearchInfo = data
-    },
-    addNextTab(pos) {
-      // 加载下一个页面
-      this.tabsTitle = allTabsTitle.slice(0, pos)
-      let nextTab = allTabsTitle[pos]
-      this.tabsTitle.push(nextTab)
-      this.$nextTick(() => {
-        this.activeName = nextTab.name
-      })
+      this.moreSearchInfo = JSON.parse(JSON.stringify(data))
+      this.$EventBus.$emit('myOrderMoreSearch', this.moreSearchInfo)
     },
     /// 处理tabsTitle
     tabsTitleData() {
-      this.tabsTitle = []
+      this.tabsTitle = [{title: '全部', name: 'all'}]
       for (let i = 0; i < allTabsTitle.length; i++) {
         let dic = allTabsTitle[i]
+        if (dic.name !== 'all') {
           this.tabsTitle.push(dic)
         }
+      }
     },
     closeAppPage() {
       console.log('关闭页面')

src/views/myOrder/myOrderList.vue

@@ -66,6 +66,7 @@
 // 引入接口
 import { getMyOrderList } from '@/api/myOrder'
 import orderListItem from './orderListItem.vue'
+import { valid } from 'semver'
 export default {
   name: 'MyOrderList',
   components: {
@@ -85,6 +86,16 @@ export default {
       sphImage: require('@/assets/img/u48.png'),
     }
   },
+  props: {
+    moreSearchInfo: {
+      type: Object,
+      default: () => {
+        return {
+        }
+      }
+    },
+    activeTab: ''
+  },
   computed: {
     linkInfo () {
       return this.$store.state.linkInfo
@@ -99,8 +110,22 @@ export default {
   },
   mounted() {
     // this.onLoad()
+    this.$EventBus.$on('myOrderMoreSearch', (model) => {
+      // console.log(model)
+      this.onRefresh()
+    })
+  },
+  watch: {
+    activeTab(val) {
+    }
   },
   methods: {
+    // 接口
+    httpAction(moreSearchModel) {
+      this.moreSearchInfo = moreSearchModel
+      console.log(this.moreSearchInfo)
+      // this.onRefresh()
+    },
     // 单个发票点击事件
     orderItemAction(model) {
       this.$emit('orderItemAction', model)