From abb5b0c22ca6e5b39331d4bcf47a02799e2d6ca5 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 14 May 2024 10:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=90=88=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/basic/item/index.vue           | 465 ++++++++-------
 src/views/eam/basic/item/item.data.ts        |   2 +
 src/views/eam/item/itemAccounts/index.vue    | 587 ++++++++++---------
 src/views/eam/item/itemInLocation/index.vue  | 382 ++++++------
 src/views/eam/item/itemOutLocation/index.vue | 143 +++--
 5 files changed, 871 insertions(+), 708 deletions(-)

diff --git a/src/views/eam/basic/item/index.vue b/src/views/eam/basic/item/index.vue
index 1ee33fa..52d0cde 100644
--- a/src/views/eam/basic/item/index.vue
+++ b/src/views/eam/basic/item/index.vue
@@ -1,199 +1,239 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Item.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Item.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Item.allSchemas" />
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Item.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
-      <template #code="{row}">
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemRules" :formAllSchemas="Item.allSchemas"
-    :apiUpdate="ItemApi.updateItem" :apiCreate="ItemApi.createItem" @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false" />
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ItemRules"
+    :formAllSchemas="Item.allSchemas"
+    :apiUpdate="ItemApi.updateItem"
+    :apiCreate="ItemApi.createItem"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
 
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Item.allSchemas" />
-  
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/item/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/item/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { Item, ItemRules } from './item.data'
-  import * as ItemApi from '@/api/eam/basic/item'
-  import { createDeviceItemBatch, getDeviceItemPage, getDeviceItemNoPage } from '@/api/eam/basic/rel'
-  import { DeviceAccounts, DeviceAccountsRules } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
-  import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
-  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 { SearchTable } from '@/components/SearchTable'
-
-  defineOptions({ name: 'Item' })
+import download from '@/utils/download'
+import { Item, ItemRules } from './item.data'
+import * as ItemApi from '@/api/eam/basic/item'
+import { createDeviceItemBatch, getDeviceItemPage, getDeviceItemNoPage } from '@/api/eam/basic/rel'
+import {
+  DeviceAccounts,
+  DeviceAccountsRules
+} from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
+import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+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 { SearchTable } from '@/components/SearchTable'
 
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const itemNumber = ref();
-  const tableColumns = ref(Item.allSchemas.tableColumns)
-  const importFormRef = ref()
+defineOptions({ name: 'Item' })
 
-  // 查询页面返回
-  const searchTableSuccess = (formField, searchField, val, formRef) => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      formRef.setValues(setV)
-    })
-  }
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const itemNumber = ref()
+const tableColumns = ref(Item.allSchemas.tableColumns)
+const importFormRef = ref()
 
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
-
-  const { tableObject, tableMethods } = useTable({
-    getListApi: ItemApi.getItemPage // 分页接口
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
   })
+}
 
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
 
-  // 列表头部按钮
-  const HeadButttondata = [
-    defaultButtons.defaultAddBtn({ hasPermi: 'basic:item:create' }), // 新增
-    defaultButtons.defaultImportBtn(null), // 导入
-    defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), // 导出
-    defaultButtons.defaultFreshBtn(null), // 刷新
-    defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
-  ]
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItemApi.getItemPage // 分页接口
+})
 
-  // 头部按钮事件
-  const buttonBaseClick = (val, item) => {
-    if (val == 'add') { // 新增
-      openForm('create')
-    }else if (val == 'import') { // 导入
-      handleImport()
-    } else if (val == 'export') { // 导出
-      handleExport()
-    } else if (val == 'refresh') { // 刷新
-      getList()
-    } else if (val == 'filtrate') { // 筛选
-    } else { // 其他按钮
-      console.log('其他按钮', item)
-    }
-  }
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
 
-  // 列表-操作按钮
-  const butttondata = [
-    defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // 编辑
-    defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), // 删除
-  ]
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'basic:item:create' }), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
 
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
-    } else if (val == 'chooseDevice') {
-      openItem(row.number)
-    } else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    }
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
   }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }) // 删除
+]
 
-  const searchTableRef = ref()
-  /** 绑定备件操作 */
-  const openItem = async (number : String) => {
-    itemNumber.value = number
-    await CallBack1()
-    searchTableRef.value.open(
-      '选择设备',
-      DeviceAccounts.allSchemas,
-      DeviceAccountsApi.getDeviceAccountsPage,
-      null,
-      DeviceAccounts.allSchemas.searchSchema,
-      true,
-      null,
-      null,
-      null,
-      null,
-      searchTableSelections.value
-    )
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'chooseDevice') {
+    openItem(row.number)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
   }
+}
 
-  const searchTableSelections = ref([])
-  const CallBack1 = async () => {
-    await getDeviceItemNoPage({ itemNumber: itemNumber.value }).then(async (res) => {
-      await DeviceAccountsApi.getDeviceAccountsAllNoPage({}).then(response => {
-        searchTableSelections.value = response.filter(element => {
-          let flag = false;
-          res.forEach(item => {
-            if (element.number == item.deviceNumber) {
-              flag = true;
-            }
-          });
-          return flag;
-        });
-      });
-    });
-  };
+const searchTableRef = ref()
+/** 绑定备件操作 */
+const openItem = async (number: String) => {
+  itemNumber.value = number
+  await CallBack1()
+  searchTableRef.value.open(
+    '选择设备',
+    DeviceAccounts.allSchemas,
+    DeviceAccountsApi.getDeviceAccountsPage,
+    null,
+    DeviceAccounts.allSchemas.searchSchema,
+    true,
+    null,
+    null,
+    null,
+    null,
+    searchTableSelections.value
+  )
+}
 
-  const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
-    const deviceItemRelList = selections.map(element => ({
-      itemNumber: itemNumber.value,
-      deviceNumber: element.number,
-    }));
-    createDeviceItemBatch(deviceItemRelList).then(res => {
-      message.success(t('common.createSuccess'))
+const searchTableSelections = ref([])
+const CallBack1 = async () => {
+  await getDeviceItemNoPage({ itemNumber: itemNumber.value }).then(async (res) => {
+    await DeviceAccountsApi.getDeviceAccountsAllNoPage({}).then((response) => {
+      searchTableSelections.value = response.filter((element) => {
+        let flag = false
+        res.forEach((item) => {
+          if (element.number == item.deviceNumber) {
+            flag = true
+          }
+        })
+        return flag
+      })
     })
-  };
+  })
+}
 
-  /** 添加/修改操作 */
-  const basicFormRef = ref()
-  const openForm = (type : string, row ?: any) => {
-    basicFormRef.value.open(type, row)
-  }
+const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
+  const deviceItemRelList = selections.map((element) => ({
+    itemNumber: itemNumber.value,
+    deviceNumber: element.number
+  }))
+  createDeviceItemBatch(deviceItemRelList).then((res) => {
+    message.success(t('common.createSuccess'))
+  })
+}
 
-  // form表单提交
-  const formsSuccess = async (formType, data) => {
-    var isHave = Item.allSchemas.formSchema.some(function (item) {
-      return item.field === 'maxInventory' || item.field === 'minInventory';
-    });
-    if (isHave) {
-      if (data.minInventory && data.maxInventory && data.minInventory >= data.maxInventory) {
-        message.error('最高库存要大于最低库存')
-        return false;
-      }
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  var isHave = Item.allSchemas.formSchema.some(function (item) {
+    return item.field === 'maxInventory' || item.field === 'minInventory'
+  })
+  if (isHave) {
+    if (data.minInventory && data.maxInventory && data.minInventory >= data.maxInventory) {
+      message.error('最高库存要大于最低库存')
+      return false
     }
-    if (data.maxInventory == 0) data.maxInventory = null;
-    if (data.minInventory == 0) data.minInventory = null;
+  }
+  if (data.maxInventory == 0) data.maxInventory = null
+  if (data.minInventory == 0) data.minInventory = null
+  try {
     if (formType === 'create') {
       await ItemApi.createItem(data)
       message.success(t('common.createSuccess'))
@@ -203,73 +243,76 @@
     }
     basicFormRef.value.dialogVisible = false
     getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
+}
 
-  /** 详情操作 */
-  const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue, 'basicItem')
-  }
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicItem')
+}
 
-  /** 删除按钮操作 */
-  const handleDelete = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await ItemApi.deleteItem(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemApi.deleteItem(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await ItemApi.exportItem(tableObject.params)
-      download.excel(data, '备件.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
-  }
-  
-  onMounted(async () => {
-    importTemplateData.templateUrl = await ItemApi.importTemplate()
-  })
-  
-  const handleImport = () => {
-    importFormRef.value.open()
-  }
-  
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '物料导入模版.xlsx'
-  })
-  
-  // 导入成功之后
-  const importSuccess = () => {
-    getList()
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItemApi.exportItem(tableObject.params)
+    download.excel(data, '备件.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
-  
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+}
+
+onMounted(async () => {
+  importTemplateData.templateUrl = await ItemApi.importTemplate()
+})
+
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物料导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
+  getList() // 刷新当前列表
+}
 
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-  })
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
 </script>
diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts
index 748a4b2..82d5141 100644
--- a/src/views/eam/basic/item/item.data.ts
+++ b/src/views/eam/basic/item/item.data.ts
@@ -10,6 +10,8 @@ export const ItemRules = reactive({
   uom: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  classification: [ { required: true, message: '请输入备件编号', trigger: 'blur' }
+  ],
 })
 
 export const ItemSearchTable = useCrudSchemas(reactive<CrudSchema[]>([
diff --git a/src/views/eam/item/itemAccounts/index.vue b/src/views/eam/item/itemAccounts/index.vue
index 390ddaf..7088a0a 100644
--- a/src/views/eam/item/itemAccounts/index.vue
+++ b/src/views/eam/item/itemAccounts/index.vue
@@ -1,38 +1,72 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ItemAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="ItemAccounts.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="ItemAccounts.allSchemas" />
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="ItemAccounts.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
-      <template #code="{row}">
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemAccountsRules"
-    :formAllSchemas="ItemAccounts.allSchemas" :apiUpdate="ItemAccountsApi.updateItemAccounts"
-    :apiCreate="ItemAccountsApi.createItemAccounts" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ItemAccountsRules"
+    :formAllSchemas="ItemAccounts.allSchemas"
+    :apiUpdate="ItemAccountsApi.updateItemAccounts"
+    :apiCreate="ItemAccountsApi.createItemAccounts"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
 
-    <BasicForm ref="basicFormRef1" @success="formsSuccess" :rules="ItemInRules"
-    :formAllSchemas="ItemIn.allSchemas" :apiUpdate="ItemAccountsApi.updateItemAccounts"
-    :apiCreate="ItemAccountsApi.createItemAccounts" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
+  <BasicForm
+    ref="basicFormRef1"
+    @success="formsSuccess"
+    :rules="ItemInRules"
+    :formAllSchemas="ItemIn.allSchemas"
+    :apiUpdate="ItemAccountsApi.updateItemAccounts"
+    :apiCreate="ItemAccountsApi.createItemAccounts"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
 
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
@@ -40,39 +74,45 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemAccounts.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/item/item-accounts/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/item/item-accounts/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { ItemAccounts, ItemAccountsRules } from './itemAccounts.data'
-  import { ItemIn, ItemInRules } from './itemIn.data'
-  import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
-  import { Item } from '@/views/eam/basic/item/item.data'
-  import * as ItemApi from '@/api/eam/basic/item'
-  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 download from '@/utils/download'
+import { ItemAccounts, ItemAccountsRules } from './itemAccounts.data'
+import { ItemIn, ItemInRules } from './itemIn.data'
+import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
+import { Item } from '@/views/eam/basic/item/item.data'
+import * as ItemApi from '@/api/eam/basic/item'
+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'
 
-  defineOptions({ name: 'ItemAccounts' })
+defineOptions({ name: 'ItemAccounts' })
 
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  const locationNumber = ref()
-  const wantId1 = ref()
-  routeName.value = route.name
-  const tableColumns = ref(ItemAccounts.allSchemas.tableColumns)
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+const locationNumber = ref()
+const wantId1 = ref()
+routeName.value = route.name
+const tableColumns = ref(ItemAccounts.allSchemas.tableColumns)
 
-  // 查询页面返回
-  const searchTableSuccess = async(formField, searchField, val, formRef) => {//表单选中表格后走的方法
-    if(formField=='itemNumber'){
-      const aa = await ItemAccountsApi.getByItemNumber(val[0][searchField]);
-      if(aa.locationNumber==null||aa.locationNumber==''){//该备件无台账
-        nextTick(() => {
+// 查询页面返回
+const searchTableSuccess = async (formField, searchField, val, formRef) => {
+  //表单选中表格后走的方法
+  if (formField == 'itemNumber') {
+    const aa = await ItemAccountsApi.getByItemNumber(val[0][searchField])
+    if (aa.locationNumber == null || aa.locationNumber == '') {
+      //该备件无台账
+      nextTick(() => {
         const setV = {}
         setV[formField] = val[0][searchField]
         setV['itemName'] = val[0]['name']
@@ -80,275 +120,294 @@
         setV['areaNumber'] = ''
         setV['locationName'] = ''
         setV['areaName'] = ''
-      formRef.setValues(setV)
+        formRef.setValues(setV)
       })
-      }else{//有台账直接回显
-        nextTick(() => {
+    } else {
+      //有台账直接回显
+      nextTick(() => {
         const setV = {}
         setV[formField] = val[0][searchField]
         setV['itemName'] = val[0]['name']
         setV['locationNumber'] = aa.locationNumber
-        setV['areaNumber'] =aa.areaNumber
+        setV['areaNumber'] = aa.areaNumber
         setV['locationName'] = aa.locationName
-        setV['areaName'] =aa.areaName
-      formRef.setValues(setV)
-      })
-      }
-    }if(formField=='locationNumber'){//选中库位编号给库区编号赋值
-      nextTick(() => {
-        const setV = {}
-        setV[formField] = val[0][searchField]
-        setV['areaNumber'] = val[0]['areaNumber']
-        formRef.setValues(setV)
-      })
-    }else{
-      nextTick(() => {
-        const setV = {}
-        setV[formField] = val[0][searchField]
+        setV['areaName'] = aa.areaName
         formRef.setValues(setV)
       })
     }
-    
   }
-
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
+  if (formField == 'locationNumber') {
+    //选中库位编号给库区编号赋值
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['areaNumber'] = val[0]['areaNumber']
+      formRef.setValues(setV)
+    })
+  } else {
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    })
   }
+}
 
-  const { tableObject, tableMethods } = useTable({
-    getListApi: ItemAccountsApi.getItemAccountsPage // 分页接口
-  })
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
 
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItemAccountsApi.getItemAccountsPage // 分页接口
+})
 
-  // 列表头部按钮
-  const HeadButttondata = [
-    defaultButtons.defaultAddBtn({ hasPermi: 'item:itemAccounts:create' }), // 新增
-    //defaultButtons.ItemInBtn({ hasPermi: 'item:itemAccounts:createIn' }), // 新增入库
-    defaultButtons.defaultImportBtn({ hasPermi: 'item:itemAccounts:import' }), // 导入
-    defaultButtons.defaultExportBtn({ hasPermi: 'item:itemAccounts:export' }), // 导出
-    defaultButtons.defaultFreshBtn(null), // 刷新
-    //defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
-    // {
-    //   label: '自定义扩展按钮',
-    //   name: 'zdy',
-    //   hide: false,
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   color: ''
-    // },
-  ]
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
 
-  // 头部按钮事件
-  const buttonBaseClick = (val, item) => {
-    if (val == 'add') { // 新增
-      openForm('create')
-    } else if (val == 'import') { // 导入
-      handleImport()
-    } else if (val == 'export') { // 导出
-      handleExport()
-    } else if (val == 'refresh') { // 刷新
-      getList()
-    } else if (val == 'filtrate') { // 筛选
-    } else if(val=='itemIn'){ // 备件入库
-      openForm('itemIn')
-    }
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'item:itemAccounts:create' }), // 新增
+  //defaultButtons.ItemInBtn({ hasPermi: 'item:itemAccounts:createIn' }), // 新增入库
+  defaultButtons.defaultImportBtn({ hasPermi: 'item:itemAccounts:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'item:itemAccounts:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  //defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else if (val == 'itemIn') {
+    // 备件入库
+    openForm('itemIn')
   }
+}
 
-  // 列表-操作按钮
-  const butttondata =(row)=>{
-    return [
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
     //defaultButtons.mainListEditBtn({ hasPermi: 'item:itemAccounts:update' }), // 编辑
-    defaultButtons.replaceLocation({ hasPermi: 'item:itemAccounts:replaceLocation',hide:!(row.display)}),  //更换库位
-    defaultButtons.newTurnIn({ hasPermi: 'item:itemAccounts:newTurnIn',hide:!(row.type=='2'&& row.qty>0)}),  //新到货转账内
+    defaultButtons.replaceLocation({
+      hasPermi: 'item:itemAccounts:replaceLocation',
+      hide: !row.display
+    }), //更换库位
+    defaultButtons.newTurnIn({
+      hasPermi: 'item:itemAccounts:newTurnIn',
+      hide: !(row.type == '2' && row.qty > 0)
+    }) //新到货转账内
     //defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemAccounts:delete' }), // 删除
   ]
-  } 
+}
 
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
-    } else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    } else if (val == 'replaceLocation') {//更换库位
-      openItem(row.locationNumber, row.id)
-    }else if (val == 'newTurnIn') {//到货转账内
-      openForm('newTurnIn', row);
-    }
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else if (val == 'replaceLocation') {
+    //更换库位
+    openItem(row.locationNumber, row.id)
+  } else if (val == 'newTurnIn') {
+    //到货转账内
+    openForm('newTurnIn', row)
   }
+}
 
-  const searchTableRef = ref()
-  /** 绑定备件操作 */
-  const openItem = async (number : String, wantId : number) => {
-    locationNumber.value = number
-    wantId1.value = wantId
-    searchTableRef.value.open(
-      '选择备件',
-     Item.allSchemas,
-     ItemApi.getNoAccountItemPage,
-      null,
-      Item.allSchemas.searchSchema,
-      true,
-      null,
-      null,
-      null,
-      null
-    )
-  }
-  const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
-    const deviceItemRelList = selections.map((element) => ({
-     id: wantId1.value,
-     locationNumber: locationNumber.value,
-     itemNumber: element.number,
-    }))
-    ItemAccountsApi.replaceLocation(deviceItemRelList).then((res) => {
-      message.success(t('更换成功'))
-      // 刷新列表
-      getList()
-    })
-  }
-
-  const getItemWithOutBind = async () => {
-    try {
-      const res = await ItemApi.getItemPage({
-        ...Item.allSchemas.searchSchema,
-        available: "TRUE"
+const searchTableRef = ref()
+/** 绑定备件操作 */
+const openItem = async (number: String, wantId: number) => {
+  locationNumber.value = number
+  wantId1.value = wantId
+  searchTableRef.value.open(
+    '选择备件',
+    Item.allSchemas,
+    ItemApi.getNoAccountItemPage,
+    null,
+    Item.allSchemas.searchSchema,
+    true,
+    null,
+    null,
+    null,
+    null
+  )
+}
+const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
+  const deviceItemRelList = selections.map((element) => ({
+    id: wantId1.value,
+    locationNumber: locationNumber.value,
+    itemNumber: element.number
+  }))
+  ItemAccountsApi.replaceLocation(deviceItemRelList).then((res) => {
+    message.success(t('更换成功'))
+    // 刷新列表
+    getList()
+  })
+}
 
-      })
-      if (res.list?.length > 0) {
-        // const response = await getDeviceItemPage(DeviceAccounts.allSchemas.searchSchema);
-        // const filteredList = res.list.filter(item => {
-        //   return !response.list?.some(element => {
-        //     return item.number === element.itemNumber
-        //   });
-        // });
-        // console.log('filteredList',filteredList);
-        const filteredList = res.list
-        return filteredList // 返回过滤后的列表
-      }
-      return [] // 如果没有数据，返回空数组
-    } catch (error) {
-      console.error(error)
-      throw error // 抛出错误
+const getItemWithOutBind = async () => {
+  try {
+    const res = await ItemApi.getItemPage({
+      ...Item.allSchemas.searchSchema,
+      available: 'TRUE'
+    })
+    if (res.list?.length > 0) {
+      // const response = await getDeviceItemPage(DeviceAccounts.allSchemas.searchSchema);
+      // const filteredList = res.list.filter(item => {
+      //   return !response.list?.some(element => {
+      //     return item.number === element.itemNumber
+      //   });
+      // });
+      // console.log('filteredList',filteredList);
+      const filteredList = res.list
+      return filteredList // 返回过滤后的列表
     }
+    return [] // 如果没有数据，返回空数组
+  } catch (error) {
+    console.error(error)
+    throw error // 抛出错误
   }
+}
 
-  /** 添加/修改操作 */
-  const basicFormRef = ref()
-  const basicFormRef1 = ref();
-  const openForm = (type : string, row ?: any) => {
-    //debugger
-    // if(type=='itemIn'){
-    //   row?.type = null;
-    //   row?.itemName=null;
-    // }
-    if(type=='newTurnIn'){//到货转账内
-      //控制数量最大不能查过当前值
-      ItemIn.allSchemas.formSchema.find(item => item.field == 'qty').componentProps.max = row.qty//编辑置灰
-      basicFormRef1.value.open(type, row)
-    }else{
-      basicFormRef.value.open(type, row)
-    }
-    
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const basicFormRef1 = ref()
+const openForm = (type: string, row?: any) => {
+  //debugger
+  // if(type=='itemIn'){
+  //   row?.type = null;
+  //   row?.itemName=null;
+  // }
+  if (type == 'newTurnIn') {
+    //到货转账内
+    //控制数量最大不能查过当前值
+    ItemIn.allSchemas.formSchema.find((item) => item.field == 'qty').componentProps.max = row.qty //编辑置灰
+    basicFormRef1.value.open(type, row)
+  } else {
+    basicFormRef.value.open(type, row)
   }
+}
 
-  // form表单提交
-  const formsSuccess = async (formType, data) => {
-    var isHave = ItemAccounts.allSchemas.formSchema.some(function (item) {
-      return item.field === 'activeTime' || item.field === 'expireTime';
-    });
-    if (isHave) {
-      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
-        message.error('失效时间要大于生效时间')
-        return;
-      }
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  var isHave = ItemAccounts.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+      message.error('失效时间要大于生效时间')
+      return
     }
-    if (data.activeTime == 0) data.activeTime = null;
-    if (data.expireTime == 0) data.expireTime = null;
-    try{
-      if (formType === 'create') {
+  }
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
+    if (formType === 'create') {
       await ItemAccountsApi.createItemAccounts(data)
       message.success(t('common.createSuccess'))
-    } if (formType === 'newTurnIn') {//新到货转账内
+    }
+    if (formType === 'newTurnIn') {
+      //新到货转账内
       await ItemAccountsApi.newTurnIn(data)
       message.success(t('common.createSuccess'))
     } else {
       await ItemAccountsApi.updateItemAccounts(data)
       message.success(t('common.updateSuccess'))
-    }
-    }finally{
       basicFormRef.value.dialogVisible = false
-      basicFormRef1.value.dialogVisible = false
+      getList()
     }
-    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
+}
 
-  /** 详情操作 */
-  const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue, 'basicItemAccounts')
-  }
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicItemAccounts')
+}
 
-  /** 删除按钮操作 */
-  const handleDelete = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await ItemAccountsApi.deleteItemAccounts(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemAccountsApi.deleteItemAccounts(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await ItemAccountsApi.exportItemAccounts(tableObject.params)
-      download.excel(data, '备件台账.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItemAccountsApi.exportItemAccounts(tableObject.params)
+    download.excel(data, '备件台账.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
 
-  /** 导入 */
-  const importFormRef = ref()
-  const handleImport = () => {
-    importFormRef.value.open()
-  }
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '备件台账导入模版.xlsx'
-  })
-  // 导入成功之后
-  const importSuccess = () => {
-    getList()
-  }
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '备件台账导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
 
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
+  getList() // 刷新当前列表
+}
 
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    importTemplateData.templateUrl = await ItemAccountsApi.importTemplate()
-  })
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ItemAccountsApi.importTemplate()
+})
 </script>
diff --git a/src/views/eam/item/itemInLocation/index.vue b/src/views/eam/item/itemInLocation/index.vue
index 754c758..f1d1d95 100644
--- a/src/views/eam/item/itemInLocation/index.vue
+++ b/src/views/eam/item/itemInLocation/index.vue
@@ -1,167 +1,202 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ItemInLocation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="ItemInLocation.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="ItemInLocation.allSchemas" />
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="ItemInLocation.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort">
-      <template #code="{row}">
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemInLocationRules"
-    :formAllSchemas="ItemInLocation.allSchemas" :apiUpdate="ItemInLocationApi.updateItemInLocation"
-    :apiCreate="ItemInLocationApi.createItemInLocation" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ItemInLocationRules"
+    :formAllSchemas="ItemInLocation.allSchemas"
+    :apiUpdate="ItemInLocationApi.updateItemInLocation"
+    :apiCreate="ItemInLocationApi.createItemInLocation"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemInLocation.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/record/item-in-location/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/record/item-in-location/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { ItemInLocation, ItemInLocationRules } from './itemInLocation.data'
-  import * as ItemInLocationApi from '@/api/eam/item/itemInLocation'
-  import * as ItemAccountApi from '@/api/eam/item/itemAccounts'
-  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'
-
-  defineOptions({ name: 'ItemInLocation' })
-
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(ItemInLocation.allSchemas.tableColumns)
-
-  // 查询页面返回
-  const searchTableSuccess = async(formField, searchField, val, formRef) => {
-    const ret = await ItemAccountApi.getByLocationNumber(val[0][searchField]);
-    if(ret.itemNumber==null || ret.itemNumber=='' || !ret.itemNumber){
-      nextTick(() => {
+import download from '@/utils/download'
+import { ItemInLocation, ItemInLocationRules } from './itemInLocation.data'
+import * as ItemInLocationApi from '@/api/eam/item/itemInLocation'
+import * as ItemAccountApi from '@/api/eam/item/itemAccounts'
+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'
+
+defineOptions({ name: 'ItemInLocation' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ItemInLocation.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = async (formField, searchField, val, formRef) => {
+  const ret = await ItemAccountApi.getByLocationNumber(val[0][searchField])
+  if (ret.itemNumber == null || ret.itemNumber == '' || !ret.itemNumber) {
+    nextTick(() => {
       const setV = {}
-      setV[formField] = '';
+      setV[formField] = ''
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
       message.info('该库位下无绑定的备件')
-        return;
+      return
     })
-    }else{
-      nextTick(() => {
+  } else {
+    nextTick(() => {
       const setV = {}
       setV['itemNumber'] = ret.itemNumber
       setV['itemName'] = ret.itemName
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     })
-    }
-    
   }
+}
 
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
 
-  const { tableObject, tableMethods } = useTable({
-    getListApi: ItemInLocationApi.getItemInLocationPage // 分页接口
-  })
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItemInLocationApi.getItemInLocationPage // 分页接口
+})
 
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
-
-  // 列表头部按钮
-  const HeadButttondata = [
-    defaultButtons.defaultAddBtn({ hasPermi: 'item:itemInLocation:create' }), // 新增
-    defaultButtons.defaultExportBtn({ hasPermi: 'item:itemInLocation:export' }), // 导出
-    defaultButtons.defaultFreshBtn(null), // 刷新
-    defaultButtons.defaultFilterBtn(null), // 筛选
-    defaultButtons.defaultSetBtn(null), // 设置
-    // {
-    //   label: '自定义扩展按钮',
-    //   name: 'zdy',
-    //   hide: false,
-    //   type: 'primary',
-    //   icon: 'Select',
-    //   color: ''
-    // },
-  ]
-
-  // 头部按钮事件
-  const buttonBaseClick = (val, item) => {
-    if (val == 'add') { // 新增
-      openForm('create')
-    } else if (val == 'import') { // 导入
-      handleImport()
-    } else if (val == 'export') { // 导出
-      handleExport()
-    } else if (val == 'refresh') { // 刷新
-      getList()
-    } else if (val == 'filtrate') { // 筛选
-    } else { // 其他按钮
-      console.log('其他按钮', item)
-    }
-  }
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
 
-  // 列表-操作按钮
-  const butttondata = [
-    defaultButtons.mainListEditBtn({ hasPermi: 'item:itemInLocation:update' }), // 编辑
-    defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemInLocation:delete' }), // 删除
-  ]
-
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
-    } else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    }
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'item:itemInLocation:create' }), // 新增
+  defaultButtons.defaultExportBtn({ hasPermi: 'item:itemInLocation:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
   }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'item:itemInLocation:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemInLocation:delete' }) // 删除
+]
 
-  /** 添加/修改操作 */
-  const basicFormRef = ref()
-  const openForm = (type : string, row ?: any) => {
-    basicFormRef.value.open(type, row)
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
   }
+}
 
-  // form表单提交
-  const formsSuccess = async (formType, data) => {
-    var isHave = ItemInLocation.allSchemas.formSchema.some(function (item) {
-      return item.field === 'activeTime' || item.field === 'expireTime';
-    });
-    if (isHave) {
-      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
-        message.error('失效时间要大于生效时间')
-        return;
-      }
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  var isHave = ItemInLocation.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+      message.error('失效时间要大于生效时间')
+      return
     }
-    if (data.activeTime == 0) data.activeTime = null;
-    if (data.expireTime == 0) data.expireTime = null;
+  }
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
     if (formType === 'create') {
       await ItemInLocationApi.createItemInLocation(data)
       message.success(t('common.createSuccess'))
@@ -171,70 +206,73 @@
     }
     basicFormRef.value.dialogVisible = false
     getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
+}
 
-  /** 详情操作 */
-  const detailRef = ref()
-  const openDetail = (row : any, titleName : any, titleValue : any) => {
-    detailRef.value.openDetail(row, titleName, titleValue, 'basicItemInLocation')
-  }
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicItemInLocation')
+}
 
-  /** 删除按钮操作 */
-  const handleDelete = async (id : number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await ItemInLocationApi.deleteItemInLocation(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemInLocationApi.deleteItemInLocation(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await ItemInLocationApi.exportItemInLocation(tableObject.params)
-      download.excel(data, '备件归还记录.xlsx')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItemInLocationApi.exportItemInLocation(tableObject.params)
+    download.excel(data, '备件归还记录.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
 
-  /** 导入 */
-  const importFormRef = ref()
-  const handleImport = () => {
-    importFormRef.value.open()
-  }
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '备件入库记录导入模版.xlsx'
-  })
-  // 导入成功之后
-  const importSuccess = () => {
-    getList()
-  }
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '备件入库记录导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
 
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
+  getList() // 刷新当前列表
+}
 
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    importTemplateData.templateUrl = await ItemInLocationApi.importTemplate()
-  })
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ItemInLocationApi.importTemplate()
+})
 </script>
diff --git a/src/views/eam/item/itemOutLocation/index.vue b/src/views/eam/item/itemOutLocation/index.vue
index 9429f2b..31c110b 100644
--- a/src/views/eam/item/itemOutLocation/index.vue
+++ b/src/views/eam/item/itemOutLocation/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ItemOutLocation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="ItemOutLocation.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ItemOutLocation.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="ItemOutLocation.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +58,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemOutLocation.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/record/item-out-location/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/record/item-out-location/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ItemOutLocation,ItemOutLocationRules } from './itemOutLocation.data'
+import { ItemOutLocation, ItemOutLocationRules } from './itemOutLocation.data'
 import * as ItemOutLocationApi from '@/api/eam/item/itemOutLocation'
 import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -78,25 +87,26 @@ routeName.value = route.name
 const tableColumns = ref(ItemOutLocation.allSchemas.tableColumns)
 
 // 查询页面返回
-const searchTableSuccess = async(formField, searchField, val, formRef) => {
-  if(formField=='locationNumber'){//根据库位号查询
-    let aa = await ItemAccountsApi.getByLocationNumber(val[0][searchField]);
-    if(aa.id==null){
-      message.info("该库位下无备件信息");
-      return;
+const searchTableSuccess = async (formField, searchField, val, formRef) => {
+  if (formField == 'locationNumber') {
+    //根据库位号查询
+    let aa = await ItemAccountsApi.getByLocationNumber(val[0][searchField])
+    if (aa.id == null) {
+      message.info('该库位下无备件信息')
+      return
     }
     nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    setV['locationName'] = val[0]['name']
-    setV['itemName'] = aa.itemName
-    setV['itemNumber'] = aa.itemNumber
-    setV['qty'] = aa.qty
-    ItemOutLocation.allSchemas.formSchema.find(item => item.field == 'qty').componentProps.max = aa.qty//出库数量不能大于所有库存数
-    formRef.setValues(setV)
-  })
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['locationName'] = val[0]['name']
+      setV['itemName'] = aa.itemName
+      setV['itemNumber'] = aa.itemNumber
+      setV['qty'] = aa.qty
+      ItemOutLocation.allSchemas.formSchema.find((item) => item.field == 'qty').componentProps.max =
+        aa.qty //出库数量不能大于所有库存数
+      formRef.setValues(setV)
+    })
   }
-  
 }
 
 // 字段设置 更新主列表字段
@@ -113,11 +123,11 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'item:itemOutLocation:create'}), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:'item:itemOutLocation:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'item:itemOutLocation:create' }), // 新增
+  defaultButtons.defaultExportBtn({ hasPermi: 'item:itemOutLocation:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -130,31 +140,39 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'item:itemOutLocation:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'item:itemOutLocation:delete'}), // 删除
+  defaultButtons.mainListEditBtn({ hasPermi: 'item:itemOutLocation:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemOutLocation:delete' }) // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -166,27 +184,31 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ItemOutLocation.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = ItemOutLocation.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
       message.error('失效时间要大于生效时间')
-      return;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await ItemOutLocationApi.createItemOutLocation(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ItemOutLocationApi.updateItemOutLocation(data)
-    message.success(t('common.updateSuccess'))
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  try {
+    if (formType === 'create') {
+      await ItemOutLocationApi.createItemOutLocation(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ItemOutLocationApi.updateItemOutLocation(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -253,5 +275,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ItemOutLocationApi.importTemplate()
 })
-
 </script>