diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 2bc0c4d..90946a2 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -333,12 +333,17 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { /** 打开弹窗 */ const open = async (type: string, row?: any, masterParmas?: any) => { + console.log(2222) dialogVisible.value = true + console.log(333) dialogTitle.value = t('action.' + type) + console.log(444) formType.value = type + console.log(66) resetForm() // 修改时,设置数据 // 如果是从主表的详情页面进图添加子表,需要添加masterId,number参数 + console.log(77) if (masterParmas) { if (!row) { row = { @@ -347,8 +352,10 @@ const open = async (type: string, row?: any, masterParmas?: any) => { } } } + console.log(8) if (row?.id || row?.masterId) { formLoading.value = true + console.log(99) try { nextTick(() => { formRef.value.setValues(row) diff --git a/src/views/eam/basic/factoryArea/index.vue b/src/views/eam/basic/factoryArea/index.vue index a188c3e..f5c6964 100644 --- a/src/views/eam/basic/factoryArea/index.vue +++ b/src/views/eam/basic/factoryArea/index.vue @@ -119,9 +119,7 @@ const HeadButttondata = [ const buttonBaseClick = (val, item) => { if (val == 'add') { // 新增 openForm('create') - } else if (val == 'import') { // 导入 - handleImport() - } else if (val == 'export') { // 导出 + }else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 getList() @@ -211,21 +209,6 @@ const handleExport = async () => { } } -/** 导入 */ -const importFormRef = ref() -const handleImport = () => { - importFormRef.value.open() -} -// 导入附件弹窗所需的参数 -const importTemplateData = reactive({ - templateUrl: '', - templateTitle: '厂区导入模版.xlsx' -}) -// 导入成功之后 -const importSuccess = () => { - getList() -} - // 筛选提交 const searchFormClick = (searchData) => { tableObject.params = { @@ -238,7 +221,6 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { getList() - importTemplateData.templateUrl = await FactoryAreaApi.importTemplate() }) diff --git a/src/views/eam/basic/locationArea/index.vue b/src/views/eam/basic/locationArea/index.vue index 684cced..530687b 100644 --- a/src/views/eam/basic/locationArea/index.vue +++ b/src/views/eam/basic/locationArea/index.vue @@ -54,8 +54,6 @@ - -