diff --git a/src/api/eam/item/itemAccounts/index.ts b/src/api/eam/item/itemAccounts/index.ts
index 88fb3d1..5e80c1b 100644
--- a/src/api/eam/item/itemAccounts/index.ts
+++ b/src/api/eam/item/itemAccounts/index.ts
@@ -8,6 +8,8 @@ export interface ItemAccountsVO {
siteId: string
available: string
concurrencyStamp: number
+ type: string
+ display?:boolean
}
// 查询备件台账列表
@@ -31,6 +33,11 @@ export const createItemAccounts = async (data: ItemAccountsVO) => {
return await request.post({ url: `/eam/item-accounts/create`, data })
}
+// 备件台账新到货转账内
+export const newTurnIn = async (data: ItemAccountsVO) => {
+ return await request.post({ url: `/eam/item-accounts/newTurnIn`, data })
+}
+
// 修改备件台账
export const updateItemAccounts = async (data: ItemAccountsVO) => {
return await request.put({ url: `/eam/item-accounts/update`, data })
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 95c1cb7..04d2dcf 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -311,7 +311,9 @@ export default {
typeUpdate: 'Dict Type Eidt',
dataCreate: 'Dict Data Create',
dataUpdate: 'Dict Data Eidt',
- fileUpload: 'File Upload'
+ fileUpload: 'File Upload',
+ itemIn: 'itemIn',
+ newTurnIn: 'newTurnIn',
},
dialog: {
dialog: 'Dialog',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 96b5b39..57cd018 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -324,6 +324,8 @@ export default {
disAgree: '驳回',
selectItem: '选择备件',
qrCode: '二维码',
+ itemIn: '入库',
+ newTurnIn: '新到货转账内',
},
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 840575e..cbd96eb 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -306,6 +306,7 @@ export enum DICT_TYPE {
ORDER_COMPLETE_RESULT = 'order_complete_result', //维修工单完成结果
FACTORY_TYPE = 'factory_type',//厂区类别
EQUIPMENT_INDEX_NAME = 'equipment_index_name',//设备年度目标指标名称分类字段
- SPECIAL_DEPT_ROLE = 'special_dept_role'
+ SPECIAL_DEPT_ROLE = 'special_dept_role',
+ ITEM_ACCOUNT_LOCATION_TYPE = "item_account_location_type",
}
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 67f0ffa..3a66246 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1078,6 +1078,32 @@ export function orderPrintBtn(option:any) {
})
}
+// 头部入库按钮
+export function ItemInBtn(option:any) {
+ return __defaultBtnOption(option,{
+ label: '入库',
+ name: 'itemIn',
+ hide: false,
+ type: 'primary',
+ icon: 'ep:plus',
+ color: '',
+ hasPermi: ''
+ })
+}
+
+// 操作列表-到货转账内
+export function newTurnIn(option:any) {
+ return __defaultBtnOption(option,{
+ label: '到货转账内',
+ name: 'newTurnIn',
+ hide: false,
+ type: 'primary',
+ color: '',
+ link: true, // 文本展现按钮
+ hasPermi: ''
+ })
+}
+
// 默认按钮规则
function __defaultBtnOption(option:any,specific:any){
diff --git a/src/views/eam/item/itemAccounts/index.vue b/src/views/eam/item/itemAccounts/index.vue
index 617a2a6..0d50ccb 100644
--- a/src/views/eam/item/itemAccounts/index.vue
+++ b/src/views/eam/item/itemAccounts/index.vue
@@ -20,7 +20,7 @@
-
+
@@ -30,6 +30,10 @@
:formAllSchemas="ItemAccounts.allSchemas" :apiUpdate="ItemAccountsApi.updateItemAccounts"
:apiCreate="ItemAccountsApi.createItemAccounts" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
+
+
@@ -43,6 +47,7 @@