Browse Source

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

master_hella_20240701
gaojs 6 months ago
parent
commit
2f71947987
  1. 5
      src/components/SearchTable/src/SearchTable.vue
  2. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

5
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]
}]
})
});
}
}

2
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: '',

Loading…
Cancel
Save