diff --git a/src/api/dms/dmsBaseMaintStation/types.ts b/src/api/dms/dmsBaseMaintStation/types.ts index ae0bc16..b98f163 100644 --- a/src/api/dms/dmsBaseMaintStation/types.ts +++ b/src/api/dms/dmsBaseMaintStation/types.ts @@ -34,6 +34,11 @@ export interface DmsBaseMaintStationVO { */ remark: string; + /** + * 保养项目ID数组 + */ + maintProjectIds: (string | number)[] | null; + } export interface DmsBaseMaintStationForm extends BaseEntity { @@ -72,6 +77,11 @@ export interface DmsBaseMaintStationForm extends BaseEntity { */ remark?: string; + /** + * 保养项目ID数组 + */ + maintProjectIds?: (string | number)[] | null; + } export interface DmsBaseMaintStationQuery extends PageQuery { @@ -110,6 +120,11 @@ export interface DmsBaseMaintStationQuery extends PageQuery { * 日期范围参数 */ params?: any; + + /** + * 保养项目ID数组 + */ + maintProjectIds?: (string | number)[] | null; } diff --git a/src/views/dms/dmsBaseLubeStation/index.vue b/src/views/dms/dmsBaseLubeStation/index.vue index 14b9bcd..39ce73f 100644 --- a/src/views/dms/dmsBaseLubeStation/index.vue +++ b/src/views/dms/dmsBaseLubeStation/index.vue @@ -212,9 +212,6 @@ const data = reactive> activeFlag: [ { required: true, message: "激活标识不能为空", trigger: "change" } ], - deviceTypeId: [ - { required: true, message: "设备类型不能为空", trigger: "change" } - ], } }); diff --git a/src/views/dms/dmsBaseMaintStation/index.vue b/src/views/dms/dmsBaseMaintStation/index.vue index 3155e15..7a7414c 100644 --- a/src/views/dms/dmsBaseMaintStation/index.vue +++ b/src/views/dms/dmsBaseMaintStation/index.vue @@ -87,12 +87,20 @@ --> - + + + + - + @@ -101,6 +109,19 @@ + + + + + + + + (proxy?.useDict('active_flag')); @@ -173,8 +196,9 @@ const initFormData: DmsBaseMaintStationForm = { maintStandardId: undefined, maintStationCode: undefined, maintStationName: undefined, - activeFlag: undefined, + activeFlag: '1', remark: undefined, + maintProjectIds: [] } const data = reactive>({ form: {...initFormData}, @@ -298,9 +322,6 @@ const handleExport = () => { }, `dmsBaseMaintStation_${new Date().getTime()}.xlsx`) } - - - // 保养标准 let maintStandardOption = ref([]); const getMaintStandardOtions = async () => { @@ -315,9 +336,17 @@ const getDviceTypeOption = async () => { dviceTypeOptions.value = res.data; } +// 保养项目选项 +const maintProjectOptions = ref([]); +const getMaintProjectOptions = async () => { + const res = await getDmsBaseMaintProjectList(null); + maintProjectOptions.value = res.data; +} + onMounted(() => { getMaintStandardOtions(); getDviceTypeOption(); + getMaintProjectOptions(); getList(); });