diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts index ef5e1682f..cda8e2e8e 100644 --- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts @@ -116,7 +116,15 @@ export const CustomerDeliveryForecast = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, - isForm: false + isForm: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, }, { label: '是否可用', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 298e1bf5a..3578520b6 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -39,7 +39,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, + isSearch: false, }, // { // label: '发货计划单号', @@ -62,7 +62,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ field: 'status', dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, isForm: false, sort: 'custom', @@ -366,7 +366,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: false, sort: 'custom', table: { diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index d75a19e9f..fb6bd2c07 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -559,6 +559,10 @@ const importSuccess = () => { // 筛选提交 const searchFormClick = (searchData) => { tableObject.params.isSearch = true + console.log('searchData',searchData.filters); + if(!searchData.filters){//重置的时候应用 + searchData.filters = [] + } let filters = [...searchData.filters] if(!filters.find(item=>item.column=='business_type')){ if ( routeName.value == 'DeliverRequestMain') { diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index b4239de99..ed61ebad9 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -256,7 +256,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: false, sort: 'custom', table: { diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 39362227c..2123a4199 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -249,7 +249,7 @@ export const SaleMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, sort: 'custom', table: {