| src/api/ecg/devmanage/index.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/ecg/devmanage/DeviceForm.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/ecg/devmanage/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/ecg/devmanage/index.ts
@@ -14,7 +14,12 @@ category: string // 分类名 brand: string // 品牌 model: string // 型号 purchaseDate: Date // 采购日期 purchaseDate: number // 采购日期 } export interface OptionsVO { label: string value: string } // 设备型号 API @@ -47,6 +52,15 @@ // 导出设备型号 Excel exportDevModel: async (params) => { return await request.download({ url: `/ecg/dev-model/export-excel`, params }) }, // getBrandOption: async (category: string) => { return await request.get({ url: `/ecg/dev-model/brand-option?category=` + category }) }, getModelOption: async (category: string, brand: string) => { return await request.get({ url: `/ecg/dev-model/model-option?category=` + category + `&brand=` + brand }) } }
@@ -7,25 +7,6 @@ label-width="100px" v-loading="formLoading" > <el-form-item label="设备编号" prop="devId"> <el-input v-model="formData.devId" placeholder="请输入设备编号" /> </el-form-item> <el-form-item label="分类名" prop="category"> <el-input v-model="formData.category" placeholder="请输入分类名" /> </el-form-item> <el-form-item label="品牌" prop="brand"> <el-select v-model="formData.brand" placeholder="请输入品牌"> <el-option v-for="dict in getIntDictOptions(DICT_TYPE.ECG_DEV_BRAND)" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="型号" prop="model"> <el-input v-model="formData.model" placeholder="请输入型号" /> </el-form-item> <el-form-item label="采购日期" prop="purchaseDate"> <el-date-picker v-model="formData.purchaseDate" @@ -33,6 +14,39 @@ value-format="x" placeholder="选择采购日期" /> </el-form-item> <el-form-item label="设备编号" prop="devId"> <el-input v-model="formData.devId" placeholder="请输入设备编号" /> </el-form-item> <el-form-item label="分类名" prop="category"> <el-select v-model="formData.category" placeholder="请选择分类名" @change="categoryChanged"> <el-option v-for="dict in categoryOptions" :key="dict.value as string" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="品牌" prop="brand"> <el-select v-model="formData.brand" placeholder="请选择品牌" @change="brandChanged"> <el-option v-for="dict in brandOptions" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="型号" prop="model"> <el-select v-model="formData.model" placeholder="请选择型号"> <el-option v-for="dict in modelOptions" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> </el-form> <template #footer> @@ -42,8 +56,8 @@ </Dialog> </template> <script setup lang="ts"> import { DeviceApi, DeviceVO } from '@/api/ecg/devmanage' import {DICT_TYPE, getIntDictOptions} from "@/utils/dict"; import {getStrDictOptions, DICT_TYPE, DictDataType} from '@/utils/dict' import {DeviceApi, DeviceVO, DevModelApi, OptionsVO} from '@/api/ecg/devmanage' /** 设备 表单 */ defineOptions({ name: 'DeviceForm' }) @@ -55,19 +69,15 @@ const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formData = ref({ id: undefined, devId: undefined, category: undefined, brand: undefined, model: undefined, purchaseDate: undefined const formData = ref<DeviceVO>({ id: 0, purchaseDate: new Date().getTime(), devId: '', category: '', brand: '', model: '' }) const formRules = reactive({ devId: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }], category: [{ required: true, message: '分类名不能为空', trigger: 'blur' }], brand: [{ required: true, message: '品牌不能为空', trigger: 'blur' }], model: [{ required: true, message: '型号不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref @@ -77,13 +87,23 @@ dialogTitle.value = t('action.' + type) formType.value = type resetForm() // 修改时，设置数据 if (id) { formLoading.value = true try { formData.value = await DeviceApi.getDevice(id) const bandData = await DevModelApi.getBrandOption(formData.value.category!) brandOptions.value = bandData const modelData = await DevModelApi.getModelOption(formData.value.category!, formData.value.brand!) modelOptions.value = modelData } finally { formLoading.value = false } } else { // 新增时 if (categoryOptions.value.length !== 0) { formData.value.category = categoryOptions.value[0].value as string categoryChanged() } } } @@ -116,13 +136,40 @@ /** 重置表单 */ const resetForm = () => { formData.value = { id: undefined, devId: undefined, category: undefined, brand: undefined, model: undefined, purchaseDate: undefined id: 0, purchaseDate: new Date().getTime(), devId: '', category: '', brand: '', model: '' } formRef.value?.resetFields() } const brandOptions = ref<OptionsVO[]>([]) const modelOptions = ref<OptionsVO[]>([]) const categoryChanged = async () => { const data = await DevModelApi.getBrandOption(formData.value.category!) brandOptions.value = data formData.value.brand = brandOptions.value.length === 0 ? "" : brandOptions.value[0].value brandChanged() } const brandChanged = async () => { const data = await DevModelApi.getModelOption(formData.value.category!, formData.value.brand!) modelOptions.value = data formData.value.model = modelOptions.value.length === 0 ? "" : modelOptions.value[0].value } const categoryOptions = ref<DictDataType[]>([]) onMounted( async () => { console.info("onMount DeviceForm...") const data = await getStrDictOptions(DICT_TYPE.ECG_DEV_CATEGORY) categoryOptions.value = data }) </script> src/views/ecg/devmanage/index.vue
@@ -8,42 +8,6 @@ :inline="true" label-width="68px" > <el-form-item label="设备编号" prop="devId"> <el-input v-model="queryParams.devId" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" class="!w-240px" /> </el-form-item> <el-form-item label="分类名" prop="category"> <el-input v-model="queryParams.category" placeholder="请输入分类名" clearable @keyup.enter="handleQuery" class="!w-240px" /> </el-form-item> <el-form-item label="品牌" prop="brand"> <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable @keyup.enter="handleQuery" class="!w-240px" /> </el-form-item> <el-form-item label="型号" prop="model"> <el-input v-model="queryParams.model" placeholder="请输入型号" clearable @keyup.enter="handleQuery" class="!w-240px" /> </el-form-item> <el-form-item label="采购日期" prop="purchaseDate"> <el-date-picker v-model="queryParams.purchaseDate" @@ -65,6 +29,50 @@ :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" /> </el-form-item> <el-form-item label="设备编号" prop="devId"> <el-input v-model="queryParams.devId" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" class="!w-240px" /> </el-form-item> <el-form-item label="分类名" prop="category"> <el-select v-model="queryParams.category" placeholder="请选择分类名" clearable class="!w-240px" > <el-option v-for="dict in getStrDictOptions(DICT_TYPE.ECG_DEV_CATEGORY)" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="品牌" prop="brand"> <el-select v-model="queryParams.brand" placeholder="请选择品牌" clearable class="!w-240px" > <el-option label="请选择字典生成" value="" /> </el-select> </el-form-item> <el-form-item label="型号" prop="model"> <el-select v-model="queryParams.model" placeholder="请选择型号" clearable class="!w-240px" > <el-option label="请选择字典生成" value="" /> </el-select> </el-form-item> <el-form-item> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> @@ -94,11 +102,19 @@ <ContentWrap> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table-column label="id" align="center" prop="id" /> <el-table-column label="设备编号" align="center" prop="devId" /> <el-table-column label="分类名" align="center" prop="category" /> <el-table-column label="品牌" align="center" prop="brand" /> <el-table-column label="采购日期" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/> <el-table-column label="设备编号" align="center" prop="devId" width="100px" /> <el-table-column label="分类名" align="center" prop="category"> <template #default="scope"> <dict-tag :type="DICT_TYPE.ECG_DEV_CATEGORY" :value="scope.row.category" /> </template> </el-table-column> <el-table-column label="品牌" align="center" prop="brand" width="100px"> <template #default="scope"> <dict-tag :type="DICT_TYPE.ECG_DEV_BRAND" :value="scope.row.brand" /> </template> </el-table-column> <el-table-column label="型号" align="center" prop="model" /> <el-table-column label="采购日期" align="center" prop="purchaseDate" /> <el-table-column label="创建时间" align="center" @@ -141,7 +157,8 @@ </template> <script setup lang="ts"> import { dateFormatter } from '@/utils/formatTime' import { getStrDictOptions, DICT_TYPE } from '@/utils/dict' import {dateFormatter, dateFormatter2} from '@/utils/formatTime' import download from '@/utils/download' import { DeviceApi, DeviceVO } from '@/api/ecg/devmanage' import DeviceForm from './DeviceForm.vue' @@ -158,12 +175,12 @@ const queryParams = reactive({ pageNo: 1, pageSize: 10, purchaseDate: [], createTime: [], devId: undefined, category: undefined, brand: undefined, model: undefined, purchaseDate: [], createTime: [] model: undefined }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中
