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

src/views/main/ViewDeletedList/ViewDeletedList.vue

@@ -1,5 +1,32 @@
 <template>
   <div>
+    <a-card :bordered="false" :bodyStyle="tstyle">
+      <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
+        <a-form layout="inline">
+          <a-row :gutter="48">
+            <a-col :md="18">
+              <a-row :gutter="48">
+                <a-col :md="8" :sm="24" >
+                  <a-form-item :label="`主订单号`" >
+                    <a-input  allow-clear v-model="SearchContent"/>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="tableRefresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="tableReset">重置</a-button>
+                <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'" />
+                </a> -->
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
     <vxe-toolbar>
       <template #buttons>
         <div class="nav-box">
@@ -233,6 +260,7 @@ export default {
   },
   data() {
     return {
+      SearchContent:'',
       spinning: false,
       TaskShippingOrderCompareVisible: false,
       TaskShippingOrderCompareData: {
@@ -522,6 +550,7 @@ export default {
       }
       this.gridOptions.data = []
       this.getList(queryParam)
+
     },
     getConfigUser(isInit = false) {
       const query = {
@@ -798,6 +827,7 @@ export default {
       console.log('== 展开结束 ==', new Date().getTime() - start)
     },
     tableRefresh() {
+       this.formRes.MBLNO = this.SearchContent 
       const data = { ...this.formRes }
       this.searchData = JSON.parse(JSON.stringify(data))
       this.init(this.searchData)
@@ -837,22 +867,7 @@ export default {
     },
 
     tableReset() {
-      this.ResetType = false
+     this.SearchContent = ''
-      Object.keys(this.formRes).map((item, index) => {
-        this.formRes[item] = ''
-      })
-      this.searchData = JSON.parse(JSON.stringify(this.formRes))
-      Object.keys(this.$refs).map((label, index) => {
-        if (label.includes('fromlabel-') && this.$refs[label].length > 0) {
-          this.$refs[label][0].$data.value = ''
-        }
-      })
-      this.tableOrderLabel = ''
-      this.tableOrderType = ''
-      this.$refs.xGrid.clearSort()
-      setTimeout(() => {
-        this.ResetType = true
-      }, 100)
     },
 
     submitForm(data) {