From 2e19e388f103940de538a595666cf9348e82987e Mon Sep 17 00:00:00 2001 From: zhousq Date: Mon, 20 May 2024 14:38:13 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/components/BasicFormV2.vue | 1 + src/views/mes/orderDay/orderDay.data.ts | 7 +++++-- src/views/mes/processroute/index.vue | 15 +++++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/views/mes/orderDay/components/BasicFormV2.vue b/src/views/mes/orderDay/components/BasicFormV2.vue index a6863b0ad..3c31d2066 100644 --- a/src/views/mes/orderDay/components/BasicFormV2.vue +++ b/src/views/mes/orderDay/components/BasicFormV2.vue @@ -372,6 +372,7 @@ const submitForm = async () => { /** 重置表单 */ const resetForm = () => { unref(formRef)?.resetFields() + //formRef.value?.resetFields() } // 传递给父类 diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index 191655684..c059c2a17 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -178,11 +178,13 @@ export const OrderDay = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, required: true, + value:'', form:{ component:'Select', componentProps:{ - options:[] - } + options:[], + }, + } }, { @@ -200,6 +202,7 @@ export const OrderDay = useCrudSchemas(reactive([ field: 'processrouteCode', sort: 'custom', form: { + value:"", component:'Select', componentProps: { options: [] diff --git a/src/views/mes/processroute/index.vue b/src/views/mes/processroute/index.vue index 98b69f762..c7a0a30ff 100644 --- a/src/views/mes/processroute/index.vue +++ b/src/views/mes/processroute/index.vue @@ -126,8 +126,16 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 + // if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + // searchFormClick({ + // filters: tableObject.params.filters + // }) + // } else { + // getList() + // } getList() } else if (val == 'filtrate') { // 筛选 + } else { // 其他按钮 console.log('其他按钮', item) } @@ -257,12 +265,15 @@ const importSuccess = () => { } // 筛选提交 -const searchFormClick = (searchData) => { +const searchFormClick = async (searchData) => { tableObject.params = { isSearch: true, filters: searchData.filters } - getList() // 刷新当前列表 + + //await getList() + //console.log('searchFormClick',tableObject.tableList ) + // 刷新当前列表 } /** 初始化 **/