diff --git a/.env.development b/.env.development index 66c440a..6c6c5c2 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_DEV=false # 请求路径 # VITE_BASE_URL='http://localhost:12080' -VITE_BASE_URL='http://192.168.0.165:12080' +VITE_BASE_URL='http://localhost:12080' # 上传路径 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 1f03899..03d73bd 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -289,6 +289,8 @@ export enum DICT_TYPE { MOLD_EXECUTION_CYCLE = 'mold_execution_cycle', //模具保养周期 GET_ORDER_STATUS = 'get_order_status', //模具保养周期 IS_OPEN = 'is_open', //是否打开 + ITEM_APPLY_STATUS = 'item_apply_status',//备件申领状态 + } diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts index 5a49b10..d2036bf 100644 --- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts +++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts @@ -6,7 +6,7 @@ import { validateHanset, validateEmail } from '@/utils/validator' const { t } = useI18n() // 国际化 /** - * @returns {Array} 备件申请主表 + * @returns {Array} 备件申领主表 */ export const ItemApplyMain = useCrudSchemas(reactive([ { @@ -47,31 +47,22 @@ export const ItemApplyMain = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.ITEM_APPLY_STATUS, dictClass: 'string', - isSearch: false, + isSearch: true, isTable: true, - sort: 'custom', table: { width: 150 }, tableForm: { type: 'Select', - inactiveValue: 'FALSE', disabled: true - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } } }, - { + { label: '操作', field: 'action', isDetail: false,