diff --git a/src/api/battery/cellDevice/index.ts b/src/api/battery/cellDevice/index.ts index e2ab9c8..95d73f1 100644 --- a/src/api/battery/cellDevice/index.ts +++ b/src/api/battery/cellDevice/index.ts @@ -11,7 +11,9 @@ export interface CellDeviceVO { oneInjectCpk: number finalInjectRetenCpk: number } - +export const getCellDeviceMonomerList = async (id: number) => { + return await request.get({ url: `/battery/cellDevice/monomerList?id=` + id }) +} // 查询battery_cell_device列表 export const getCellDevicePage = async (params) => { if (params.isSearch) { diff --git a/src/api/battery/monomer/index.ts b/src/api/battery/monomer/index.ts index 4f77626..7330d11 100644 --- a/src/api/battery/monomer/index.ts +++ b/src/api/battery/monomer/index.ts @@ -2,7 +2,7 @@ import request from '@/config/axios' export interface MonomerVO { id: number - release:String + sending:String version: String date: String name: String diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 31ae4a7..d686858 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -188,6 +188,7 @@ export enum DICT_TYPE { UOM = 'uom', // 计量单位 REWORK = 'rework', // 返工品 BATTERY_TYPE = 'battery_type', // 返工品 + BATTERY_SENDING = 'battery_sending', // 返工品 IN_BOUND_RST = 'inBoundRst', // 返工品 IN_BOUND_FINSH = 'inBoundFinsh', // 返工品 ABC_CLASS = 'abc_class', // ABC类 diff --git a/src/views/battery/monomer/monomer.data.ts b/src/views/battery/monomer/monomer.data.ts index cb358a3..57a343d 100644 --- a/src/views/battery/monomer/monomer.data.ts +++ b/src/views/battery/monomer/monomer.data.ts @@ -50,6 +50,7 @@ export const Monomer = useCrudSchemas(reactive([ field: 'date', sort: 'custom', isSearch: false, + formatter: dateFormatter, form: { component: 'DatePicker', componentProps: { @@ -63,6 +64,7 @@ export const Monomer = useCrudSchemas(reactive([ field: 'timeStamp', sort: 'custom', isSearch: false, + formatter: dateFormatter, form: { component: 'DatePicker', componentProps: { @@ -82,6 +84,7 @@ export const Monomer = useCrudSchemas(reactive([ field: 'endTime', sort: 'custom', isSearch: false, + formatter: dateFormatter, form: { component: 'DatePicker', componentProps: { @@ -132,6 +135,18 @@ export const Monomer = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, }, + { + label: '发布', + field: 'sending', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.BATTERY_SENDING, + dictClass: 'string', + isTable: true, + tableForm: { + type: 'Select' + } + }, // { // label: '一次注液', // field: 'oneInjectPreCpk',