From a19214eb9f61838f4459f371db0c87a350e9803e Mon Sep 17 00:00:00 2001
From: yejiaxing <591141169@qq.com>
Date: Thu, 18 Jan 2024 09:39:46 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue |  7 +++++
 src/views/eam/basic/factoryArea/index.vue  | 20 +------------
 src/views/eam/basic/locationArea/index.vue | 33 +++++-----------------
 3 files changed, 15 insertions(+), 45 deletions(-)

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()
 })
 
 </script>
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 @@
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="LocationArea.allSchemas" />
 
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/location-area/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -63,9 +61,9 @@ import download from '@/utils/download'
 import { LocationArea,LocationAreaRules } from './locationArea.data'
 import * as LocationAreaApi from '@/api/eam/basic/locationArea'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-// import TableHead from '@/components/TableHead/src/TableHead.vue'
-// import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-// import Detail from '@/components/Detail/src/Detail.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
 
 defineOptions({ name: 'LocationArea' })
 
@@ -101,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:locationArea:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:locationArea:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:locationArea:export'}), // 导出
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -121,8 +119,6 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -151,6 +147,7 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  console.log('11')
   basicFormRef.value.open(type, row)
 }
 
@@ -198,21 +195,6 @@ const handleExport = async () => {
   }
 }
 
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '库区导入模版.xls'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -225,7 +207,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await LocationAreaApi.importTemplate()
 })
 
 </script>