From 27994e42101284198ce9b54d11098fd8611b99cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E5=BA=86=E6=BA=90?= Date: Thu, 27 Feb 2025 20:53:14 +0800 Subject: [PATCH] =?UTF-8?q?20250227=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/basic/assetsAccount/index.ts | 4 ++-- src/api/eam/basic/fixedAssets/index.ts | 4 ++-- .../eam/basic/fixedAssetsControlsHistory/index.vue | 1 + src/views/eam/basic/location/location.data.ts | 14 ++++++++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/api/eam/basic/assetsAccount/index.ts b/src/api/eam/basic/assetsAccount/index.ts index 68df8ad..626a008 100644 --- a/src/api/eam/basic/assetsAccount/index.ts +++ b/src/api/eam/basic/assetsAccount/index.ts @@ -80,5 +80,5 @@ export const exportAssetsAccount = async (params) => { // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/fixed-assets/get-import-template' }) -} \ No newline at end of file + return request.download({ url: '/eam/fixed-assets/get-import-template/2' }) +} diff --git a/src/api/eam/basic/fixedAssets/index.ts b/src/api/eam/basic/fixedAssets/index.ts index 1251e1a..4c0e335 100644 --- a/src/api/eam/basic/fixedAssets/index.ts +++ b/src/api/eam/basic/fixedAssets/index.ts @@ -80,5 +80,5 @@ export const exportFixedAssets = async (params) => { // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/fixed-assets/get-import-template' }) -} \ No newline at end of file + return request.download({ url: '/eam/fixed-assets/get-import-template/1' }) +} diff --git a/src/views/eam/basic/fixedAssetsControlsHistory/index.vue b/src/views/eam/basic/fixedAssetsControlsHistory/index.vue index 1541eab..923be16 100644 --- a/src/views/eam/basic/fixedAssetsControlsHistory/index.vue +++ b/src/views/eam/basic/fixedAssetsControlsHistory/index.vue @@ -72,6 +72,7 @@ import * as FixedAssetsControlsHistoryApi from '@/api/eam/basic/fixedAssetsContr import * as defaultButtons from '@/utils/disposition/defaultButtons' import SYMonthImportForm from "@/components/ImportForm/src/SYMonthImportForm.vue"; import * as FixedAssetsApi from "@/api/eam/basic/fixedAssets"; +import {importTemplate} from "@/api/eam/basic/fixedAssets"; defineOptions({ name: 'FixedAssetsControlsHistory' }) diff --git a/src/views/eam/basic/location/location.data.ts b/src/views/eam/basic/location/location.data.ts index b26cb18..72b955e 100644 --- a/src/views/eam/basic/location/location.data.ts +++ b/src/views/eam/basic/location/location.data.ts @@ -21,6 +21,19 @@ export const LocationRules = reactive({ }) export const Location = useCrudSchemas(reactive([ + { + label: '绑定备件库位', + field: 'itemNumberIsNull', + sort: 'custom', + isSearch: true, + isForm: false, + isTable: false, + dictType: DICT_TYPE.TRUE_FALSE, + table: { + width: 180, + fixed: 'left' + }, + }, { label: '库位编号', field: 'number', @@ -44,6 +57,7 @@ export const Location = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isForm: false, + hiddenSearchHigh: true, }, { label: '库区编号',