Web/admin-sjzx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 技术监督 草稿功能

Browse Source
This commit is contained in:
GGJ
2024-06-20 11:32:49 +08:00
parent 1ab15393c2
commit 8a18771d78
4 changed files with 241 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
View File

@@ -16,7 +16,7 @@
<el-input v-model="form.planName" placeholder="请输入计划名称"></el-input>
</el-form-item>
<el-form-item label="监督类型:" prop="supvType">
<el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%">
<el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%" @change="++key">
<el-option
v-for="item in supvTypeOptionList"
:key="item.id"
@@ -65,7 +65,7 @@
</el-radio-group>
</el-form-item>
<el-form-item
for="-"
:key="key"
label="关联电站:"
v-if="form.customSubstationFlag == 0"
:prop="dynamicProp"
@@ -96,7 +96,13 @@
/> -->
</el-form-item>
<el-form-item for="-" label="关联电站:" v-if="form.customSubstationFlag == 1" :prop="dynamicProp">
<el-form-item
for="-"
label="关联电站:"
:key="key"
v-if="form.customSubstationFlag == 1"
:prop="dynamicProp"
>
<el-input v-model="form.substation" placeholder="请输入关联电站"></el-input>
</el-form-item>
<!-- <el-form :model="form" label-width="auto"> -->
@@ -164,8 +170,10 @@ const dictData = useDictData()
const supvTypeOptionList = dictData.getBasicData('supv_type')
const title = ref('')
const planAddition = ref(false)
const key: any = ref(0)
const dynamicProp = computed(() => {
console.log(123);
return supvTypeOptionList.filter(item => item.id === form.value.supvType)[0]?.code == 'Technical_Super'
? ''
: 'substation'
@@ -220,18 +228,19 @@ const rules = ref({
supvObjectName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
leader: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
substation: [{ required: true, message: '请选择关联电站', trigger: 'change' }]
substation: [{ required: true, message: '请选择关联电站', trigger: 'blur' }]
// fileList: [{ required: true, message: '请上传文件', trigger: 'change' }],
})
const changeSubstationFlag = () => {
console.log(form.value.customSubstationFlag)
//处理所属变电站手都输入1/下拉数据0
key.value++
if (form.value.customSubstationFlag == 0) {
rules.value.substation[0].message = '请选择关联电站'
form.value.substation = ''
form.value.substation = []
} else {
rules.value.substation[0].message = '请输入关联电站'
form.value.substation = []
form.value.substation = ''
}
}
const cancelFn = () => {
@@ -262,22 +271,21 @@ const submitFn = (flag: boolean) => {
const addForm = JSON.parse(JSON.stringify(form.value))
if (form.value.customSubstationFlag == 0) {
addForm.substation = addForm.substation.length==0?'': addForm.substation.join(',')
addForm.substation = addForm.substation.length == 0 ? '' : addForm.substation.join(',')
}
addForm.saveOrCheckflag = '1'
if (title.value == '计划新增') {
addSurveyPlan(addForm).then(res => {
cancelFn()
emit('onsubmit')
})
}
addSurveyPlan(addForm).then(res => {
cancelFn()
emit('onsubmit')
})
} else {
formRef.value.validate(async (valid: any) => {
if (valid) {
//选择系统变电站
const addForm = JSON.parse(JSON.stringify(form.value))
if (form.value.customSubstationFlag == 0) {
addForm.substation = addForm.substation.length==0?'': addForm.substation.join(',')
addForm.substation = addForm.substation.length == 0 ? '' : addForm.substation.join(',')
}
addForm.saveOrCheckflag = '2'
if (title.value == '计划新增') {
@@ -332,7 +340,9 @@ const open = (text: string, id: any) => {
})
title.value = text
planAddition.value = true
setTimeout(() => {
key.value++
}, 10)
if (id) {
detailById(id)
}

4
src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
View File

@@ -162,7 +162,9 @@ const tableStore = new TableStore({
disabled: row => {
return row.createBy != adminInfo.$state.id || !(row.status == 0)
},
click: row => {}
click: row => {
planAddRef.value.open('编辑', row.id, false)
}
},
{
name: 'edit',

395
src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
View File

@@ -1,82 +1,84 @@
<template>
<el-dialog draggable :title='title' v-model='planAddition' :before-close='cancelFn'>
<el-form :model='form' ref='formRef' :rules='rules' label-width='auto' class='form-two' scroll-to-error>
<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='监督类型:'>
<el-input v-model='form.supvType' disabled></el-input>
</el-form-item>
<el-form-item label='监督对象名称:'>
<el-input v-model='form.supvObjectName' 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='completeBy'>
<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'
v-model:file-list='form.testReport'
action=''
:accept='acceptType'
:limit='1'
:on-exceed='handleExceed'
:on-change='choose'
:auto-upload='false'
:on-progress="uploadFileName('testReport')"
>
<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>
<el-dialog draggable :title="title" v-model="planAddition" :before-close="cancelFn">
<el-form :model="form" ref="formRef" :rules="rules" label-width="auto" class="form-two" scroll-to-error>
<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="监督类型:">
<el-input v-model="form.supvType" disabled></el-input>
</el-form-item>
<el-form-item label="监督对象名称:">
<el-input v-model="form.supvObjectName" 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="completeBy">
<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"
v-model:file-list="form.testReport"
action=""
:accept="acceptType"
:limit="1"
:on-exceed="handleExceed"
:on-change="choose"
:auto-upload="false"
:on-progress="uploadFileName('testReport')"
>
<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> -->
<el-button type="primary" @click="submitFn(true)">保存</el-button>
<el-button type="primary" @click="submitFn(false)">提交审批</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup lang='ts'>
<script setup lang="ts">
import { ref, inject, nextTick } from 'vue'
import { addSurvey, auditSurvey } from '@/api/process-boot/generalTest'
import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
@@ -98,17 +100,17 @@ const addFlagRef = ref(true)
const title = ref('')
const planAddition = ref(false)
const form: any = ref({
id: '',
deptName: '',
planStartTime: '',
planEndTime: '',
planName: '',
substationName: '',
completeTime: '',
completeBy: '',
testReport: [],
problemDetail: '', //测试问题
problemFlag: 0 //是否有问题
id: '',
deptName: '',
planStartTime: '',
planEndTime: '',
planName: '',
substationName: '',
completeTime: '',
completeBy: '',
testReport: [],
problemDetail: '', //测试问题
problemFlag: 0 //是否有问题
})
/**
@@ -116,49 +118,53 @@ const form: any = ref({
* 为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.supvType = supvTypeOptionList.find(item => {
return item.id == res.data.supvType
})?.name
form.value.supvObjectName = res.data.supvObjectName
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...,待重新发起的时候去做
form.value = {
...form.value,
completeTime: res.data.completeTime,
completeBy: res.data.completeBy,
problemFlag: res.data.problemFlag,
testReport: [
{
name: res.data.testReport.split('/')[2]
}
],
problemDetail: res.data.problemDetail
}
testReport.value = res.data.testReport
}
})
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.supvType = supvTypeOptionList.find(item => {
return item.id == res.data.supvType
})?.name
form.value.supvObjectName = res.data.supvObjectName
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 = []
planAddition.value = true
if (!addFlag) {
//还需回显上次填报的测试数据 todo...,待重新发起的时候去做
form.value = {
...form.value,
completeTime: res.data.completeTime,
completeBy: res.data.completeBy,
problemFlag: res.data.problemFlag,
testReport:
res.data.testReport == null
? []
: [
{
name: res.data.testReport.split('/')[2]
}
],
problemDetail: res.data.problemDetail
}
testReport.value = res.data.testReport
}
})
planAddition.value = true
}
//处理成效报告
@@ -166,84 +172,101 @@ const testReport = ref('')
const formRef = ref()
const rules = {
completeTime: [{ required: true, message: '选择实际完成时间 ', trigger: 'change' }],
completeBy: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
testReport: [{ required: true, message: '请上传文件', trigger: 'change' }],
problemFlag: [{ required: true, message: '请选择测试是否有问题', trigger: 'change' }],
problemDetail: [{ required: true, message: '请输入测试问题', trigger: 'blur' }],
completeTime: [{ required: true, message: '选择实际完成时间 ', trigger: 'change' }],
completeBy: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
testReport: [{ required: true, message: '请上传文件', trigger: 'change' }],
problemFlag: [{ required: true, message: '请选择测试是否有问题', trigger: 'change' }],
problemDetail: [{ required: true, message: '请输入测试问题', trigger: 'blur' }]
}
const cancelFn = () => {
formRef.value.resetFields()
planAddition.value = false
formRef.value.resetFields()
planAddition.value = false
}
// 提交
const submitFn = () => {
formRef.value.validate(async (valid: any) => {
if (!testReport.value) {
return ElMessage({
message: '请上传处理成效报告',
type: 'warning'
})
const submitFn = (flag: boolean) => {
if (flag) {
const subForm = JSON.parse(JSON.stringify(form.value))
subForm.testReport = testReport.value
subForm.saveOrCheckflag = '1'
//新增，则组装业务数据提交后台
addSurveyTest(subForm).then(res => {
ElMessage.success('保存成功!')
tableStore.index()
planAddition.value = false
})
//查询进线数据，避免一直处于loading状态
} else {
formRef.value.validate(async (valid: any) => {
if (!testReport.value) {
return ElMessage({
message: '请上传处理成效报告',
type: 'warning'
})
}
if (valid) {
const subForm = JSON.parse(JSON.stringify(form.value))
subForm.testReport = testReport.value
subForm.saveOrCheckflag = '2'
if (addFlagRef.value) {
//新增，则组装业务数据提交后台
await addSurveyTest(subForm).then(res => {
//查询进线数据，避免一直处于loading状态
ElMessage.success('申请成功')
tableStore.index()
planAddition.value = false
})
} else {
await updateSurveyTest(subForm).then(res => {
//查询进线数据，避免一直处于loading状态
ElMessage.success('重新申请成功')
tableStore.index()
planAddition.value = false
})
}
}
})
}
if (valid) {
const subForm = JSON.parse(JSON.stringify(form.value))
subForm.testReport = testReport.value
if (addFlagRef.value) {
//新增，则组装业务数据提交后台
await addSurveyTest(subForm)
//查询进线数据，避免一直处于loading状态
ElMessage.success('申请成功')
tableStore.index()
planAddition.value = false
} else {
await updateSurveyTest(subForm)
//查询进线数据，避免一直处于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')
})
}
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')
})
}
}
defineExpose({ open })
const choose = (e: any) => {
uploadFile(e.raw, '/supervision/').then(res => {
testReport.value = res.data.name
// form.value.testReport = res.data.name
})
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)
uploadRef.value!.clearFiles()
const file = files[0] as UploadRawFile
file.uid = genFileId()
uploadRef.value!.handleStart(file)
}
//上传报告改变
const uploadFileName = val => {
uploadName.value = val
uploadName.value = val
}
</script>
<style lang='scss' scoped>
<style lang="scss" scoped>
// :deep(.el-upload-list__item-info) {
// width: 250px;
// }

9
src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
View File

@@ -114,7 +114,7 @@ const tableStore = new TableStore({
minWidth: 140,
custom: {
0: 'warning',
6: 'primary',
1: 'primary',
2: 'success',
3: 'danger',
@@ -122,7 +122,7 @@ const tableStore = new TableStore({
},
replaceValue: {
0: '待提交审批',
6: '新增',
1: '审批中',
2: '审批通过',
3: '审批不通过',
@@ -180,10 +180,7 @@ const tableStore = new TableStore({
return row.createBy != adminInfo.$state.id || !(row.status == 0)
},
click: row => {
addForms.value.open({
title: '编辑',
row: row
})
planTestRef.value.open('编辑', row.id, false)
}
},
{