diff --git a/src/utils/dict.ts b/src/utils/dict.ts index f6a3de0..62c18db 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -13,21 +13,21 @@ const dictStore = useDictStoreWithOut() * @returns {*|Array} 数据字典数组 */ export interface DictDataType { - dictType: string - label: string - value: string | number | boolean - colorType: ElementPlusInfoType | '' - cssClass: string + dictType : string + label : string + value : string | number | boolean + colorType : ElementPlusInfoType | '' + cssClass : string } -export const getDictOptions = (dictType: string) => { +export const getDictOptions = (dictType : string) => { return dictStore.getDictByType(dictType) || [] } -export const getIntDictOptions = (dictType: string) => { - const dictOption: DictDataType[] = [] - const dictOptions: DictDataType[] = getDictOptions(dictType) - dictOptions.forEach((dict: DictDataType) => { +export const getIntDictOptions = (dictType : string) => { + const dictOption : DictDataType[] = [] + const dictOptions : DictDataType[] = getDictOptions(dictType) + dictOptions.forEach((dict : DictDataType) => { dictOption.push({ ...dict, value: parseInt(dict.value + '') @@ -36,10 +36,10 @@ export const getIntDictOptions = (dictType: string) => { return dictOption } -export const getStrDictOptions = (dictType: string) => { - const dictOption: DictDataType[] = [] - const dictOptions: DictDataType[] = getDictOptions(dictType) - dictOptions.forEach((dict: DictDataType) => { +export const getStrDictOptions = (dictType : string) => { + const dictOption : DictDataType[] = [] + const dictOptions : DictDataType[] = getDictOptions(dictType) + dictOptions.forEach((dict : DictDataType) => { dictOption.push({ ...dict, value: dict.value + '' @@ -48,10 +48,10 @@ export const getStrDictOptions = (dictType: string) => { return dictOption } -export const getBoolDictOptions = (dictType: string) => { - const dictOption: DictDataType[] = [] - const dictOptions: DictDataType[] = getDictOptions(dictType) - dictOptions.forEach((dict: DictDataType) => { +export const getBoolDictOptions = (dictType : string) => { + const dictOption : DictDataType[] = [] + const dictOptions : DictDataType[] = getDictOptions(dictType) + dictOptions.forEach((dict : DictDataType) => { dictOption.push({ ...dict, value: dict.value + '' === 'true' @@ -66,8 +66,8 @@ export const getBoolDictOptions = (dictType: string) => { * @param value 字典值 * @return DictDataType 字典对象 */ -export const getDictObj = (dictType: string, value: any): DictDataType | undefined => { - const dictOptions: DictDataType[] = getDictOptions(dictType) +export const getDictObj = (dictType : string, value : any) : DictDataType | undefined => { + const dictOptions : DictDataType[] = getDictOptions(dictType) for (const dict of dictOptions) { if (dict.value === value + '') { return dict @@ -82,10 +82,10 @@ export const getDictObj = (dictType: string, value: any): DictDataType | undefin * @param value 字典数据的值 * @return 字典名称 */ -export const getDictLabel = (dictType: string, value: any): string => { - const dictOptions: DictDataType[] = getDictOptions(dictType) +export const getDictLabel = (dictType : string, value : any) : string => { + const dictOptions : DictDataType[] = getDictOptions(dictType) const dictLabel = ref('') - dictOptions.forEach((dict: DictDataType) => { + dictOptions.forEach((dict : DictDataType) => { if (dict.value === value + '') { dictLabel.value = dict.label } @@ -277,7 +277,7 @@ export enum DICT_TYPE { DEVICE_MOLD_TYPE = 'device_mold_type', // 设备/模具类型 TRANSACTION_TYPE = 'transaction_Type', // 事务类型 RESULT = 'result', // 事务类型 - - - + REQUEST_APPLY = 'class_type', // 班组类型 + + } diff --git a/src/views/eam/basic/item/index.vue b/src/views/eam/basic/item/index.vue index 951d821..d3d9eb3 100644 --- a/src/views/eam/basic/item/index.vue +++ b/src/views/eam/basic/item/index.vue @@ -147,7 +147,6 @@ } /** 添加设备操作 */ - // (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any ) const searchTableRef = ref() const selectDevice = (row) => { diff --git a/src/views/eam/item/itemApplyMain/index.vue b/src/views/eam/item/itemApplyMain/index.vue index 8003662..c27930f 100644 --- a/src/views/eam/item/itemApplyMain/index.vue +++ b/src/views/eam/item/itemApplyMain/index.vue @@ -76,7 +76,8 @@ // 明细查询页赋值 row[formField] = val[0][searchField] row['itemNumber'] = val[0]['number'] - + row['isRadeIn'] = val[0]['isRadeIn'] + row['available'] = val[0]['available'] }else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts index d30b62a..f56c6da 100644 --- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts +++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts @@ -1,10 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' - import { Item } from '@/views/eam/basic/item/item.data' import * as ItemApi from '@/api/eam/basic/item' - - import { validateHanset, validateEmail } from '@/utils/validator' const { t } = useI18n() // 国际化 @@ -16,109 +13,39 @@ export const ItemApplyMain = useCrudSchemas(reactive([ label: '申请编号', field: 'number', sort: 'custom', + isForm: false, isSearch: true, - }, - { - label: '描述', - field: 'name', - sort: 'custom', - }, - { - label: '维修申领、以旧换新', - field: 'type', - sort: 'custom', - form: { - component: 'Select' + table: { + width: 180, + fixed: 'left' }, }, { - label: '申领人id', + label: '申领人', field: 'applyId', sort: 'custom', - form: { - component: 'InputNumber', - value: 0 - }, - }, - { - label: '申领人部门id', - field: 'applyDeptId', - sort: 'custom', - form: { - component: 'InputNumber', - value: 0 - }, + isForm: false, + isSearch: true, }, { - label: '审批人id', + label: '审批人', field: 'approveId', sort: 'custom', - form: { - component: 'InputNumber', - value: 0 - }, - }, - { - label: '审批时间', - field: 'approveTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, + isForm: false, + isSearch: true, }, { - label: '出库人id', + label: '出库人', field: 'outId', sort: 'custom', - form: { - component: 'InputNumber', - value: 0 - }, - }, - { - label: '出库时间', - field: 'outTime', - sort: 'custom', - formatter: dateFormatter, + isForm: false, isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, }, { - label: '创建时间', - field: 'createTime', + label: '描述', + field: 'name', sort: 'custom', - formatter: dateFormatter, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - isForm: false, }, - { label: '是否可用', field: 'available', @@ -144,7 +71,6 @@ export const ItemApplyMain = useCrudSchemas(reactive([ } } }, - { label: '操作', field: 'action', @@ -158,8 +84,8 @@ export const ItemApplyMain = useCrudSchemas(reactive([ //表单校验 export const ItemApplyMainRules = reactive({ - type: [ - { required: true, message: '请选择订单类型', trigger: 'change' } + name: [ + { required: true, message: '请填写描述', trigger: 'change' } ], remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } @@ -193,17 +119,50 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ ] }, }, - { - label: '备注', - field: 'remark', + label: '数量', + field: 'qty', + sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '库存数量', + field: 'currentQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + } }, { label: '是否可用', field: 'available', + sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, @@ -213,42 +172,35 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ }, tableForm: { type: 'Select', - default: 'TRUE', - inactiveValue: 'FALSE', - activeValue: 'TRUE' - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } + disabled: true } }, + + { - label: '创建时间', - field: 'createTime', + label: '是否以旧换新', + field: 'isRadeIn', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, isTable: true, - isTableForm: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, table: { - width: 180 + width: 150 }, - isForm: false, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + tableForm: { + type: 'Select', + disabled: true } }, + { + label: '备注', + field: 'remark', + table: { + width: 150 + }, + }, + { label: '操作', field: 'action', diff --git a/src/views/system/dept/DeptForm.vue b/src/views/system/dept/DeptForm.vue index 9826668..5410185 100644 --- a/src/views/system/dept/DeptForm.vue +++ b/src/views/system/dept/DeptForm.vue @@ -1,199 +1,181 @@ -