Merge remote-tracking branch 'origin/master_hella' into master_hella

src/components/SearchTable/src/SearchTable.vue

@@ -159,12 +159,13 @@ const searchFormClick = (searchData) => {
     if (searchConditionRef.value.filters) {
       searchData.filters = searchConditionRef.value.filters
     } else {
+      searchData.filters = []
       Object.keys(searchConditionRef.value).forEach(key => {
-        searchData.filters = [{
+        searchData.filters.push({
           action: "==",
           column: key,
           value: searchConditionRef.value[key]
-        }]
+        })
       });
     }
   }

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -305,7 +305,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       {
         label: t('ts.创建供应商发货申请'),
         name: 'supplierdeliver',
-        hide: isShowMainButton(row, ['3']),
+        hide: isShowMainButton(row, ['4']),
         type: 'primary',
         icon: '',
         color: '',