From c77654206e6db49a48fee7e52060e57b382434b9 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Wed, 21 May 2025 11:04:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=94=B3=E9=A2=86?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/item/itemApplyMain/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/eam/item/itemApplyMain/index.vue b/src/views/eam/item/itemApplyMain/index.vue
index f061583..4264015 100644
--- a/src/views/eam/item/itemApplyMain/index.vue
+++ b/src/views/eam/item/itemApplyMain/index.vue
@@ -304,7 +304,7 @@
         if (item.qty > item.availableQty) {
           console.log("item.qty",item.qty);
           console.log("item.availableQty",item.availableQty);
-          message.error('备件编号' + item.itemNumber + '要货计划数量不得大于订单可申请库存数量')
+          message.error('备件编号' + item.itemNumber + '申领数量不得大于订单可申请库存数量')
           return false;
         }
       }

From 30e5e2f18eecdb6f5f2d55c856733686f9e54df5 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Wed, 21 May 2025 11:29:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?SBBJ-982=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/device/deviceAccounts/index.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/eam/device/deviceAccounts/index.ts b/src/api/eam/device/deviceAccounts/index.ts
index 5ecc4ac..e8fad04 100644
--- a/src/api/eam/device/deviceAccounts/index.ts
+++ b/src/api/eam/device/deviceAccounts/index.ts
@@ -51,7 +51,12 @@ export const deleteDeviceAccounts = async (id: number) => {
 
 // 导出设备台账 Excel
 export const exportDeviceAccounts = async (params) => {
-  return await request.download({ url: `/eam/device-accounts/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/device-accounts/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/eam/device-accounts/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

From 8e520293d136dcdf088ae3321c456084eb616d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E5=BA=86=E6=BA=90?= <qingyuan.zeng@ccwin-in.com>
Date: Wed, 21 May 2025 14:44:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[SBBJ-979]=E5=A4=87=E4=BB=B6=E5=BD=92?=
 =?UTF-8?q?=E8=BF=98=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/item/itemInLocation/index.vue      |  7 ++++---
 .../item/itemInLocation/itemInLocation.data.ts   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/eam/item/itemInLocation/index.vue b/src/views/eam/item/itemInLocation/index.vue
index e4681fa..fa73a0e 100644
--- a/src/views/eam/item/itemInLocation/index.vue
+++ b/src/views/eam/item/itemInLocation/index.vue
@@ -35,7 +35,7 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemInLocation.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/record/item-in-location/import" :importTemplateData="importTemplateData"
+  <SYMonthImportForm ref="importFormRef" url="/eam/item-in-location/import" :importTemplateData="importTemplateData"
     @success="importSuccess" />
 </template>
 
@@ -45,7 +45,7 @@
   import * as ItemInLocationApi from '@/api/eam/item/itemInLocation'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import SYMonthImportForm from "@/components/ImportForm/src/SYMonthImportForm.vue";
   import Detail from '@/components/Detail/src/Detail.vue'
 
   defineOptions({ name: 'ItemInLocation' })
@@ -86,6 +86,7 @@
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
+    defaultButtons.defaultImportBtn(null), // 导入
     // {
     //   label: '自定义扩展按钮',
     //   name: 'zdy',
@@ -200,7 +201,7 @@
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '备件入库记录导入模版.xlsx'
+    templateTitle: '备件归还导入模板.xlsx'
   })
   // 导入成功之后
   const importSuccess = () => {
diff --git a/src/views/eam/item/itemInLocation/itemInLocation.data.ts b/src/views/eam/item/itemInLocation/itemInLocation.data.ts
index 231989c..d4b8f86 100644
--- a/src/views/eam/item/itemInLocation/itemInLocation.data.ts
+++ b/src/views/eam/item/itemInLocation/itemInLocation.data.ts
@@ -95,12 +95,12 @@ export const ItemInLocation = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false
   },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      fixed: 'right'
-    }
-  }
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     fixed: 'right'
+  //   }
+  // }
 ]))