报告模版新增pattern字段
This commit is contained in:
@@ -1,39 +1,34 @@
|
|||||||
import type { ReqPage, ResPage } from '@/api/interface'
|
import type { ReqPage, ResPage } from '@/api/interface'
|
||||||
import type { UploadFile } from 'element-plus';
|
|
||||||
|
|
||||||
// 报告模版接口
|
|
||||||
export namespace PqReport {
|
export namespace PqReport {
|
||||||
|
|
||||||
/**
|
|
||||||
* 报告模版表格分页查询参数
|
|
||||||
*/
|
|
||||||
export interface ReqReportParams extends ReqPage {
|
export interface ReqReportParams extends ReqPage {
|
||||||
id: string; // 装置序号id 必填
|
id: string
|
||||||
name?: string; // 设备名称
|
name?: string
|
||||||
createTime?: string; //创建时间
|
createTime?: string
|
||||||
|
pattern: string
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 报告模版新增、修改、根据id查询返回的对象
|
|
||||||
*/
|
|
||||||
export interface ResReport {
|
export interface ResReport {
|
||||||
id: string; //报告模板id
|
id: string
|
||||||
name: string;//报告模板名称
|
name: string
|
||||||
version:string;//版本号
|
version: string
|
||||||
baseFile?:string;//基础模板文件路径
|
pattern: string
|
||||||
detailFile?:string;//检测项模版文件路径
|
baseFile?: string
|
||||||
description:string;//描述信息
|
detailFile?: string
|
||||||
state:number;//状态:8-删除 1-正常
|
description: string
|
||||||
createBy?: string| null; //创建用户
|
state: number
|
||||||
createTime?: string| null; //创建时间
|
createBy?: string | null
|
||||||
updateBy?: string| null; //更新用户
|
createTime?: string | null
|
||||||
updateTime?: string| null; //更新时间
|
updateBy?: string | null
|
||||||
|
updateTime?: string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
export interface ResReportOption {
|
||||||
* 报告模版表格查询分页返回的对象;
|
id: string
|
||||||
*/
|
name: string
|
||||||
export interface ResReportPage extends ResPage<ResReport> {
|
version: string
|
||||||
|
displayName: string
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
export interface ResReportPage extends ResPage<ResReport> {}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,51 +1,49 @@
|
|||||||
import type {PqReport} from '@/api/device/interface/report'
|
import type { PqReport } from '@/api/device/interface/report'
|
||||||
import http from '@/api'
|
import http from '@/api'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @name 报告模版模块
|
* @name 报告模版模块
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//获取报告模版
|
//获取报告模版
|
||||||
export const getPqReportList = (params: PqReport.ReqReportParams) => {
|
export const getPqReportList = (params: PqReport.ReqReportParams) => {
|
||||||
return http.post(`/report/list`, params)
|
return http.post(`/report/list`, params)
|
||||||
}
|
}
|
||||||
|
|
||||||
//新增报告模版
|
//新增报告模版
|
||||||
export const addPqReport = (params: PqReport.ResReport) => {
|
export const addPqReport = (params: PqReport.ResReport) => {
|
||||||
return http.upload(`/report/add`, params)
|
return http.upload(`/report/add`, params)
|
||||||
}
|
}
|
||||||
|
|
||||||
//删除报告模版
|
//删除报告模版
|
||||||
export const deletePqReport = (params: string[]) => {
|
export const deletePqReport = (params: string[]) => {
|
||||||
return http.post(`/report/delete`, params)
|
return http.post(`/report/delete`, params)
|
||||||
}
|
}
|
||||||
|
|
||||||
//查询报告模板详情
|
//查询报告模板详情
|
||||||
export const getPqReportById = (params: PqReport.ResReport) => {
|
export const getPqReportById = (params: PqReport.ResReport) => {
|
||||||
return http.get(`/report/getById?id=${params.id}`)
|
return http.get(`/report/getById?id=${params.id}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
//修改报告模板
|
//修改报告模板
|
||||||
export const updatePqReport = (params: PqReport.ResReport) => {
|
export const updatePqReport = (params: PqReport.ResReport) => {
|
||||||
return http.upload(`/report/update`, params)
|
return http.upload(`/report/update`, params)
|
||||||
}
|
}
|
||||||
|
|
||||||
//查询所有报告模板名称
|
export const getPqReportOptions = (params: { pattern: string }) => {
|
||||||
export const getPqReportAllName = () => {
|
return http.get(`/report/listOptions?pattern=${params.pattern}`)
|
||||||
return http.get(`/report/listAllName`)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//根据名称查询指定报告模板的所有版本
|
//根据名称查询指定报告模板的所有版本
|
||||||
export const getPqReportAllVersion = (params:any) => {
|
export const getPqReportAllVersion = (params: any) => {
|
||||||
return http.get(`/report/listAllVersion?name=${params.name}`)
|
return http.get(`/report/listAllVersion?name=${params.name}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
//被检设备归档
|
//被检设备归档
|
||||||
export const documentedPqDev = (ids: string[]) => {
|
export const documentedPqDev = (ids: string[]) => {
|
||||||
return http.post(`/report/documented`, ids)
|
return http.post(`/report/documented`, ids)
|
||||||
}
|
}
|
||||||
|
|
||||||
//上传报告到云端
|
//上传报告到云端
|
||||||
export const uploadReportToCloud = (deviceIds: string[]) => {
|
export const uploadReportToCloud = (deviceIds: string[]) => {
|
||||||
return http.post(`/report/uploadReportToCloud`, deviceIds)
|
return http.post(`/report/uploadReportToCloud`, deviceIds)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -200,10 +200,10 @@
|
|||||||
placeholder="请选择报告模版"
|
placeholder="请选择报告模版"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="(option, index) in pqReportName"
|
v-for="option in pqReportName"
|
||||||
:key="index"
|
:key="option.id"
|
||||||
:label="option.name"
|
:label="option.displayName"
|
||||||
:value="option.name"
|
:value="option.displayName"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -454,7 +454,8 @@ import { type TestSource } from '@/api/device/interface/testSource'
|
|||||||
import { type TestScript } from '@/api/device/interface/testScript'
|
import { type TestScript } from '@/api/device/interface/testScript'
|
||||||
import { type ErrorSystem } from '@/api/device/interface/error'
|
import { type ErrorSystem } from '@/api/device/interface/error'
|
||||||
import { type Device } from '@/api/device/interface/device'
|
import { type Device } from '@/api/device/interface/device'
|
||||||
import { getPqReportAllName } from '@/api/device/report'
|
import { type PqReport } from '@/api/device/interface/report'
|
||||||
|
import { getPqReportOptions } from '@/api/device/report'
|
||||||
import { useAppSceneStore, useModeStore } from '@/stores/modules/mode'
|
import { useAppSceneStore, useModeStore } from '@/stores/modules/mode'
|
||||||
import { canBindingList, getAllPqStandardDev } from '@/api/device/standardDevice'
|
import { canBindingList, getAllPqStandardDev } from '@/api/device/standardDevice'
|
||||||
import { type StandardDevice } from '@/api/device/interface/standardDevice'
|
import { type StandardDevice } from '@/api/device/interface/standardDevice'
|
||||||
@@ -482,7 +483,7 @@ const pqErrSysList = ref<ErrorSystem.ErrorSystemList[]>([]) //获取指定模式
|
|||||||
const pqDevList = ref<Device.ResPqDev[]>([]) //获取指定模式下所有被检设备
|
const pqDevList = ref<Device.ResPqDev[]>([]) //获取指定模式下所有被检设备
|
||||||
const pqStandardDevList = ref<StandardDevice.ResPqStandardDevice[]>([]) //获取指定模式下所有标准设备
|
const pqStandardDevList = ref<StandardDevice.ResPqStandardDevice[]>([]) //获取指定模式下所有标准设备
|
||||||
|
|
||||||
const pqReportName = ref<{ name: string }[]>([])
|
const pqReportName = ref<PqReport.ResReportOption[]>([])
|
||||||
|
|
||||||
const pqSourceArray = ref<{ label: string; value: string }[]>()
|
const pqSourceArray = ref<{ label: string; value: string }[]>()
|
||||||
const pqScriptArray = ref<{ label: string; value: string,fluke?:number|boolean}[]>()
|
const pqScriptArray = ref<{ label: string; value: string,fluke?:number|boolean}[]>()
|
||||||
@@ -864,7 +865,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
|||||||
] = await Promise.all([
|
] = await Promise.all([
|
||||||
getPqErrSysList(),
|
getPqErrSysList(),
|
||||||
getUnboundPqDevList({ pattern: data.pattern }),
|
getUnboundPqDevList({ pattern: data.pattern }),
|
||||||
getPqReportAllName(),
|
getPqReportOptions({ pattern: data.pattern || patternId }),
|
||||||
canBindingList(),
|
canBindingList(),
|
||||||
getTestConfig(),
|
getTestConfig(),
|
||||||
getRegRes({ type: patternId }),
|
getRegRes({ type: patternId }),
|
||||||
@@ -904,15 +905,11 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
|||||||
getPqScriptList(data),
|
getPqScriptList(data),
|
||||||
getPqErrSysList(),
|
getPqErrSysList(),
|
||||||
getUnboundPqDevList({ pattern: data.pattern }),
|
getUnboundPqDevList({ pattern: data.pattern }),
|
||||||
getPqReportAllName()
|
getPqReportOptions({ pattern: data.pattern || patternId })
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Array.isArray(pqReportName_Result.data)) {
|
pqReportName.value = Array.isArray(pqReportName_Result.data) ? pqReportName_Result.data : []
|
||||||
pqReportName.value = pqReportName_Result.data.map((item: any) => ({ name: item }))
|
|
||||||
} else {
|
|
||||||
pqReportName.value = []
|
|
||||||
}
|
|
||||||
pqSourceList.value = pqSource_Result.data as TestSource.ResTestSource[]
|
pqSourceList.value = pqSource_Result.data as TestSource.ResTestSource[]
|
||||||
pqScriptList.value = PqScript_Result.data as TestScript.ResTestScript[]
|
pqScriptList.value = PqScript_Result.data as TestScript.ResTestScript[]
|
||||||
pqErrSysList.value = PqErrSys_Result.data as unknown as ErrorSystem.ErrorSystemList[]
|
pqErrSysList.value = PqErrSys_Result.data as unknown as ErrorSystem.ErrorSystemList[]
|
||||||
@@ -978,7 +975,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
|||||||
getPqErrSysList(),
|
getPqErrSysList(),
|
||||||
getBoundPqDevList({ planIdList: [data.id] }),
|
getBoundPqDevList({ planIdList: [data.id] }),
|
||||||
getUnboundPqDevList({ pattern: data.pattern }),
|
getUnboundPqDevList({ pattern: data.pattern }),
|
||||||
getPqReportAllName(),
|
getPqReportOptions({ pattern: data.pattern || patternId }),
|
||||||
getAllPqStandardDev(),
|
getAllPqStandardDev(),
|
||||||
getAllUser()
|
getAllUser()
|
||||||
])
|
])
|
||||||
@@ -1027,15 +1024,11 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
|||||||
getPqErrSysList(),
|
getPqErrSysList(),
|
||||||
getBoundPqDevList({ planIdList: [data.id] }),
|
getBoundPqDevList({ planIdList: [data.id] }),
|
||||||
getUnboundPqDevList({ pattern: data.pattern }),
|
getUnboundPqDevList({ pattern: data.pattern }),
|
||||||
getPqReportAllName()
|
getPqReportOptions({ pattern: data.pattern || patternId })
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Array.isArray(pqReportName_Result.data)) {
|
pqReportName.value = Array.isArray(pqReportName_Result.data) ? pqReportName_Result.data : []
|
||||||
pqReportName.value = pqReportName_Result.data.map((item: any) => ({ name: item }))
|
|
||||||
} else {
|
|
||||||
pqReportName.value = []
|
|
||||||
}
|
|
||||||
|
|
||||||
pqSourceList.value = pqSource_Result.data as TestSource.ResTestSource[]
|
pqSourceList.value = pqSource_Result.data as TestSource.ResTestSource[]
|
||||||
pqScriptList.value = PqScript_Result.data as TestScript.ResTestScript[]
|
pqScriptList.value = PqScript_Result.data as TestScript.ResTestScript[]
|
||||||
|
|||||||
@@ -3,53 +3,53 @@
|
|||||||
<div>
|
<div>
|
||||||
<el-form ref="dialogFormRef" :model="formContent" :rules="rules">
|
<el-form ref="dialogFormRef" :model="formContent" :rules="rules">
|
||||||
<el-form-item label="名称" prop="name">
|
<el-form-item label="名称" prop="name">
|
||||||
<el-input v-model="formContent.name" placeholder="请输入报告名称" maxlength="32" show-word-limit/>
|
<el-input v-model="formContent.name" placeholder="请输入报告名称" maxlength="32" show-word-limit />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="版本号" prop="version">
|
<el-form-item label="版本号" prop="version">
|
||||||
<el-input v-model="formContent.version" placeholder="请输入版本号" maxlength="32" show-word-limit/>
|
<el-input v-model="formContent.version" placeholder="请输入版本号" maxlength="32" show-word-limit />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="基础模板文件" prop="baseFile">
|
<el-form-item label="基础模板文件" prop="baseFile">
|
||||||
<el-upload
|
<el-upload
|
||||||
action="#"
|
action="#"
|
||||||
:limit="1"
|
:limit="1"
|
||||||
:on-change='BaseHandleChange'
|
:on-change="baseHandleChange"
|
||||||
:auto-upload="false"
|
:auto-upload="false"
|
||||||
:file-list="baseFileList"
|
:file-list="baseFileList"
|
||||||
:on-exceed="BaseHandleExceed"
|
:on-exceed="baseHandleExceed"
|
||||||
:on-remove="BaseHandleRemove"
|
:on-remove="baseHandleRemove"
|
||||||
style="width: 100% !important;"
|
style="width: 100% !important;"
|
||||||
accept=".docx"
|
accept=".docx"
|
||||||
class="upload-container"
|
class="upload-container"
|
||||||
>
|
>
|
||||||
<el-button type="primary">选择文件</el-button>
|
<el-button type="primary">选择文件</el-button>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
仅支持上传大小不超过5MB的.docx文件
|
仅支持上传大小不超过5MB的.docx文件
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="检测项模版文件" prop="detailFile">
|
<el-form-item label="检测项模板文件" prop="detailFile">
|
||||||
<el-upload
|
<el-upload
|
||||||
action="#"
|
action="#"
|
||||||
:limit="1"
|
:limit="1"
|
||||||
:on-change='DataHandleChange'
|
:on-change="dataHandleChange"
|
||||||
:auto-upload="false"
|
:auto-upload="false"
|
||||||
:file-list="detailFileList"
|
:file-list="detailFileList"
|
||||||
:on-exceed="DataHandleExceed"
|
:on-exceed="dataHandleExceed"
|
||||||
:on-remove="DataHandleRemove"
|
:on-remove="dataHandleRemove"
|
||||||
style="width: 100% !important;"
|
style="width: 100% !important;"
|
||||||
accept=".docx"
|
accept=".docx"
|
||||||
class="upload-container"
|
class="upload-container"
|
||||||
>
|
>
|
||||||
<el-button type="primary">选择文件</el-button>
|
<el-button type="primary">选择文件</el-button>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
仅支持上传大小不超过5MB的.docx文件
|
仅支持上传大小不超过5MB的.docx文件
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="描述信息" prop="description">
|
<el-form-item label="描述信息" prop="description">
|
||||||
<el-input v-model="formContent.description" type="textarea" placeholder="请输入描述信息"/>
|
<el-input v-model="formContent.description" type="textarea" placeholder="请输入描述信息" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div>
|
<div>
|
||||||
<el-button @click="close()">取 消</el-button>
|
<el-button @click="close()">取消</el-button>
|
||||||
<el-button type="primary" @click="save()">保存</el-button>
|
<el-button type="primary" @click="save()">保存</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -57,71 +57,72 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {dialogSmall} from '@/utils/elementBind'
|
import { computed, reactive, ref } from 'vue'
|
||||||
import {type PqReport} from '@/api/device/interface/report'
|
import { ElMessage, type UploadFile } from 'element-plus'
|
||||||
import {ElMessage, UploadFile} from 'element-plus'
|
|
||||||
import {addPqReport, getPqReportById, updatePqReport} from '@/api/device/report'
|
import type { PqReport } from '@/api/device/interface/report'
|
||||||
import {computed, reactive, ref} from 'vue'
|
import { addPqReport, getPqReportById, updatePqReport } from '@/api/device/report'
|
||||||
|
import { useDictStore } from '@/stores/modules/dict'
|
||||||
|
import { useModeStore } from '@/stores/modules/mode'
|
||||||
|
import { dialogSmall } from '@/utils/elementBind'
|
||||||
|
|
||||||
// 定义弹出组件元信息
|
|
||||||
const dialogFormRef = ref()
|
const dialogFormRef = ref()
|
||||||
let excelFormData = new FormData()
|
let excelFormData = new FormData()
|
||||||
|
|
||||||
|
const dictStore = useDictStore()
|
||||||
|
const modeStore = useModeStore()
|
||||||
|
|
||||||
const baseFileName = ref('')
|
const baseFileName = ref('')
|
||||||
const baseFileUrl = ref('')
|
const baseFileUrl = ref('')
|
||||||
const detailFileName = ref('')
|
const detailFileName = ref('')
|
||||||
const detailFileUrl = ref('')
|
const detailFileUrl = ref('')
|
||||||
|
|
||||||
|
const getCurrentPatternId = () => {
|
||||||
|
return dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
|
||||||
|
}
|
||||||
|
|
||||||
|
const createDefaultFormContent = (): PqReport.ResReport => ({
|
||||||
|
id: '',
|
||||||
|
name: '',
|
||||||
|
version: '',
|
||||||
|
pattern: '',
|
||||||
|
description: '',
|
||||||
|
detailFile: '',
|
||||||
|
baseFile: '',
|
||||||
|
state: 1
|
||||||
|
})
|
||||||
|
|
||||||
const baseFileList = computed(() => {
|
const baseFileList = computed(() => {
|
||||||
if (baseFileName.value && baseFileUrl.value) {
|
if (baseFileName.value && baseFileUrl.value) {
|
||||||
return [{name: baseFileName.value, url: baseFileUrl.value}];
|
return [{ name: baseFileName.value, url: baseFileUrl.value }]
|
||||||
}
|
}
|
||||||
return [];
|
return []
|
||||||
});
|
})
|
||||||
|
|
||||||
const detailFileList = computed(() => {
|
const detailFileList = computed(() => {
|
||||||
if (detailFileName.value && detailFileUrl.value) {
|
if (detailFileName.value && detailFileUrl.value) {
|
||||||
return [{name: detailFileName.value, url: detailFileUrl.value}];
|
return [{ name: detailFileName.value, url: detailFileUrl.value }]
|
||||||
}
|
}
|
||||||
return [];
|
return []
|
||||||
});
|
})
|
||||||
|
|
||||||
function useMetaInfo() {
|
function useMetaInfo() {
|
||||||
const dialogVisible = ref(false)
|
const dialogVisible = ref(false)
|
||||||
const titleType = ref('add')
|
const titleType = ref('add')
|
||||||
const formContent = ref<PqReport.ResReport>({
|
const formContent = ref<PqReport.ResReport>(createDefaultFormContent())
|
||||||
id: '',
|
return { dialogVisible, titleType, formContent }
|
||||||
name: '',
|
|
||||||
version: '', // 版本号
|
|
||||||
description: '', // 描述信息
|
|
||||||
detailFile: '',//检测项模版文件路径
|
|
||||||
baseFile: '',
|
|
||||||
state: 1,
|
|
||||||
})
|
|
||||||
return {dialogVisible, titleType, formContent}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const {dialogVisible, titleType, formContent} = useMetaInfo()
|
const { dialogVisible, titleType, formContent } = useMetaInfo()
|
||||||
|
|
||||||
// 清空formContent
|
|
||||||
const resetFormContent = () => {
|
const resetFormContent = () => {
|
||||||
formContent.value = {
|
formContent.value = createDefaultFormContent()
|
||||||
id: '',
|
|
||||||
name: '',
|
|
||||||
version: '', // 版本号
|
|
||||||
description: '', // 描述信息
|
|
||||||
detailFile: '',//检测项模版文件路径
|
|
||||||
baseFile: '',
|
|
||||||
state: 1,
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let dialogTitle = computed(() => {
|
const dialogTitle = computed(() => {
|
||||||
return titleType.value === 'add' ? '新增报告模版' : '编辑报告模版'
|
return titleType.value === 'add' ? '新增报告模板' : '编辑报告模板'
|
||||||
})
|
})
|
||||||
|
|
||||||
// 关闭弹窗
|
|
||||||
const close = () => {
|
const close = () => {
|
||||||
excelFormData = new FormData()
|
excelFormData = new FormData()
|
||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
@@ -129,176 +130,158 @@ const close = () => {
|
|||||||
dialogFormRef.value?.resetFields()
|
dialogFormRef.value?.resetFields()
|
||||||
}
|
}
|
||||||
|
|
||||||
// 表单验证规则
|
|
||||||
const rules = reactive({
|
const rules = reactive({
|
||||||
name: [{required: true, message: '请输入报告名称', trigger: 'blur'}],
|
name: [{ required: true, message: '请输入报告名称', trigger: 'blur' }],
|
||||||
version: [{required: true, message: '请输入版本号', trigger: 'blur'}],
|
version: [{ required: true, message: '请输入版本号', trigger: 'blur' }],
|
||||||
baseFile: [{required: true, message: '请上传基础模板文件', trigger: 'change'}],
|
baseFile: [{ required: true, message: '请上传基础模板文件', trigger: 'change' }],
|
||||||
detailFile: [{required: true, message: '请上传检测项模版文件', trigger: 'change'}],
|
detailFile: [{ required: true, message: '请上传检测项模板文件', trigger: 'change' }]
|
||||||
})
|
})
|
||||||
|
|
||||||
// 保存数据
|
|
||||||
const save = () => {
|
const save = () => {
|
||||||
try {
|
try {
|
||||||
dialogFormRef.value?.validate(async (valid: boolean) => {
|
dialogFormRef.value?.validate(async (valid: boolean) => {
|
||||||
if (valid) {
|
if (!valid) return
|
||||||
// 清空 excelFormData
|
|
||||||
excelFormData.delete('id')
|
|
||||||
excelFormData.delete('name')
|
|
||||||
excelFormData.delete('version')
|
|
||||||
excelFormData.delete('description')
|
|
||||||
|
|
||||||
excelFormData.append('name', formContent.value.name)
|
excelFormData.delete('id')
|
||||||
excelFormData.append('version', formContent.value.version)
|
excelFormData.delete('name')
|
||||||
excelFormData.append('description', formContent.value.description)
|
excelFormData.delete('version')
|
||||||
let baseFileFlag = handleFileLimit(excelFormData.get('baseFile') as File)
|
excelFormData.delete('description')
|
||||||
let detailFileFlag = handleFileLimit(excelFormData.get('detailFile') as File)
|
excelFormData.delete('pattern')
|
||||||
if (!baseFileFlag || !detailFileFlag) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (formContent.value.id) {
|
|
||||||
|
|
||||||
excelFormData.append('id', formContent.value.id)
|
const patternId = formContent.value.pattern || getCurrentPatternId()
|
||||||
await updatePqReport(excelFormData);
|
if (!patternId) {
|
||||||
ElMessage.success({message: `${dialogTitle.value}成功!`})
|
ElMessage.error({ message: '当前模式未找到对应的模式ID' })
|
||||||
} else {
|
return
|
||||||
await addPqReport(excelFormData);
|
|
||||||
ElMessage.success({message: `${dialogTitle.value}成功!`})
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
close()
|
|
||||||
// 刷新表格
|
|
||||||
await props.refreshTable!()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
excelFormData.append('name', formContent.value.name)
|
||||||
|
excelFormData.append('version', formContent.value.version)
|
||||||
|
excelFormData.append('description', formContent.value.description)
|
||||||
|
excelFormData.append('pattern', patternId)
|
||||||
|
|
||||||
|
const baseFileFlag = handleFileLimit(excelFormData.get('baseFile') as File)
|
||||||
|
const detailFileFlag = handleFileLimit(excelFormData.get('detailFile') as File)
|
||||||
|
if (!baseFileFlag || !detailFileFlag) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (formContent.value.id) {
|
||||||
|
excelFormData.append('id', formContent.value.id)
|
||||||
|
await updatePqReport(excelFormData as unknown as PqReport.ResReport)
|
||||||
|
ElMessage.success({ message: `${dialogTitle.value}成功` })
|
||||||
|
} else {
|
||||||
|
await addPqReport(excelFormData as unknown as PqReport.ResReport)
|
||||||
|
ElMessage.success({ message: `${dialogTitle.value}成功` })
|
||||||
|
}
|
||||||
|
|
||||||
|
close()
|
||||||
|
await props.refreshTable?.()
|
||||||
})
|
})
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('验证过程中出现错误', err)
|
console.error('校验过程中出现错误', err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 打开弹窗,可能是新增,也可能是编辑
|
|
||||||
const open = async (sign: string, data?: PqReport.ResReport) => {
|
const open = async (sign: string, data?: PqReport.ResReport) => {
|
||||||
titleType.value = sign
|
titleType.value = sign
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
if (data?.id) {
|
if (data?.id) {
|
||||||
await getPqReportById(data).then((res) => {
|
await getPqReportById(data).then(res => {
|
||||||
formContent.value.id = res.data.id
|
formContent.value.id = res.data.id
|
||||||
formContent.value.name = res.data.name
|
formContent.value.name = res.data.name
|
||||||
formContent.value.version = res.data.version
|
formContent.value.version = res.data.version
|
||||||
|
formContent.value.pattern = res.data.pattern
|
||||||
formContent.value.description = res.data.description
|
formContent.value.description = res.data.description
|
||||||
|
|
||||||
|
|
||||||
// 处理文件信息
|
|
||||||
if (res.data.baseFileVO) {
|
if (res.data.baseFileVO) {
|
||||||
baseFileName.value = res.data.baseFileVO.name;
|
baseFileName.value = res.data.baseFileVO.name
|
||||||
baseFileUrl.value = res.data.baseFileVO.url;
|
baseFileUrl.value = res.data.baseFileVO.url
|
||||||
|
|
||||||
formContent.value.baseFile = res.data.baseFileVO.name
|
formContent.value.baseFile = res.data.baseFileVO.name
|
||||||
}
|
}
|
||||||
if (res.data.detailFileVO) {
|
if (res.data.detailFileVO) {
|
||||||
detailFileName.value = res.data.detailFileVO.name;
|
detailFileName.value = res.data.detailFileVO.name
|
||||||
detailFileUrl.value = res.data.detailFileVO.url;
|
detailFileUrl.value = res.data.detailFileVO.url
|
||||||
|
|
||||||
formContent.value.detailFile = res.data.detailFileVO.name
|
formContent.value.detailFile = res.data.detailFileVO.name
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
baseFileName.value = ''
|
baseFileName.value = ''
|
||||||
baseFileUrl.value = ''
|
baseFileUrl.value = ''
|
||||||
detailFileName.value = ''
|
detailFileName.value = ''
|
||||||
detailFileUrl.value = ''
|
detailFileUrl.value = ''
|
||||||
resetFormContent();
|
resetFormContent()
|
||||||
|
formContent.value.pattern = getCurrentPatternId()
|
||||||
dialogFormRef.value?.resetFields()
|
dialogFormRef.value?.resetFields()
|
||||||
// 清空 excelFormData
|
excelFormData = new FormData()
|
||||||
excelFormData = new FormData();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const DataHandleRemove = () => {
|
const dataHandleRemove = () => {
|
||||||
excelFormData.delete('detailFile');
|
excelFormData.delete('detailFile')
|
||||||
formContent.value.detailFile = ''
|
formContent.value.detailFile = ''
|
||||||
};
|
}
|
||||||
|
|
||||||
const BaseHandleRemove = () => {
|
const baseHandleRemove = () => {
|
||||||
excelFormData.delete('baseFile');
|
excelFormData.delete('baseFile')
|
||||||
formContent.value.baseFile = ''
|
formContent.value.baseFile = ''
|
||||||
};
|
}
|
||||||
|
|
||||||
const BaseHandleExceed = (files: File[]) => {
|
const baseHandleExceed = (files: File[]) => {
|
||||||
// 移除旧文件
|
excelFormData.delete('baseFile')
|
||||||
excelFormData.delete('baseFile');
|
|
||||||
// 添加新文件
|
|
||||||
if (files.length > 0) {
|
if (files.length > 0) {
|
||||||
const newFile = files[0] as unknown as UploadFile;
|
const newFile = files[0] as unknown as UploadFile
|
||||||
baseFileName.value = newFile.name;
|
baseFileName.value = newFile.name
|
||||||
excelFormData.append('baseFile', newFile as Blob, newFile.name);
|
excelFormData.append('baseFile', newFile as unknown as Blob, newFile.name)
|
||||||
|
|
||||||
formContent.value.baseFile = newFile.name
|
formContent.value.baseFile = newFile.name
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
const DataHandleExceed = (files: File[]) => {
|
|
||||||
// 移除旧文件
|
|
||||||
excelFormData.delete('detailFile');
|
|
||||||
|
|
||||||
// 添加新文件
|
|
||||||
if (files.length > 0) {
|
|
||||||
const newFile = files[0] as UploadFile;
|
|
||||||
detailFileName.value = newFile.name;
|
|
||||||
excelFormData.append('detailFile', newFile as Blob, newFile.name);
|
|
||||||
|
|
||||||
formContent.value.detailFile = newFile.name
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
const BaseHandleChange = async (param: UploadFile) => {
|
|
||||||
baseFileName.value = param.name;
|
|
||||||
baseFileUrl.value = URL.createObjectURL(param.raw as Blob);
|
|
||||||
excelFormData.append('baseFile', param.raw as Blob, param.name);
|
|
||||||
|
|
||||||
formContent.value.baseFile = param.name;
|
|
||||||
};
|
|
||||||
|
|
||||||
const DataHandleChange = async (param: UploadFile) => {
|
|
||||||
detailFileName.value = param.name;
|
|
||||||
detailFileUrl.value = URL.createObjectURL(param.raw as Blob);
|
|
||||||
excelFormData.append('detailFile', param.raw as Blob, param.name);
|
|
||||||
|
|
||||||
formContent.value.detailFile = param.name;
|
|
||||||
};
|
|
||||||
|
|
||||||
const fileSizeLimit = 5 * 1024 * 1024; // 5MB
|
|
||||||
|
|
||||||
const handleFileLimit = (file: File) => {
|
|
||||||
if (file) {
|
|
||||||
if (file.size > fileSizeLimit) {
|
|
||||||
ElMessage.error({message: `文件大小不能超过${fileSizeLimit / 1024 / 1024}MB`});
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const dataHandleExceed = (files: File[]) => {
|
||||||
|
excelFormData.delete('detailFile')
|
||||||
|
if (files.length > 0) {
|
||||||
|
const newFile = files[0] as UploadFile
|
||||||
|
detailFileName.value = newFile.name
|
||||||
|
excelFormData.append('detailFile', newFile as unknown as Blob, newFile.name)
|
||||||
|
formContent.value.detailFile = newFile.name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 对外映射
|
const baseHandleChange = async (param: UploadFile) => {
|
||||||
defineExpose({open})
|
baseFileName.value = param.name
|
||||||
|
baseFileUrl.value = URL.createObjectURL(param.raw as Blob)
|
||||||
|
excelFormData.set('baseFile', param.raw as Blob, param.name)
|
||||||
|
formContent.value.baseFile = param.name
|
||||||
|
}
|
||||||
|
|
||||||
|
const dataHandleChange = async (param: UploadFile) => {
|
||||||
|
detailFileName.value = param.name
|
||||||
|
detailFileUrl.value = URL.createObjectURL(param.raw as Blob)
|
||||||
|
excelFormData.set('detailFile', param.raw as Blob, param.name)
|
||||||
|
formContent.value.detailFile = param.name
|
||||||
|
}
|
||||||
|
|
||||||
|
const fileSizeLimit = 5 * 1024 * 1024
|
||||||
|
|
||||||
|
const handleFileLimit = (file: File | null) => {
|
||||||
|
if (file) {
|
||||||
|
if (file.size > fileSizeLimit) {
|
||||||
|
ElMessage.error({ message: `文件大小不能超过${fileSizeLimit / 1024 / 1024}MB` })
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
defineExpose({ open })
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
refreshTable: (() => Promise<void>) | undefined
|
refreshTable: (() => Promise<void>) | undefined
|
||||||
}>()
|
}>()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.upload-container {
|
.upload-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,137 +1,142 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class='table-box' ref='popupBaseView'>
|
<div class="table-box" ref="popupBaseView">
|
||||||
<ProTable
|
<ProTable ref="proTable" :columns="columns" :request-api="getTableList">
|
||||||
ref='proTable'
|
<template #tableHeader="scope">
|
||||||
:columns='columns'
|
<el-button v-auth.device="'add'" type="primary" :icon="CirclePlus" @click="openDialog('add')">新增</el-button>
|
||||||
:request-api='getTableList'
|
<el-button
|
||||||
>
|
v-auth.device="'delete'"
|
||||||
<!-- :requestApi="getRoleList" -->
|
type="danger"
|
||||||
<!-- 表格 header 按钮 -->
|
:icon="Delete"
|
||||||
<template #tableHeader='scope'>
|
plain
|
||||||
<el-button v-auth.device="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
|
:disabled="!scope.isSelected"
|
||||||
<el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
|
@click="batchDelete(scope.selectedListIds)"
|
||||||
@click='batchDelete(scope.selectedListIds)'>
|
>
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
<!-- 表格操作 -->
|
|
||||||
<template #operation='scope'>
|
|
||||||
<el-button v-auth.device="'edit'" type='primary' link :icon='EditPen' :model-value='false'
|
|
||||||
@click="openDialog('edit', scope.row)">编辑
|
|
||||||
</el-button>
|
|
||||||
<el-button v-auth.device="'delete'" type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除
|
|
||||||
</el-button>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
</ProTable>
|
|
||||||
</div>
|
|
||||||
<ReportPopup :refresh-table='proTable?.getTableList' ref='reportPopup'/>
|
|
||||||
|
|
||||||
</template>
|
<template #operation="scope">
|
||||||
|
<el-button
|
||||||
<script setup lang='tsx' name='useRole'>
|
v-auth.device="'edit'"
|
||||||
import {type PqReport} from '@/api/device/interface/report.ts'
|
type="primary"
|
||||||
import {useHandleData} from '@/hooks/useHandleData'
|
link
|
||||||
import {useDownload} from '@/hooks/useDownload'
|
:icon="EditPen"
|
||||||
import ProTable from '@/components/ProTable/index.vue'
|
:model-value="false"
|
||||||
import {type ColumnProps, type ProTableInstance} from '@/components/ProTable/interface'
|
@click="openDialog('edit', scope.row)"
|
||||||
import ReportPopup from '@/views/system/template/components/reportPopup.vue'
|
>
|
||||||
import {CirclePlus, Delete, Download, EditPen, Upload} from '@element-plus/icons-vue'
|
编辑
|
||||||
import {useDictStore} from '@/stores/modules/dict'
|
</el-button>
|
||||||
import {getPqReportList,deletePqReport} from '@/api/device/report/index.ts'
|
<el-button v-auth.device="'delete'" type="primary" link :icon="Delete" @click="handleDelete(scope.row)">
|
||||||
import {reactive, ref} from 'vue'
|
删除
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</ProTable>
|
||||||
|
</div>
|
||||||
|
<ReportPopup :refresh-table="proTable?.getTableList" ref="reportPopup" />
|
||||||
|
</template>
|
||||||
|
|
||||||
// ProTable 实例
|
<script setup lang="tsx" name="useRole">
|
||||||
const proTable = ref<ProTableInstance>()
|
import { ElMessage } from 'element-plus'
|
||||||
const reportPopup = ref()
|
import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue'
|
||||||
|
import { reactive, ref } from 'vue'
|
||||||
|
|
||||||
const getTableList = async (params: any) => {
|
import type { PqReport } from '@/api/device/interface/report.ts'
|
||||||
let newParams = JSON.parse(JSON.stringify(params))
|
import { deletePqReport, getPqReportList } from '@/api/device/report/index.ts'
|
||||||
return getPqReportList(newParams)
|
import ProTable from '@/components/ProTable/index.vue'
|
||||||
|
import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
|
||||||
|
import { useHandleData } from '@/hooks/useHandleData'
|
||||||
|
import { useDictStore } from '@/stores/modules/dict'
|
||||||
|
import { useModeStore } from '@/stores/modules/mode'
|
||||||
|
import ReportPopup from '@/views/system/template/components/reportPopup.vue'
|
||||||
|
|
||||||
|
const proTable = ref<ProTableInstance>()
|
||||||
|
const reportPopup = ref()
|
||||||
|
const dictStore = useDictStore()
|
||||||
|
const modeStore = useModeStore()
|
||||||
|
|
||||||
|
const getCurrentPatternId = () => {
|
||||||
|
return dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
|
||||||
|
}
|
||||||
|
|
||||||
|
const getTableList = async (params: any) => {
|
||||||
|
const patternId = getCurrentPatternId()
|
||||||
|
if (!patternId) {
|
||||||
|
ElMessage.error('当前模式未找到对应的模式ID')
|
||||||
|
return {
|
||||||
|
data: { list: [], total: 0, pageNum: params.pageNum ?? 1, pageSize: params.pageSize ?? 10 }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
const newParams = JSON.parse(JSON.stringify(params))
|
||||||
|
newParams.pattern = patternId
|
||||||
// 表格配置项
|
return getPqReportList(newParams)
|
||||||
const columns = reactive<ColumnProps<PqReport.ResReport>[]>([
|
}
|
||||||
{type: 'selection', fixed: 'left', width: 70},
|
|
||||||
{type: 'index', fixed: 'left', width: 70, label: '序号'},
|
const columns = reactive<ColumnProps<PqReport.ResReport>[]>([
|
||||||
{
|
{ type: 'selection', fixed: 'left', width: 70 },
|
||||||
prop: 'name',
|
{ type: 'index', fixed: 'left', width: 70, label: '序号' },
|
||||||
label: '名称',
|
{
|
||||||
search: {el: 'input'},
|
prop: 'name',
|
||||||
minWidth: 100,
|
label: '名称',
|
||||||
},
|
search: { el: 'input' },
|
||||||
|
minWidth: 100
|
||||||
{
|
},
|
||||||
prop: 'version',
|
{
|
||||||
label: '版本号',
|
prop: 'version',
|
||||||
minWidth: 80,
|
label: '版本号',
|
||||||
|
minWidth: 80
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'baseFile',
|
prop: 'baseFile',
|
||||||
label: '基础模板文件路径',
|
label: '基础模板文件路径',
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
render: scope => {
|
render: scope => {
|
||||||
return scope.row.baseFileVO.url
|
return scope.row.baseFileVO?.url ?? ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'detailFile',
|
prop: 'detailFile',
|
||||||
label: '检测项模版文件路径',
|
label: '检测项模板文件路径',
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
render: scope => {
|
render: scope => {
|
||||||
return scope.row.detailFileVO.url
|
return scope.row.detailFileVO?.url ?? ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop:'description',
|
prop: 'description',
|
||||||
label: '描述',
|
label: '描述',
|
||||||
minWidth: 150
|
minWidth: 150
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'createTime',
|
prop: 'createTime',
|
||||||
label: '创建时间',
|
label: '创建时间',
|
||||||
width: 200,
|
width: 200,
|
||||||
render: scope => {
|
render: scope => {
|
||||||
if (scope.row.createTime) {
|
if (!scope.row.createTime) return ''
|
||||||
const date = new Date(scope.row.createTime);
|
const date = new Date(scope.row.createTime)
|
||||||
const year = date.getFullYear();
|
const year = date.getFullYear()
|
||||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
const month = String(date.getMonth() + 1).padStart(2, '0')
|
||||||
const day = String(date.getDate()).padStart(2, '0');
|
const day = String(date.getDate()).padStart(2, '0')
|
||||||
const hours = String(date.getHours()).padStart(2, '0');
|
const hours = String(date.getHours()).padStart(2, '0')
|
||||||
const minutes = String(date.getMinutes()).padStart(2, '0');
|
const minutes = String(date.getMinutes()).padStart(2, '0')
|
||||||
const seconds = String(date.getSeconds()).padStart(2, '0');
|
const seconds = String(date.getSeconds()).padStart(2, '0')
|
||||||
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
|
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
|
||||||
}
|
|
||||||
return '';
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{ prop: 'operation', label: '操作', fixed: 'right', width: 200 }
|
||||||
{prop: 'operation', label: '操作', fixed: 'right', width: 200},
|
])
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
// 打开 drawer(新增、编辑)
|
const openDialog = (titleType: string, row: Partial<PqReport.ResReport> = {}) => {
|
||||||
const openDialog = (titleType: string, row: Partial<PqReport.ResReport> = {}) => {
|
reportPopup.value.open(titleType, row)
|
||||||
reportPopup.value.open(titleType, row)
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// 批量删除报告模版
|
|
||||||
const batchDelete = async (id: string[]) => {
|
|
||||||
await useHandleData(deletePqReport, id, '删除所选报告模版')
|
|
||||||
|
|
||||||
proTable.value?.clearSelection()
|
const batchDelete = async (id: string[]) => {
|
||||||
proTable.value?.getTableList()
|
await useHandleData(deletePqReport, id, '删除所选报告模板')
|
||||||
}
|
proTable.value?.clearSelection()
|
||||||
|
proTable.value?.getTableList()
|
||||||
// 删除报告模版
|
}
|
||||||
const handleDelete = async (params:PqReport.ResReport) => {
|
|
||||||
await useHandleData(deletePqReport, [params.id], `删除【${params.name}】报告模版`)
|
const handleDelete = async (params: PqReport.ResReport) => {
|
||||||
proTable.value?.getTableList()
|
await useHandleData(deletePqReport, [params.id], `删除【${params.name}】报告模板`)
|
||||||
|
proTable.value?.getTableList()
|
||||||
}
|
}
|
||||||
|
</script>
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user