From dc4576775a23624d438260a5cfe1d8227d08df03 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 19 Feb 2025 09:34:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B9=B4=E5=BA=A6=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=AD=97=E6=AE=B5=E7=BC=96=E8=BE=91=E7=BD=AE=E7=81=B0?= =?UTF-8?q?=EF=BC=8C=E5=9C=BA=E5=86=85=E5=8E=82=E5=A4=96=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchHigh/src/SearchHigh.vue | 2 +- src/views/eam/basic/basciYearEquipment/index.vue | 14 +++++++------- src/views/eam/mold/moldAccounts/index.vue | 16 +++++++++------- .../eam/mold/moldAccounts/moldAccounts.data.ts | 1 + 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue index be0dba4..89d8adb 100644 --- a/src/components/SearchHigh/src/SearchHigh.vue +++ b/src/components/SearchHigh/src/SearchHigh.vue @@ -78,7 +78,7 @@ const props = defineProps({ const message = useMessage() // 消息弹窗 const route = useRoute() // 路由信息 const popoverVisible = ref(false) -const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action"))) +const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action" && !item.hiddenSearchHigh))) const moreListData = ref({ filters:[] }) diff --git a/src/views/eam/basic/basciYearEquipment/index.vue b/src/views/eam/basic/basciYearEquipment/index.vue index e11e831..c728771 100644 --- a/src/views/eam/basic/basciYearEquipment/index.vue +++ b/src/views/eam/basic/basciYearEquipment/index.vue @@ -170,13 +170,13 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { - // if (type == 'update') { - // BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factoryType').componentProps.disabled = true//编辑置灰 - // // BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factory_type').componentProps.disabled = true//编辑置灰 - // //BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'year_index').componentProps.disabled = true//编辑置灰 - // }else{ - // BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factoryType').componentProps.disabled = false//编辑置灰 - // } + if (type == 'update') { + BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'dataType').componentProps.disabled = true//编辑置灰 + // BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factory_type').componentProps.disabled = true//编辑置灰 + //BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'year_index').componentProps.disabled = true//编辑置灰 + }else{ + BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'dataType').componentProps.disabled = false//编辑置灰 + } basicFormRef.value.open(type, row) } diff --git a/src/views/eam/mold/moldAccounts/index.vue b/src/views/eam/mold/moldAccounts/index.vue index 0a36dd5..a04fb2a 100644 --- a/src/views/eam/mold/moldAccounts/index.vue +++ b/src/views/eam/mold/moldAccounts/index.vue @@ -16,6 +16,7 @@ @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="MoldAccountsSchema.allSchemas" + :key="count" /> @@ -441,18 +442,19 @@ onMounted(async () => { importTemplateData.templateUrl = await MoldAccountsApi.importTemplate() }) const init = () => { + console.log(route.name) if (route.name == 'withinMoldAccounts') { MoldAccountsSchema.value.allSchemas.formSchema = MoldAccounts.allSchemas.formSchema.filter(item => item.field !== 'outsourcedSuppliers') - MoldAccountsSchema.value.allSchemas.tableColumns = MoldAccounts.allSchemas.tableColumns.filter(item => item.field !== 'outsourcedSuppliers') - MoldAccountsSchema.value.allSchemas.searchSchema = MoldAccounts.allSchemas.searchSchema.filter(item => item.field !== 'outsourcedSuppliers') + MoldAccountsSchema.value.allSchemas.tableColumns = MoldAccounts.allSchemas.tableColumns.filter(item => item.field !== 'outsourcedSuppliers') tableObject.params = { sourceType: "0", } - } else { - MoldAccountsSchema.value.allSchemas.formSchema = MoldAccounts.allSchemas.formSchema.filter(item => item.field !== 'factoryAreaNumberDetail') - MoldAccountsSchema.value.allSchemas.tableColumns = MoldAccounts.allSchemas.tableColumns.filter(item => item.field !== 'factoryAreaNumberDetail') - MoldAccountsSchema.value.allSchemas.searchSchema = MoldAccounts.allSchemas.searchSchema.filter(item => item.field !== 'factoryAreaNumberDetail') - MoldAccountsSchema.value = cloneDeep(MoldAccounts) + } else if (route.name == 'outsideMoldAccounts') { + MoldAccountsSchema.value.allSchemas.formSchema = MoldAccounts.allSchemas.formSchema.filter(item => item.field !== 'factoryAreaNumber' ) + MoldAccountsSchema.value.allSchemas.tableColumns = MoldAccounts.allSchemas.tableColumns.filter(item => item.field !== 'factoryAreaNumber') + MoldAccountsSchema.value.allSchemas.detailSchema = MoldAccounts.allSchemas.detailSchema.filter(item => item.field !== 'factoryAreaNumberDetail') + MoldAccountsSchema.value.allSchemas.searchSchema = MoldAccounts.allSchemas.searchSchema.filter(item => item.field !== 'factoryAreaNumber') + // MoldAccountsSchema.value = cloneDeep(MoldAccounts) tableObject.params = { sourceType: "1", } diff --git a/src/views/eam/mold/moldAccounts/moldAccounts.data.ts b/src/views/eam/mold/moldAccounts/moldAccounts.data.ts index fa5cb89..dededc9 100644 --- a/src/views/eam/mold/moldAccounts/moldAccounts.data.ts +++ b/src/views/eam/mold/moldAccounts/moldAccounts.data.ts @@ -324,6 +324,7 @@ export const MoldAccounts = useCrudSchemas(reactive([ isSearch: true, isForm: true, isTable: true, + hiddenSearchHigh: false, table: { width: '150', fixed: 'left',