Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/views/main/Printing/index.vue

@@ -166,7 +166,7 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        WebMain: '',
+        WebMain: '全部',
         currentPage: 1,
         pageSize: 10,
         totalResult: 1
@@ -324,11 +324,11 @@ export default {
       this.loading = true
       let Data = {}
       if (this.queryParam.WebMain == '全部') {
-        Data = { isMain: true, isSub: true }
+        Data = {}
       } else if (this.queryParam.WebMain == '主单') {
-        Data = { isMain: true, isSub: false }
+        Data = { isMain: true }
       } else if (this.queryParam.WebMain == '分单') {
-        Data = { isMain: false, isSub: true }
+        Data = { isSub: true }
       }
       BookingPrintTemplatePage({ ...this.queryParam, ...Data }).then(res => {
         this.loadData = res.data.rows