diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 1892791..31f6b25 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -219,3 +219,21 @@ }) } +// 删除标准配套设备 +export function getEquipmentDelete(data: object) { + return request({ + url: '/meter/standard/equipment/delete', + method: 'post', + data, + }) +} + +// 批量删除计量人员 +export function getUserBatchDelete(data: object) { + return request({ + url: '/meter/standard/user/batchDelete', + method: 'post', + data, + }) +} + diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 1892791..31f6b25 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -219,3 +219,21 @@ }) } +// 删除标准配套设备 +export function getEquipmentDelete(data: object) { + return request({ + url: '/meter/standard/equipment/delete', + method: 'post', + data, + }) +} + +// 批量删除计量人员 +export function getUserBatchDelete(data: object) { + return request({ + url: '/meter/standard/user/batchDelete', + method: 'post', + data, + }) +} + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 479d853..c009446 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -1,11 +1,7 @@ diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 1892791..31f6b25 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -219,3 +219,21 @@ }) } +// 删除标准配套设备 +export function getEquipmentDelete(data: object) { + return request({ + url: '/meter/standard/equipment/delete', + method: 'post', + data, + }) +} + +// 批量删除计量人员 +export function getUserBatchDelete(data: object) { + return request({ + url: '/meter/standard/user/batchDelete', + method: 'post', + data, + }) +} + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 479d853..c009446 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -1,11 +1,7 @@ diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue index 84e1126..b76ab3e 100644 --- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue +++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue @@ -8,12 +8,12 @@ import { UploadFile } from '@/api/measure/file' import { submitApproval } from '@/api/approval' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getDictByCode } from '@/api/system/dict' import { SCHEDULE } from '@/utils/scheduleDict' const loading = ref(false) // 表单加载状态 const infoId = ref('') // id const buttonArray = ref([]) const pageType = ref('add') // 页面类型: add,edit, detail -const buttonLoading = ref(false) // 按钮加载状态 const textMap: { [key: string]: string } = { add: '新建', edit: '编辑', @@ -153,35 +153,33 @@ const selectPerson = () => { checkListRef.value.initDialog() } - -// 添加表格数据对象 -const addList = ref({}) +// 下拉框列表类型 +interface optionsType { + name: string + id: string + value: string +} // 检修结果下拉框 -const options = ref([ - { name: '已维修,可用', id: '1' }, - { name: '已维修,未修好', id: '2' }, - { name: '未维修', id: '3' }, - { name: '其他', id: '4' }, -]) -// 添加表格弹窗开关 -const dialogVisible = ref(false) +const options = ref([]) + +// 获取检修结果 +getDictByCode('maintenanceResults').then((response) => { + options.value = response.data +}) // 初始化router const $router = useRouter() // 关闭新增页面的回调 const close = () => { $router.back() } +// 表单验证规则 const rules = ref({ applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }], acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }], overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }], time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }], -}) // 表单验证规则 -// 点击文件预览 -const uploadShow = (e: any) => { - const URL = window.URL || window.webkitURL - window.open(URL.createObjectURL(e.raw)) -} +}) + const onFileChange = (event: any) => { // 原生上传 console.log(event.target.files) diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 1892791..31f6b25 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -219,3 +219,21 @@ }) } +// 删除标准配套设备 +export function getEquipmentDelete(data: object) { + return request({ + url: '/meter/standard/equipment/delete', + method: 'post', + data, + }) +} + +// 批量删除计量人员 +export function getUserBatchDelete(data: object) { + return request({ + url: '/meter/standard/user/batchDelete', + method: 'post', + data, + }) +} + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 479d853..c009446 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -1,11 +1,7 @@ diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue index 84e1126..b76ab3e 100644 --- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue +++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue @@ -8,12 +8,12 @@ import { UploadFile } from '@/api/measure/file' import { submitApproval } from '@/api/approval' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getDictByCode } from '@/api/system/dict' import { SCHEDULE } from '@/utils/scheduleDict' const loading = ref(false) // 表单加载状态 const infoId = ref('') // id const buttonArray = ref([]) const pageType = ref('add') // 页面类型: add,edit, detail -const buttonLoading = ref(false) // 按钮加载状态 const textMap: { [key: string]: string } = { add: '新建', edit: '编辑', @@ -153,35 +153,33 @@ const selectPerson = () => { checkListRef.value.initDialog() } - -// 添加表格数据对象 -const addList = ref({}) +// 下拉框列表类型 +interface optionsType { + name: string + id: string + value: string +} // 检修结果下拉框 -const options = ref([ - { name: '已维修,可用', id: '1' }, - { name: '已维修,未修好', id: '2' }, - { name: '未维修', id: '3' }, - { name: '其他', id: '4' }, -]) -// 添加表格弹窗开关 -const dialogVisible = ref(false) +const options = ref([]) + +// 获取检修结果 +getDictByCode('maintenanceResults').then((response) => { + options.value = response.data +}) // 初始化router const $router = useRouter() // 关闭新增页面的回调 const close = () => { $router.back() } +// 表单验证规则 const rules = ref({ applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }], acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }], overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }], time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }], -}) // 表单验证规则 -// 点击文件预览 -const uploadShow = (e: any) => { - const URL = window.URL || window.webkitURL - window.open(URL.createObjectURL(e.raw)) -} +}) + const onFileChange = (event: any) => { // 原生上传 console.log(event.target.files) diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue index 467d5cd..203d325 100644 --- a/src/views/device/deviceMaintenance/manageCheckList.vue +++ b/src/views/device/deviceMaintenance/manageCheckList.vue @@ -6,7 +6,6 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList' import { uploadApi } from '@/api/system/notice' -import { exportExcel } from '@/utils/exportXlsx' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' // 查询条件 @@ -19,8 +18,6 @@ offset: 1, // 当前页 limit: 20, // 当前页多少条 }) -// 控制是否显示新增页面 -const show = ref(true) // 表格数据 const list = ref([]) // 获取权限 @@ -173,10 +170,10 @@ } // 批量导入 -const uploadAll = () => { - // todo: 批量导入 - fileRef.value.click() -} +// const uploadAll = () => { +// // todo: 批量导入 +// fileRef.value.click() +// } // 添加设备管理点检查 const add = () => { $router.push('/maintenance/manageCheckList/add') @@ -222,76 +219,74 @@ diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 1892791..31f6b25 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -219,3 +219,21 @@ }) } +// 删除标准配套设备 +export function getEquipmentDelete(data: object) { + return request({ + url: '/meter/standard/equipment/delete', + method: 'post', + data, + }) +} + +// 批量删除计量人员 +export function getUserBatchDelete(data: object) { + return request({ + url: '/meter/standard/user/batchDelete', + method: 'post', + data, + }) +} + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 479d853..c009446 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -1,11 +1,7 @@ diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue index 84e1126..b76ab3e 100644 --- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue +++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue @@ -8,12 +8,12 @@ import { UploadFile } from '@/api/measure/file' import { submitApproval } from '@/api/approval' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getDictByCode } from '@/api/system/dict' import { SCHEDULE } from '@/utils/scheduleDict' const loading = ref(false) // 表单加载状态 const infoId = ref('') // id const buttonArray = ref([]) const pageType = ref('add') // 页面类型: add,edit, detail -const buttonLoading = ref(false) // 按钮加载状态 const textMap: { [key: string]: string } = { add: '新建', edit: '编辑', @@ -153,35 +153,33 @@ const selectPerson = () => { checkListRef.value.initDialog() } - -// 添加表格数据对象 -const addList = ref({}) +// 下拉框列表类型 +interface optionsType { + name: string + id: string + value: string +} // 检修结果下拉框 -const options = ref([ - { name: '已维修,可用', id: '1' }, - { name: '已维修,未修好', id: '2' }, - { name: '未维修', id: '3' }, - { name: '其他', id: '4' }, -]) -// 添加表格弹窗开关 -const dialogVisible = ref(false) +const options = ref([]) + +// 获取检修结果 +getDictByCode('maintenanceResults').then((response) => { + options.value = response.data +}) // 初始化router const $router = useRouter() // 关闭新增页面的回调 const close = () => { $router.back() } +// 表单验证规则 const rules = ref({ applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }], acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }], overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }], time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }], -}) // 表单验证规则 -// 点击文件预览 -const uploadShow = (e: any) => { - const URL = window.URL || window.webkitURL - window.open(URL.createObjectURL(e.raw)) -} +}) + const onFileChange = (event: any) => { // 原生上传 console.log(event.target.files) diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue index 467d5cd..203d325 100644 --- a/src/views/device/deviceMaintenance/manageCheckList.vue +++ b/src/views/device/deviceMaintenance/manageCheckList.vue @@ -6,7 +6,6 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList' import { uploadApi } from '@/api/system/notice' -import { exportExcel } from '@/utils/exportXlsx' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' // 查询条件 @@ -19,8 +18,6 @@ offset: 1, // 当前页 limit: 20, // 当前页多少条 }) -// 控制是否显示新增页面 -const show = ref(true) // 表格数据 const list = ref([]) // 获取权限 @@ -173,10 +170,10 @@ } // 批量导入 -const uploadAll = () => { - // todo: 批量导入 - fileRef.value.click() -} +// const uploadAll = () => { +// // todo: 批量导入 +// fileRef.value.click() +// } // 添加设备管理点检查 const add = () => { $router.push('/maintenance/manageCheckList/add') @@ -222,76 +219,74 @@ diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index 0352e2a..9340b25 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -15,7 +15,7 @@ type: String, default: '0', }, - buttonType: { + buttonType: { // 从列表的哪个按钮进入的 type: String, default: '', }, diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 1892791..31f6b25 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -219,3 +219,21 @@ }) } +// 删除标准配套设备 +export function getEquipmentDelete(data: object) { + return request({ + url: '/meter/standard/equipment/delete', + method: 'post', + data, + }) +} + +// 批量删除计量人员 +export function getUserBatchDelete(data: object) { + return request({ + url: '/meter/standard/user/batchDelete', + method: 'post', + data, + }) +} + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 479d853..c009446 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -1,11 +1,7 @@ diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue index 84e1126..b76ab3e 100644 --- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue +++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue @@ -8,12 +8,12 @@ import { UploadFile } from '@/api/measure/file' import { submitApproval } from '@/api/approval' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getDictByCode } from '@/api/system/dict' import { SCHEDULE } from '@/utils/scheduleDict' const loading = ref(false) // 表单加载状态 const infoId = ref('') // id const buttonArray = ref([]) const pageType = ref('add') // 页面类型: add,edit, detail -const buttonLoading = ref(false) // 按钮加载状态 const textMap: { [key: string]: string } = { add: '新建', edit: '编辑', @@ -153,35 +153,33 @@ const selectPerson = () => { checkListRef.value.initDialog() } - -// 添加表格数据对象 -const addList = ref({}) +// 下拉框列表类型 +interface optionsType { + name: string + id: string + value: string +} // 检修结果下拉框 -const options = ref([ - { name: '已维修,可用', id: '1' }, - { name: '已维修,未修好', id: '2' }, - { name: '未维修', id: '3' }, - { name: '其他', id: '4' }, -]) -// 添加表格弹窗开关 -const dialogVisible = ref(false) +const options = ref([]) + +// 获取检修结果 +getDictByCode('maintenanceResults').then((response) => { + options.value = response.data +}) // 初始化router const $router = useRouter() // 关闭新增页面的回调 const close = () => { $router.back() } +// 表单验证规则 const rules = ref({ applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }], acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }], overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }], time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }], -}) // 表单验证规则 -// 点击文件预览 -const uploadShow = (e: any) => { - const URL = window.URL || window.webkitURL - window.open(URL.createObjectURL(e.raw)) -} +}) + const onFileChange = (event: any) => { // 原生上传 console.log(event.target.files) diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue index 467d5cd..203d325 100644 --- a/src/views/device/deviceMaintenance/manageCheckList.vue +++ b/src/views/device/deviceMaintenance/manageCheckList.vue @@ -6,7 +6,6 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList' import { uploadApi } from '@/api/system/notice' -import { exportExcel } from '@/utils/exportXlsx' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' // 查询条件 @@ -19,8 +18,6 @@ offset: 1, // 当前页 limit: 20, // 当前页多少条 }) -// 控制是否显示新增页面 -const show = ref(true) // 表格数据 const list = ref([]) // 获取权限 @@ -173,10 +170,10 @@ } // 批量导入 -const uploadAll = () => { - // todo: 批量导入 - fileRef.value.click() -} +// const uploadAll = () => { +// // todo: 批量导入 +// fileRef.value.click() +// } // 添加设备管理点检查 const add = () => { $router.push('/maintenance/manageCheckList/add') @@ -222,76 +219,74 @@ diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index 0352e2a..9340b25 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -15,7 +15,7 @@ type: String, default: '0', }, - buttonType: { + buttonType: { // 从列表的哪个按钮进入的 type: String, default: '', }, diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue index 2f4da9c..8f6499b 100644 --- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue +++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue @@ -92,7 +92,7 @@ reset() } else { - ElMessage.warning('请先选择设备') + ElMessage.warning('请先选择文件') } } // 取消 diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts index 1892791..31f6b25 100644 --- a/src/api/device/standard.ts +++ b/src/api/device/standard.ts @@ -219,3 +219,21 @@ }) } +// 删除标准配套设备 +export function getEquipmentDelete(data: object) { + return request({ + url: '/meter/standard/equipment/delete', + method: 'post', + data, + }) +} + +// 批量删除计量人员 +export function getUserBatchDelete(data: object) { + return request({ + url: '/meter/standard/user/batchDelete', + method: 'post', + data, + }) +} + diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue index 479d853..c009446 100644 --- a/src/views/business/lab/components/environmentalDialog.vue +++ b/src/views/business/lab/components/environmentalDialog.vue @@ -1,11 +1,7 @@ diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue index 84e1126..b76ab3e 100644 --- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue +++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue @@ -8,12 +8,12 @@ import { UploadFile } from '@/api/measure/file' import { submitApproval } from '@/api/approval' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getDictByCode } from '@/api/system/dict' import { SCHEDULE } from '@/utils/scheduleDict' const loading = ref(false) // 表单加载状态 const infoId = ref('') // id const buttonArray = ref([]) const pageType = ref('add') // 页面类型: add,edit, detail -const buttonLoading = ref(false) // 按钮加载状态 const textMap: { [key: string]: string } = { add: '新建', edit: '编辑', @@ -153,35 +153,33 @@ const selectPerson = () => { checkListRef.value.initDialog() } - -// 添加表格数据对象 -const addList = ref({}) +// 下拉框列表类型 +interface optionsType { + name: string + id: string + value: string +} // 检修结果下拉框 -const options = ref([ - { name: '已维修,可用', id: '1' }, - { name: '已维修,未修好', id: '2' }, - { name: '未维修', id: '3' }, - { name: '其他', id: '4' }, -]) -// 添加表格弹窗开关 -const dialogVisible = ref(false) +const options = ref([]) + +// 获取检修结果 +getDictByCode('maintenanceResults').then((response) => { + options.value = response.data +}) // 初始化router const $router = useRouter() // 关闭新增页面的回调 const close = () => { $router.back() } +// 表单验证规则 const rules = ref({ applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }], acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }], overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }], time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }], -}) // 表单验证规则 -// 点击文件预览 -const uploadShow = (e: any) => { - const URL = window.URL || window.webkitURL - window.open(URL.createObjectURL(e.raw)) -} +}) + const onFileChange = (event: any) => { // 原生上传 console.log(event.target.files) diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue index 467d5cd..203d325 100644 --- a/src/views/device/deviceMaintenance/manageCheckList.vue +++ b/src/views/device/deviceMaintenance/manageCheckList.vue @@ -6,7 +6,6 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList' import { uploadApi } from '@/api/system/notice' -import { exportExcel } from '@/utils/exportXlsx' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' // 查询条件 @@ -19,8 +18,6 @@ offset: 1, // 当前页 limit: 20, // 当前页多少条 }) -// 控制是否显示新增页面 -const show = ref(true) // 表格数据 const list = ref([]) // 获取权限 @@ -173,10 +170,10 @@ } // 批量导入 -const uploadAll = () => { - // todo: 批量导入 - fileRef.value.click() -} +// const uploadAll = () => { +// // todo: 批量导入 +// fileRef.value.click() +// } // 添加设备管理点检查 const add = () => { $router.push('/maintenance/manageCheckList/add') @@ -222,76 +219,74 @@ diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index 0352e2a..9340b25 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -15,7 +15,7 @@ type: String, default: '0', }, - buttonType: { + buttonType: { // 从列表的哪个按钮进入的 type: String, default: '', }, diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue index 2f4da9c..8f6499b 100644 --- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue +++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue @@ -92,7 +92,7 @@ reset() } else { - ElMessage.warning('请先选择设备') + ElMessage.warning('请先选择文件') } } // 取消 diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue index 016c289..3098273 100644 --- a/src/views/device/standardEquipment/components/standardListAdd.vue +++ b/src/views/device/standardEquipment/components/standardListAdd.vue @@ -1,20 +1,35 @@ diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue index 84e1126..b76ab3e 100644 --- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue +++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue @@ -8,12 +8,12 @@ import { UploadFile } from '@/api/measure/file' import { submitApproval } from '@/api/approval' import showPhoto from '@/views/system/tool/showPhoto.vue' +import { getDictByCode } from '@/api/system/dict' import { SCHEDULE } from '@/utils/scheduleDict' const loading = ref(false) // 表单加载状态 const infoId = ref('') // id const buttonArray = ref([]) const pageType = ref('add') // 页面类型: add,edit, detail -const buttonLoading = ref(false) // 按钮加载状态 const textMap: { [key: string]: string } = { add: '新建', edit: '编辑', @@ -153,35 +153,33 @@ const selectPerson = () => { checkListRef.value.initDialog() } - -// 添加表格数据对象 -const addList = ref({}) +// 下拉框列表类型 +interface optionsType { + name: string + id: string + value: string +} // 检修结果下拉框 -const options = ref([ - { name: '已维修,可用', id: '1' }, - { name: '已维修,未修好', id: '2' }, - { name: '未维修', id: '3' }, - { name: '其他', id: '4' }, -]) -// 添加表格弹窗开关 -const dialogVisible = ref(false) +const options = ref([]) + +// 获取检修结果 +getDictByCode('maintenanceResults').then((response) => { + options.value = response.data +}) // 初始化router const $router = useRouter() // 关闭新增页面的回调 const close = () => { $router.back() } +// 表单验证规则 const rules = ref({ applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }], acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }], overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }], time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }], -}) // 表单验证规则 -// 点击文件预览 -const uploadShow = (e: any) => { - const URL = window.URL || window.webkitURL - window.open(URL.createObjectURL(e.raw)) -} +}) + const onFileChange = (event: any) => { // 原生上传 console.log(event.target.files) diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue index 467d5cd..203d325 100644 --- a/src/views/device/deviceMaintenance/manageCheckList.vue +++ b/src/views/device/deviceMaintenance/manageCheckList.vue @@ -6,7 +6,6 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList' import { uploadApi } from '@/api/system/notice' -import { exportExcel } from '@/utils/exportXlsx' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' // 查询条件 @@ -19,8 +18,6 @@ offset: 1, // 当前页 limit: 20, // 当前页多少条 }) -// 控制是否显示新增页面 -const show = ref(true) // 表格数据 const list = ref([]) // 获取权限 @@ -173,10 +170,10 @@ } // 批量导入 -const uploadAll = () => { - // todo: 批量导入 - fileRef.value.click() -} +// const uploadAll = () => { +// // todo: 批量导入 +// fileRef.value.click() +// } // 添加设备管理点检查 const add = () => { $router.push('/maintenance/manageCheckList/add') @@ -222,76 +219,74 @@ diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index 0352e2a..9340b25 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -15,7 +15,7 @@ type: String, default: '0', }, - buttonType: { + buttonType: { // 从列表的哪个按钮进入的 type: String, default: '', }, diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue index 2f4da9c..8f6499b 100644 --- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue +++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue @@ -92,7 +92,7 @@ reset() } else { - ElMessage.warning('请先选择设备') + ElMessage.warning('请先选择文件') } } // 取消 diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue index 016c289..3098273 100644 --- a/src/views/device/standardEquipment/components/standardListAdd.vue +++ b/src/views/device/standardEquipment/components/standardListAdd.vue @@ -1,20 +1,35 @@