普测测试流程
This commit is contained in:
@@ -228,25 +228,11 @@ const audit = (filePath: any) => {
|
||||
if (form.value.customSubstationFlag == '0') {
|
||||
addForm.substation = addForm.substation.join(',')
|
||||
}
|
||||
console.log(addForm, '提交')
|
||||
addSurveyPlan(addForm).then(res => {
|
||||
cancelFn()
|
||||
emit('onsubmit')
|
||||
})
|
||||
return
|
||||
if (title.value == '普测计划新增') {
|
||||
addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
|
||||
ElMessage.success('新增成功!')
|
||||
cancelFn()
|
||||
emit('onsubmit')
|
||||
})
|
||||
} else if (title.value == '重新发起计划') {
|
||||
auditSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
|
||||
ElMessage.success('重新发起计划成功!')
|
||||
cancelFn()
|
||||
emit('onsubmit')
|
||||
})
|
||||
}
|
||||
}
|
||||
// 上传文件
|
||||
// 文件数超出提示
|
||||
|
||||
@@ -41,7 +41,7 @@ const tableStore = new TableStore({
|
||||
},
|
||||
{
|
||||
field: 'deptName',
|
||||
title: '普测负责单位'
|
||||
title: '负责单位'
|
||||
},
|
||||
{
|
||||
field: 'substation',
|
||||
@@ -52,7 +52,7 @@ const tableStore = new TableStore({
|
||||
},
|
||||
{
|
||||
field: 'planName',
|
||||
title: '普测计划名称'
|
||||
title: '普测计划'
|
||||
},
|
||||
{ field: 'planStartTime', title: '计划开始时间' },
|
||||
{ field: 'planEndTime', title: '计划结束时间' },
|
||||
@@ -189,7 +189,6 @@ const handleAudit = (instanceId: string,historyInstanceId:string) => {
|
||||
// 取消
|
||||
|
||||
onMounted(() => {
|
||||
TableHeaderRef.value.setInterval(1)
|
||||
tableStore.index()
|
||||
getUserByRoleType(3).then(res => {
|
||||
auditList.value = res.data
|
||||
|
||||
@@ -1,275 +1,223 @@
|
||||
<template>
|
||||
<el-dialog draggable :title="title" v-model="planAddition" width="500px" :before-close="cancelFn">
|
||||
<el-form
|
||||
:model="form"
|
||||
:disabled="title == '查看计划' || title == '计划审核'"
|
||||
ref="formRef"
|
||||
:rules="rules"
|
||||
label-width="auto"
|
||||
class="form-one"
|
||||
<el-dialog draggable :title='title' v-model='planAddition' width='500px' :before-close='cancelFn'>
|
||||
<el-form
|
||||
:model='form'
|
||||
ref='formRef'
|
||||
:rules='rules'
|
||||
label-width='auto'
|
||||
class='form-one'
|
||||
>
|
||||
<el-form-item label='普测负责单位:'>
|
||||
<el-input v-model='form.deptName' disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label='计划名称:' prop='planName'>
|
||||
<el-input v-model='form.planName' disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label='计划开始时间:' prop='planStartTime'>
|
||||
<el-input v-model='form.planStartTime' disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label='计划结束时间:' prop='planEndTime'>
|
||||
<el-input v-model='form.planEndTime' disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item for='-' label='测试变电站:' prop='subIds' style='display: flex; align-items: center'>
|
||||
<el-input v-model='form.substationName' disabled/>
|
||||
</el-form-item>
|
||||
<el-form-item label='实际完成时间:' prop='completeTime'>
|
||||
<el-date-picker
|
||||
v-model='form.completeTime'
|
||||
type='date'
|
||||
placeholder='选择实际完成时间'
|
||||
value-format='YYYY-MM-DD'
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item for='-' label='测试负责人:' prop='leader'>
|
||||
<el-input v-model='form.completeBy' placeholder='请输入测试负责人'></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item for='-' class='uploadFile' label='普测报告:' prop='testReport'>
|
||||
<el-upload
|
||||
ref='uploadRef'
|
||||
action=''
|
||||
accept='.doc,.docx,.xlsx,.xls,.pdf'
|
||||
:limit='1'
|
||||
:on-exceed='handleExceed'
|
||||
:on-change='choose'
|
||||
:auto-upload='false'
|
||||
:on-progress="uploadFileName('testReport')"
|
||||
>
|
||||
<el-form-item for="-" label="普测负责单位:">
|
||||
<Area v-model="form.orgNo" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item for="-" label="计划名称:" prop="planName">
|
||||
<el-input v-model="form.planName" placeholder="请输入计划名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item for="-" label="计划开始时间:" prop="planStartTime">
|
||||
<el-date-picker
|
||||
v-model="form.planStartTime"
|
||||
type="date"
|
||||
placeholder="选择计划开始时间"
|
||||
value-format="YYYY-MM-DD"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item for="-" label="计划结束时间:" prop="planEndTime">
|
||||
<el-date-picker
|
||||
v-model="form.planEndTime"
|
||||
type="date"
|
||||
placeholder="选择计划结束时间"
|
||||
value-format="YYYY-MM-DD"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item for="-" label="实际完成时间:" prop="planComplateTime">
|
||||
<el-date-picker
|
||||
v-model="form.planComplateTime"
|
||||
type="date"
|
||||
placeholder="选择实际完成时间"
|
||||
value-format="YYYY-MM-DD"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item for="-" label="测试负责人:" prop="leader">
|
||||
<el-input v-model="form.leader" placeholder="请输入测试负责人"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item for="-" label="关联电站:" prop="subIds" style="display: flex; align-items: center">
|
||||
<el-cascader v-model="form.subIds" :options="treeList" :props="defaultProps" clearable filterable />
|
||||
<!-- <el-tree-select
|
||||
accordion
|
||||
ref="treeRef"
|
||||
:default-expand-all="false"
|
||||
show-checkbox
|
||||
check-strictly
|
||||
:highlight-current="true"
|
||||
readonly
|
||||
node-key="id"
|
||||
:props="defaultProps"
|
||||
v-model="form.subIds"
|
||||
:data="treeList"
|
||||
:render-after-expand="false"
|
||||
/> -->
|
||||
</el-form-item>
|
||||
<el-form-item for="-" label="测试是否有问题：" prop="isQuesition">
|
||||
<!-- 默认值 否 -->
|
||||
<el-radio-group v-model="form.isQuesition">
|
||||
<el-radio value="0">否</el-radio>
|
||||
<el-radio value="1">是</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item style="width: 100%" for="-" label="问题描述:" prop="resion" v-if="form.isQuesition == '1'">
|
||||
<el-input type="textarea" v-model="form.resion" placeholder="请输入问题描述"></el-input>
|
||||
</el-form-item>
|
||||
<!-- <el-form :model="form" label-width="auto"> -->
|
||||
<el-form-item for="-" class="uploadFile" label="普测报告:" prop="fileList">
|
||||
<el-upload
|
||||
v-model:file-list="form.fileList"
|
||||
ref="upload"
|
||||
action=""
|
||||
:limit="5"
|
||||
:on-exceed="handleExceed"
|
||||
:auto-upload="false"
|
||||
>
|
||||
<template #trigger>
|
||||
<el-button type="primary">上传文件</el-button>
|
||||
</template>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
<!-- </el-form> -->
|
||||
</el-form>
|
||||
<!-- <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">添加电站</el-divider> -->
|
||||
<!-- <generalTestTree ref="treeRef" /> -->
|
||||
<!-- <div
|
||||
v-if="
|
||||
(title == '查看计划' || title == '计划审核') &&
|
||||
(title == '计划审核' || form.status == 1 || form.status == 3 || form.status == 4)
|
||||
"
|
||||
>
|
||||
<el-divider content-position="left" style="font-size: 18px; font-weight: bolder">审核意见</el-divider>
|
||||
<el-input
|
||||
:disabled="title != '计划审核'"
|
||||
type="textarea"
|
||||
:autosize="{ minRows: 2, maxRows: 4 }"
|
||||
v-model="form.checkComment"
|
||||
></el-input>
|
||||
</div> -->
|
||||
<template #footer v-if="title != '查看计划'">
|
||||
<div class="dialog-footer">
|
||||
<el-button @click="cancelFn">取消</el-button>
|
||||
<el-button type="primary" @click="submitFn">确定</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<template #trigger>
|
||||
<el-button type='primary'>上传文件</el-button>
|
||||
</template>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
<el-form-item for='-' label='测试是否有问题：' prop='problemFlag'>
|
||||
<!-- 默认值 否 -->
|
||||
<el-radio-group v-model='form.problemFlag'>
|
||||
<el-radio value='1'>是</el-radio>
|
||||
<el-radio value='0'>否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item style='width: 100%' for='-' label='问题描述:' prop='problemDetail' v-if="form.problemFlag == '1'">
|
||||
<el-input type='textarea' v-model='form.problemDetail' placeholder='请输入问题描述'></el-input>
|
||||
</el-form-item>
|
||||
<!-- </el-form> -->
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<div class='dialog-footer'>
|
||||
<el-button @click='cancelFn'>取消</el-button>
|
||||
<el-button type='primary' @click='submitFn'>确定</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import generalTestTree from '@/components/tree/pqs/generalTestTree.vue'
|
||||
import { ref, reactive, nextTick } from 'vue'
|
||||
<script setup lang='ts'>
|
||||
import { ref, inject, nextTick } from 'vue'
|
||||
import { addSurvey, auditSurvey } from '@/api/process-boot/generalTest'
|
||||
import Area from '@/components/form/area/index.vue'
|
||||
import { ElMessage, UploadProps } from 'element-plus'
|
||||
import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
|
||||
import { ElMessage, genFileId, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
|
||||
import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file'
|
||||
import { useDictData } from '@/stores/dictData'
|
||||
import { initDetpStataionTree } from '@/api/process-boot/generalTest'
|
||||
import { addSurveyTest, getTestById } from '@/api/supervision-boot/survey/test'
|
||||
|
||||
const tableStore = inject('tableStore') as TableStore
|
||||
let uploadName = ref('')
|
||||
// 上传报告
|
||||
const uploadRef = ref()
|
||||
const fileList = ref<UploadUserFile[]>([])
|
||||
const emit = defineEmits(['onsubmit'])
|
||||
const dictData = useDictData()
|
||||
const addFlagRef = ref(true)
|
||||
const title = ref('')
|
||||
const planAddition = ref(false)
|
||||
const defaultProps = ref({
|
||||
label: 'name',
|
||||
value: 'id',
|
||||
checkStrictly: true,
|
||||
emitPath: false,
|
||||
expandTrigger: 'hover' as const
|
||||
})
|
||||
const form: any = ref({
|
||||
orgName: '',
|
||||
orgNo: dictData.state.area[0].id,
|
||||
planStartTime: '',
|
||||
planEndTime: '',
|
||||
planComplateTime: '',
|
||||
planName: '',
|
||||
leader: '',
|
||||
rgeneralSurveyPlanDetailAddParm: [],
|
||||
subCount: '',
|
||||
busCount: '',
|
||||
subIds: '',
|
||||
fileList: [],
|
||||
checkComment: '',
|
||||
filePath: '',
|
||||
resion: '', //测试问题
|
||||
isQuesition: '0' //是否有问题
|
||||
id:'',
|
||||
deptName: '',
|
||||
planStartTime: '',
|
||||
planEndTime: '',
|
||||
planName: '',
|
||||
substationName: '',
|
||||
|
||||
completeTime: '',
|
||||
completeBy: '',
|
||||
testReport: '',
|
||||
problemDetail: '', //测试问题
|
||||
problemFlag: '0' //是否有问题
|
||||
})
|
||||
const props = {
|
||||
expandTrigger: 'hover' as const
|
||||
|
||||
|
||||
/**
|
||||
* addFlag为true，则为填报测试数据，创建新流程
|
||||
* 为false，则为修改测试数据，重新发起流程
|
||||
*/
|
||||
const open = async (text: string, id: string, addFlag: boolean) => {
|
||||
title.value = text
|
||||
formRef.value?.resetFields()
|
||||
addFlagRef.value = addFlag
|
||||
//根据测试id获取数据
|
||||
await getTestById(id).then(res => {
|
||||
//如果是新增，则只需将计划的一些信息回显即可
|
||||
form.value.id = id
|
||||
form.value.deptName = res.data.deptName
|
||||
form.value.planStartTime = res.data.planStartTime
|
||||
form.value.planEndTime = res.data.planEndTime
|
||||
form.value.planName = res.data.planName
|
||||
form.value.substationName = res.data.substationName
|
||||
//部分清空
|
||||
uploadRef.value?.clearFiles()
|
||||
form.value.completeTime = ''
|
||||
form.value.completeBy = ''
|
||||
form.value.testReport = ''
|
||||
form.value.problemDetail = ''
|
||||
form.value.problemFlag = '0'
|
||||
fileList.value = []
|
||||
if (!addFlag) {
|
||||
//还需回显上次填报的测试数据 todo...,待重新发起的时候去做
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
planAddition.value = true
|
||||
}
|
||||
|
||||
//处理成效报告
|
||||
const testReport = ref('')
|
||||
|
||||
const formRef = ref()
|
||||
const treeRef = ref()
|
||||
const rules = {
|
||||
planStartTime: [{ required: true, message: '选择计划开始时间', trigger: 'change' }],
|
||||
planEndTime: [{ required: true, message: '选择计划结束时间', trigger: 'change' }],
|
||||
planComplateTime: [{ required: true, message: '选择实际完成时间 ', trigger: 'change' }],
|
||||
planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
|
||||
leader: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
|
||||
subIds: [{ required: true, message: '请选择关联电站', trigger: 'change' }],
|
||||
fileList: [{ required: true, message: '请上传文件', trigger: 'change' }],
|
||||
isQuesition: [{ required: true, message: '请选择测试是否有问题', trigger: 'change' }],
|
||||
resion: [{ required: true, message: '请输入测试问题', trigger: 'blur' }],
|
||||
completeTime: [{ required: true, message: '选择实际完成时间 ', trigger: 'change' }],
|
||||
completeBy: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
|
||||
fileList: [{ required: true, message: '请上传文件', trigger: 'change' }],
|
||||
problemFlag: [{ required: true, message: '请选择测试是否有问题', trigger: 'change' }],
|
||||
problemDetail: [{ required: true, message: '请输入测试问题', trigger: 'blur' }]
|
||||
}
|
||||
const cancelFn = () => {
|
||||
formRef.value.resetFields()
|
||||
// treeRef.value.setKey([])
|
||||
planAddition.value = false
|
||||
formRef.value.resetFields()
|
||||
planAddition.value = false
|
||||
}
|
||||
const treeList = ref()
|
||||
const loadData = () => {
|
||||
initDetpStataionTree({ orgId: dictData.state.area[0].id }).then(res => {
|
||||
treeList.value = res.data
|
||||
console.log(treeList.value)
|
||||
})
|
||||
}
|
||||
loadData()
|
||||
|
||||
// 提交
|
||||
const submitFn = () => {
|
||||
formRef.value.validate(async (valid: any) => {
|
||||
if (valid) {
|
||||
let filePath = ''
|
||||
// form.value.subIds = treeRef.value.treeRef.getCheckedKeys(false)
|
||||
form.value.subIds = typeof form.value.subIds == 'string' ? [form.value.subIds] : form.value.subIds
|
||||
if (form.value.fileList.length == 0) {
|
||||
audit(filePath)
|
||||
} else {
|
||||
for (let i = 0; i < form.value.fileList.length; i++) {
|
||||
if (form.value.fileList[i].raw) {
|
||||
await uploadFile(form.value.fileList[i].raw, 'supervision/').then(res => {
|
||||
filePath = filePath + res.data.name + ','
|
||||
})
|
||||
} else {
|
||||
filePath = filePath + form.value.fileList[i].supervision + ','
|
||||
}
|
||||
if (i == form.value.fileList.length - 1) {
|
||||
audit(filePath)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
formRef.value.validate(async (valid: any) => {
|
||||
if (valid) {
|
||||
if (!testReport.value) {
|
||||
return ElMessage({
|
||||
message: '请上传处理成效报告',
|
||||
type: 'warning'
|
||||
})
|
||||
}
|
||||
if(addFlagRef){
|
||||
//新增，则组装业务数据提交后台
|
||||
//此时该告警单处于待反馈状态
|
||||
await addSurveyTest(form.value)
|
||||
//查询进线数据，避免一直处于loading状态
|
||||
ElMessage.success('申请成功')
|
||||
tableStore.index()
|
||||
planAddition.value = false
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
const audit = (filePath: any) => {
|
||||
if (title.value == '普测计划新增') {
|
||||
addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
|
||||
ElMessage.success('新增成功!')
|
||||
cancelFn()
|
||||
emit('onsubmit')
|
||||
})
|
||||
} else if (title.value == '重新发起计划') {
|
||||
auditSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
|
||||
ElMessage.success('重新发起计划成功!')
|
||||
cancelFn()
|
||||
emit('onsubmit')
|
||||
})
|
||||
}
|
||||
}
|
||||
// 上传文件
|
||||
// 文件数超出提示
|
||||
const handleExceed: UploadProps['onExceed'] = (): void => {
|
||||
ElMessage.error(`上传文件数量不能超过5个!`)
|
||||
}
|
||||
const open = (text: string, row?: any) => {
|
||||
form.value = Object.assign({
|
||||
orgName: '',
|
||||
orgNo: dictData.state.area[0].id,
|
||||
planStartTime: '',
|
||||
planEndTime: '',
|
||||
planComplateTime: '',
|
||||
planName: '',
|
||||
leader: '',
|
||||
rgeneralSurveyPlanDetailAddParm: [],
|
||||
subCount: '',
|
||||
busCount: '',
|
||||
subIds: [],
|
||||
checkComment: '',
|
||||
fileList: [],
|
||||
filePath: [],
|
||||
resion: '', //测试问题
|
||||
isQuesition: '0' //是否有问题
|
||||
if (title.value == '普测计划新增') {
|
||||
addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
|
||||
ElMessage.success('新增成功!')
|
||||
cancelFn()
|
||||
emit('onsubmit')
|
||||
})
|
||||
title.value = text
|
||||
planAddition.value = true
|
||||
formRef.value?.resetFields()
|
||||
// if (row) {
|
||||
// form.value = JSON.parse(JSON.stringify(row))
|
||||
// nextTick(() => {
|
||||
// form.value.fileList = []
|
||||
// treeRef.value.loadData()
|
||||
// treeRef.value.setKey(row.subIds || [], text)
|
||||
// let arr = row.filePath.split(',')
|
||||
// arr.slice(0, -1).forEach((item: any) => {
|
||||
// getFileNameAndFilePath({ filePath: item }).then((res: any) => {
|
||||
// form.value.fileList.push({
|
||||
// name: res.data.fileName,
|
||||
// supervision: res.data.name,
|
||||
// url: res.data.url
|
||||
// })
|
||||
// })
|
||||
// })
|
||||
// })
|
||||
// } else {
|
||||
// nextTick(() => {
|
||||
// treeRef.value.loadData()
|
||||
// })
|
||||
// }
|
||||
} else if (title.value == '重新发起计划') {
|
||||
auditSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
|
||||
ElMessage.success('重新发起计划成功!')
|
||||
cancelFn()
|
||||
emit('onsubmit')
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
defineExpose({ open })
|
||||
|
||||
|
||||
const choose = (e: any) => {
|
||||
uploadFile(e.raw, '/supervision/').then(res => {
|
||||
testReport.value = res.data.name
|
||||
form.value.testReport = res.data.name
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const handleExceed: UploadProps['onExceed'] = files => {
|
||||
uploadRef.value!.clearFiles()
|
||||
const file = files[0] as UploadRawFile
|
||||
file.uid = genFileId()
|
||||
uploadRef.value!.handleStart(file)
|
||||
}
|
||||
|
||||
//上传报告改变
|
||||
const uploadFileName = val => {
|
||||
uploadName.value = val
|
||||
}
|
||||
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
<style lang='scss' scoped>
|
||||
// :deep(.el-upload-list__item-info) {
|
||||
// width: 250px;
|
||||
// }
|
||||
|
||||
@@ -1,100 +1,114 @@
|
||||
<template>
|
||||
<TableHeader area datePicker ref="TableHeaderRef">
|
||||
<TableHeader area datePicker ref='TableHeaderRef'>
|
||||
<template #operation>
|
||||
<el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
|
||||
<!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
|
||||
</template>
|
||||
</TableHeader>
|
||||
<Table ref="tableRef" />
|
||||
<Table ref='tableRef' />
|
||||
<!-- 新增 -->
|
||||
<planTest ref="planTestRef" @onsubmit="tableStore.index()" />
|
||||
|
||||
<!-- 选择审核人 -->
|
||||
<el-dialog draggable v-model="dialogVisible" title="审核" width="300" :before-close="handleClose">
|
||||
选择审核人: <el-select v-model="auditUser" clearable placeholder="请选择计划状态">
|
||||
<el-option v-for="item in auditList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button type="primary" @click="planReviewFn">确定</el-button>
|
||||
<el-button @click="handleClose">取消</el-button>
|
||||
|
||||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
|
||||
<planTest ref='planTestRef' @onsubmit='tableStore.index()' />
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
<script setup lang='ts'>
|
||||
import { ref, onMounted, provide, nextTick } from 'vue'
|
||||
import TableStore from '@/utils/tableStore'
|
||||
import Table from '@/components/table/index.vue'
|
||||
import TableHeader from '@/components/table/header/index.vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { submitAuditUser,cancel } from '@/api/process-boot/generalTest'
|
||||
import { cancel } from '@/api/process-boot/generalTest'
|
||||
import planTest from './planTest.vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useDictData } from '@/stores/dictData'
|
||||
|
||||
import { queryPlan,removeSurvey } from '@/api/process-boot/generalTest'
|
||||
import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
|
||||
import { getUserByRoleType } from '@/api/user-boot/user'
|
||||
const dictData = useDictData()
|
||||
|
||||
const { push } = useRouter()
|
||||
const dialogVisible=ref(false)
|
||||
const tableRef = ref()
|
||||
|
||||
|
||||
const planTestRef = ref()
|
||||
const TableHeaderRef = ref()
|
||||
const auditList:any = ref([])
|
||||
const auditUser = ref('')
|
||||
const auditList: any = ref([])
|
||||
|
||||
const tableStore = new TableStore({
|
||||
url: '/supervision-boot/surveyTest/surveyTestPage',
|
||||
publicHeight: 65,
|
||||
method: 'POST',
|
||||
column: [
|
||||
{ width: '60', type: 'checkbox' },
|
||||
{ field: 'orgName', title: '单位' },
|
||||
{
|
||||
field: 'planName',
|
||||
title: '普测计划名称'
|
||||
title: '序号',
|
||||
width: 60,
|
||||
formatter: (row: any) => {
|
||||
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
|
||||
}
|
||||
},
|
||||
{ field: 'leader', title: '计划负责人' },
|
||||
|
||||
{ field: 'planStartTime', title: '计划开始时间' },
|
||||
{ field: 'planEndTime', title: '计划结束时间' },
|
||||
|
||||
{ field: 'planName', title: '普测计划', minWidth: 140 },
|
||||
{ field: 'substationName', title: '变电站', minWidth: 140 },
|
||||
{ field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
|
||||
{ field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
|
||||
{ field: 'problemFlag', title: '是否存在问题', minWidth: 120,
|
||||
render: 'tag',
|
||||
custom: {
|
||||
0: 'success',
|
||||
1: 'danger',
|
||||
null:'primary'
|
||||
},
|
||||
replaceValue: {
|
||||
0: '合格',
|
||||
1: '存在问题',
|
||||
null:'待测试'
|
||||
}
|
||||
},
|
||||
{ field: 'deptName', title: '负责单位', minWidth: 140 },
|
||||
{ field: 'completeBy', title: '计划负责人', minWidth: 130 },
|
||||
{ field: 'completeTime', title: '实际完成时间', minWidth: 140 },
|
||||
{
|
||||
field: 'status',
|
||||
title: '计划状态',
|
||||
render: 'tag',
|
||||
minWidth: 140,
|
||||
custom: {
|
||||
6: 'primary',
|
||||
1: 'primary',
|
||||
2: 'success',
|
||||
3: 'danger',
|
||||
4: 'warning'
|
||||
},
|
||||
replaceValue: {
|
||||
6: '待测试',
|
||||
1: '审批中',
|
||||
2: '审批通过',
|
||||
3: '审批不通过',
|
||||
4: '已取消'
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
title: '操作',
|
||||
width: '180',
|
||||
minWidth: 180,
|
||||
render: 'buttons',
|
||||
fixed: 'right',
|
||||
buttons: [
|
||||
{
|
||||
name: 'productSetting',
|
||||
title: '测试填报',
|
||||
type: 'primary',
|
||||
icon: 'el-icon-EditPen',
|
||||
render: 'basicButton',
|
||||
disabled: row => {
|
||||
return row.status != 6
|
||||
},
|
||||
click: row => {
|
||||
add(row.id)
|
||||
}
|
||||
},
|
||||
{
|
||||
name: 'productSetting',
|
||||
title: '流程详情',
|
||||
type: 'primary',
|
||||
icon: 'el-icon-EditPen',
|
||||
render: 'basicButton',
|
||||
disabled: row => {
|
||||
return row.status == 6 || row.status == 4
|
||||
},
|
||||
click: row => {
|
||||
// planTestRef.value.open('查看计划', row)
|
||||
handleAudit(row.processInstanceId)
|
||||
@@ -107,7 +121,7 @@ const tableStore = new TableStore({
|
||||
icon: 'el-icon-Open',
|
||||
render: 'basicButton',
|
||||
disabled: row => {
|
||||
return row.status == 1 || row.status == 2
|
||||
return row.status == 6 || row.status == 1 || row.status == 2
|
||||
},
|
||||
click: row => {
|
||||
// deviceQuitPopup.value.open('重新发起退运', row)
|
||||
@@ -121,47 +135,12 @@ const tableStore = new TableStore({
|
||||
icon: 'el-icon-Open',
|
||||
render: 'basicButton',
|
||||
disabled: row => {
|
||||
return row.status == 3 || row.status == 2 || row.status == 4
|
||||
return row.status == 6 || row.status == 2 || row.status == 3 || row.status == 4
|
||||
},
|
||||
click: row => {
|
||||
cancelLeave(row)
|
||||
}
|
||||
}
|
||||
// {
|
||||
// name: 'edit',
|
||||
// title: '编辑',
|
||||
// type: '',
|
||||
// disabled: row => {
|
||||
// return !(row.status == 0 || row.status == 3|| row.status == 4)
|
||||
// },
|
||||
// icon: 'el-icon-Plus',
|
||||
// render: 'basicButton',
|
||||
// click: async row => {
|
||||
// planTestRef.value.open('编辑计划', row)
|
||||
// }
|
||||
// },
|
||||
// {
|
||||
// name: 'del',
|
||||
// title: '删除',
|
||||
// type: 'danger',
|
||||
// icon: 'el-icon-Delete',
|
||||
// render: 'confirmButton',
|
||||
// disabled: row => {
|
||||
// return !(row.status == 0 || row.status == 3|| row.status == 4)
|
||||
// },
|
||||
// popconfirm: {
|
||||
// confirmButtonText: '确认',
|
||||
// cancelButtonText: '取消',
|
||||
// confirmButtonType: 'danger',
|
||||
// title: '确定删除吗？'
|
||||
// },
|
||||
// click: row => {
|
||||
// removeSurvey([row.planNo]).then(res => {
|
||||
// ElMessage.success('删除成功')
|
||||
// tableStore.index()
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
]
|
||||
}
|
||||
],
|
||||
@@ -175,32 +154,11 @@ tableStore.table.params.status = ''
|
||||
|
||||
provide('tableStore', tableStore)
|
||||
// 新增计划
|
||||
const add = () => {
|
||||
// title.value = '普测计划新增'
|
||||
planTestRef.value.open('普测计划新增')
|
||||
const add = (id: string) => {
|
||||
planTestRef.value.open('普测计划测试填报',id,true)
|
||||
}
|
||||
|
||||
// 提交审核
|
||||
const planReviewFn = () => {
|
||||
if(auditUser.value == ''){
|
||||
return ElMessage.warning('请选择审核人')
|
||||
}
|
||||
let planNo: any = []
|
||||
tableStore.table.selection.forEach(item => {
|
||||
if (item.status == 0 || item.status == 2) {
|
||||
planNo.push(item.planNo)
|
||||
}
|
||||
})
|
||||
submitAuditUser({
|
||||
auditUser: auditUser.value,
|
||||
planIds: planNo
|
||||
}).then(res => {
|
||||
dialogVisible.value = false
|
||||
ElMessage.success('提交成功!')
|
||||
tableStore.index()
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
const exportFn = () => {
|
||||
let form = JSON.parse(JSON.stringify(tableStore.table.params))
|
||||
form.pageNum = 1
|
||||
@@ -212,7 +170,7 @@ const exportFn = () => {
|
||||
type: 'xlsx', //导出文件类型 xlsx 和 csv
|
||||
useStyle: true,
|
||||
data: res.data.records, // 数据源 // 过滤那个字段导出
|
||||
columnFilterMethod: function (column: any) {
|
||||
columnFilterMethod: function(column: any) {
|
||||
return !(column.$columnIndex === 0)
|
||||
}
|
||||
})
|
||||
@@ -240,10 +198,6 @@ const cancelLeave = async (row: any) => {
|
||||
tableStore.index()
|
||||
}
|
||||
|
||||
const handleClose = () => {
|
||||
dialogVisible.value = false
|
||||
auditUser.value = ''
|
||||
}
|
||||
|
||||
/** 处理审批按钮 */
|
||||
const handleAudit = (instanceId: any) => {
|
||||
@@ -257,7 +211,6 @@ const handleAudit = (instanceId: any) => {
|
||||
// 取消
|
||||
|
||||
onMounted(() => {
|
||||
TableHeaderRef.value.setInterval(1)
|
||||
tableStore.index()
|
||||
getUserByRoleType(3).then(res => {
|
||||
auditList.value = res.data
|
||||
@@ -265,4 +218,4 @@ onMounted(() => {
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss"></style>
|
||||
<style scoped lang='scss'></style>
|
||||
|
||||
@@ -96,15 +96,7 @@ const getDeviceStatusType = (status: number) => {
|
||||
}
|
||||
return 'success'
|
||||
}
|
||||
// 过滤数据
|
||||
// const formatter = (row: any) => {
|
||||
// if (row.column.field == 'voltageLevel') {
|
||||
// debugger
|
||||
// return levelList.filter(item => item.id == row.cellValue)[0].name
|
||||
// } else {
|
||||
// return row.cellValue
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
const formatterSource = (row: any) => {
|
||||
if (row.column.field == 'dataSource') {
|
||||
|
||||
@@ -1,152 +1,161 @@
|
||||
<template>
|
||||
<div class="default-main">
|
||||
<!-- <h1>详细信息回显</h1>-->
|
||||
<el-descriptions :column="2" border>
|
||||
<el-descriptions-item label="普测计划名称">
|
||||
{{ detailData?.planName }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="计划负责人">
|
||||
{{ detailData?.leader }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="计划开始时间">
|
||||
{{ detailData?.planStartTime }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="计划结束时间">
|
||||
{{ detailData?.planEndTime }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="审核状态">
|
||||
<el-tag :type="getDeviceStatusType(detailData?.status)">
|
||||
{{ getDeviceStatus(detailData?.status) }}
|
||||
</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="文件">
|
||||
<div v-for="(item, index) in aList">
|
||||
<el-icon>
|
||||
<Link />
|
||||
</el-icon>
|
||||
<a :href="item.url">
|
||||
{{ item.fileName }}
|
||||
</a>
|
||||
<!-- <el-button type="primary" link @click="downloadFile(item.url, item.fileName)">
|
||||
{{ item.fileName }}
|
||||
</el-button> -->
|
||||
</div>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<div style="height: 300px">
|
||||
<vxe-table
|
||||
v-bind="defaultAttribute"
|
||||
ref="vxeRef"
|
||||
class="mt10"
|
||||
height="auto"
|
||||
:data="detailData?.supervisionGeneralSurveyPlanDetailPOS"
|
||||
>
|
||||
<vxe-column field="subName" title="变电站名称"></vxe-column>
|
||||
<vxe-column field="voltageLevel" title="变电站电压等级" :formatter="formatter"></vxe-column>
|
||||
<vxe-column field="measurementPointId" title="在线监测点ID">
|
||||
<template #default="{ row }">{{ row.measurementPointId ? row.measurementPointId : '/' }}</template>
|
||||
</vxe-column>
|
||||
<div class='default-main'>
|
||||
<el-descriptions :column='2' border>
|
||||
<el-descriptions-item label='普测计划名称'>
|
||||
{{ detailData?.planName }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='普测负责单位'>
|
||||
{{ detailData?.deptName }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='计划开始时间'>
|
||||
{{ detailData?.planStartTime }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='计划结束时间'>
|
||||
{{ detailData?.planEndTime }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='变电站'>
|
||||
{{ detailData?.substationName }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='变电站电压等级'>
|
||||
{{ detailData?.voltageLevel }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='变电站来源'>
|
||||
{{ detailData?.voltageLevel == '/' ? '自定义变电站' : '系统内台账变电站' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='实际完成时间'>
|
||||
{{ detailData?.completeTime }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='负责人'>
|
||||
{{ detailData?.completeBy }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label='是否有问题'>
|
||||
<el-tag :type='getProblemFlag(detailData?.problemFlag)'>
|
||||
{{ getProblemFlagDetail(detailData?.problemFlag) }}
|
||||
</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item v-if='detailData?.problemFlag == 1' :span='2' label='问题描述'>
|
||||
{{ detailData?.problemDetail }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<vxe-column field="isSurvey" title="是否实现监测">
|
||||
<template #default="{ row }">{{ row.isSurvey === 1 ? '是' : '否' }}</template>
|
||||
</vxe-column>
|
||||
</vxe-table>
|
||||
</div>
|
||||
</div>
|
||||
<el-descriptions-item :span='2' label='测试报告'>
|
||||
<el-icon>
|
||||
<Link />
|
||||
</el-icon>
|
||||
<a :href='detailData.testReport' target='_blank'>{{ detailData.testReportName }}</a>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label='审核状态'>
|
||||
<el-tag :type='getDeviceStatusType(detailData?.status)'>
|
||||
{{ getDeviceStatus(detailData?.status) }}
|
||||
</el-tag>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
<script setup lang='ts'>
|
||||
import { onMounted, ref } from 'vue'
|
||||
|
||||
defineOptions({ name: 'QuitRunningDeviceDetail' })
|
||||
import { propTypes } from '@/utils/propTypes'
|
||||
import { querySurveyDetail } from '@/api/process-boot/generalTest'
|
||||
import { getFileNameAndFilePath } from '@/api/system-boot/file'
|
||||
import { defaultAttribute } from '@/components/table/defaultAttribute'
|
||||
import { useDictData } from '@/stores/dictData'
|
||||
import { getTestById } from '@/api/supervision-boot/survey/test'
|
||||
import { getFileNameAndFilePath } from '@/api/system-boot/file'
|
||||
import { Link } from '@element-plus/icons-vue'
|
||||
const { query } = useRoute() // 查询参数
|
||||
|
||||
const { query } = useRoute() // 查询参数
|
||||
const props = defineProps({
|
||||
id: propTypes.string.def(undefined)
|
||||
id: propTypes.string.def(undefined)
|
||||
})
|
||||
const dictData = useDictData()
|
||||
const detailLoading = ref(false) // 表单的加载中
|
||||
const detailData: any = ref({}) // 详情数据
|
||||
const levelList = dictData.getBasicData('Dev_Voltage_Stand')
|
||||
const aList: any = ref([]) // 详情数据
|
||||
const queryId = query.id // 从 URL 传递过来的 id 编号
|
||||
|
||||
/** 获得数据 */
|
||||
const getInfo = async () => {
|
||||
detailLoading.value = true
|
||||
try {
|
||||
await querySurveyDetail({ id: props.id || queryId }).then(res => {
|
||||
detailData.value = res.data
|
||||
aList.value = []
|
||||
let arr = res.data.filePath.split(',')
|
||||
detailLoading.value = true
|
||||
try {
|
||||
await getTestById(props.id || queryId).then(res => {
|
||||
detailData.value = res.data
|
||||
getFileData()
|
||||
})
|
||||
} finally {
|
||||
detailLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
arr.slice(0, -1).forEach((item: any) => {
|
||||
getFileNameAndFilePath({ filePath: item }).then((res: any) => {
|
||||
aList.value.push(res.data)
|
||||
})
|
||||
})
|
||||
})
|
||||
} finally {
|
||||
detailLoading.value = false
|
||||
}
|
||||
const getFileData = async () => {
|
||||
|
||||
await getFileNameAndFilePath({ filePath: detailData.value.testReport }).then(res => {
|
||||
detailData.value.testReport = res.data.url
|
||||
detailData.value.testReportName = res.data.fileName
|
||||
})
|
||||
}
|
||||
// 下载文件
|
||||
const downloadFile = (url: string, fileName: string) => {
|
||||
const link = document.createElement('a')
|
||||
link.href = url
|
||||
link.download = fileName
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
document.body.removeChild(link)
|
||||
|
||||
const getProblemFlagDetail = (status: number) => {
|
||||
if (status === 1) {
|
||||
return '存在问题'
|
||||
}
|
||||
return '合格'
|
||||
}
|
||||
|
||||
const getProblemFlag = (status: number) => {
|
||||
if (status === 1) {
|
||||
return 'danger'
|
||||
}
|
||||
return 'success'
|
||||
}
|
||||
|
||||
|
||||
const getDeviceStatus = (status: number) => {
|
||||
if (status === 1) {
|
||||
return '审批中'
|
||||
}
|
||||
if (status === 2) {
|
||||
return '审批通过'
|
||||
}
|
||||
if (status === 3) {
|
||||
return '审批不通过'
|
||||
}
|
||||
if (status === 4) {
|
||||
return '已取消'
|
||||
}
|
||||
if (status === 1) {
|
||||
return '审批中'
|
||||
}
|
||||
if (status === 2) {
|
||||
return '审批通过'
|
||||
}
|
||||
if (status === 3) {
|
||||
return '审批不通过'
|
||||
}
|
||||
if (status === 4) {
|
||||
return '已取消'
|
||||
}
|
||||
return '审批通过'
|
||||
}
|
||||
|
||||
const getDeviceStatusType = (status: number) => {
|
||||
if (status === 1) {
|
||||
return 'primary'
|
||||
}
|
||||
if (status === 2) {
|
||||
return 'success'
|
||||
}
|
||||
if (status === 3) {
|
||||
return 'danger'
|
||||
}
|
||||
if (status === 4) {
|
||||
return 'warning'
|
||||
}
|
||||
if (status === 1) {
|
||||
return 'primary'
|
||||
}
|
||||
if (status === 2) {
|
||||
return 'success'
|
||||
}
|
||||
if (status === 3) {
|
||||
return 'danger'
|
||||
}
|
||||
if (status === 4) {
|
||||
return 'warning'
|
||||
}
|
||||
return 'success'
|
||||
}
|
||||
// 过滤数据
|
||||
const formatter = (row: any) => {
|
||||
if (row.column.field == 'voltageLevel') {
|
||||
return levelList.filter(item => item.id == row.cellValue)[0].name
|
||||
|
||||
|
||||
const formatterSource = (row: any) => {
|
||||
if (row.column.field == 'dataSource') {
|
||||
if (row.cellValue == 0) {
|
||||
return '系统内台账变电站'
|
||||
} else {
|
||||
return row.cellValue
|
||||
return '自定义变电站'
|
||||
}
|
||||
} else {
|
||||
return row.cellValue
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getInfo()
|
||||
getInfo()
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -92,8 +92,6 @@ const getFileData = async () => {
|
||||
detailData.value.reportPath = res.data.url
|
||||
detailData.value.reportName = res.data.fileName
|
||||
})
|
||||
|
||||
|
||||
}
|
||||
|
||||
defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
|
||||
|
||||
Reference in New Issue
Block a user