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

流程详情历史记录

Browse Source
This commit is contained in:
zhujiyan
2024-06-03 18:00:32 +08:00
parent 8a01455042
commit 31afc15f49
15 changed files with 223 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/supervision-boot/interfere/index.ts
View File

@@ -15,6 +15,18 @@ export const submitFormData = (data: any) => {
})
}
/**
* 重新发起表单数据(编辑)
*/
export const updateFormData = (data: any) => {
return createAxios({
url: '/supervision-boot/userReport/update',
method: 'POST',
data: data
})
}
export const submitGoNet = (data: any) => {
return createAxios({
url: '/supervision-boot/userReportNormal/addUserReportNormal',

9
src/api/supervision-boot/monitorpoint/index.ts
View File

@@ -15,6 +15,15 @@ export const addMointorPointFormData = (data: any) => {
})
}
//重新发起监测点信息
export const updateMointorPointFormData = (data: any) => {
return createAxios({
url: '/supervision-boot/tempLine/update',
method: 'POST',
data: data
})
}
/**
* 查询干扰源列表数据

9
src/api/supervision-boot/plan/index.ts
View File

@@ -15,7 +15,14 @@ export const addPlanFormData = (data: any) => {
})
}
//重新发起技术监督计划表单数据
export const updatePlanFormData = (data: any) => {
return createAxios({
url: '/supervision-boot/superPlan/updatePlan',
method: 'POST',
data: data
})
}
/**
* 根据当前登陆用户的部门id查询人员

2
src/components/table/header/index.vue
View File

@@ -9,7 +9,7 @@
label-position="left"
:inline="true"
>
<el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 610px;">
<el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 600px;">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>

12
src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
View File

@@ -3,7 +3,7 @@
<TableHeader ref="TableHeaderRef">
<template #select>
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.projectName" clearable></el-input>
<el-input v-model="tableStore.table.params.projectName" placeholder="请输入用户名称"></el-input>
</el-form-item>
<el-form-item label="所属地市">
<el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
@@ -86,7 +86,15 @@ const tableStore = new TableStore({
3: '退运'
}
},
{ field: 'substation', title: '变电站', minWidth: 100 },
{
field: 'substation',
title: '变电站',
minWidth: 100,
formatter: (row: any) => {
row.cellValue = row.cellValue ? row.cellValue : '/'
return row.cellValue
}
},
{
title: '详细信息',
minWidth: 100,

18
src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
View File

@@ -507,7 +507,7 @@ import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
import { useAdminInfo } from '@/stores/adminInfo'
import { queryByAllCode } from '@/api/system-boot/dictTree'
import { uploadFile } from '@/api/system-boot/file'
import { submitFormData, getById } from '@/api/supervision-boot/interfere/index'
import { submitFormData, getById ,updateFormData} from '@/api/supervision-boot/interfere/index'
defineProps({
openType: {
type: String,
@@ -904,14 +904,14 @@ watch(
deep: true
}
)
const resendId=ref('')
const open = async (row: any) => {
title.value = row.title
dialogFormVisible.value = true
if (row.row) {
resendId.value=row.row.id
await getById({ id: row.row.id }).then(res => {
// form.value.userType = res.data.userType
if (res.data.userReportProjectPO != null) {
// userType 0 1
form.value = { ...res.data, ...res.data.userReportProjectPO }
@@ -1232,6 +1232,18 @@ const confirmForm = () => {
})
} else {
console.log(confirmFormData)
confirmFormData.id=resendId.value
updateFormData(confirmFormData).then(res => {
if (res.code == 'A0000') {
ElMessage({
message: '重新发起成功',
type: 'success'
})
ruleFormRef.value.resetFields()
resetForm()
close()
}
})
}
} else {
console.log('表单验证失败')

85
src/views/pqs/supervise/interfere/components/undocumented/index.vue
View File

@@ -2,7 +2,10 @@
<TableHeader ref="TableHeaderRef">
<template #select>
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.projectName" clearable></el-input>
<el-input
v-model="tableStore.table.params.projectName"
placeholder="请输入用户名称"
></el-input>
</el-form-item>
<el-form-item label="所属地市">
<el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
@@ -59,7 +62,15 @@ const tableStore = new TableStore({
{ title: '序号', type: 'seq', width: 80 },
// { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
{ field: 'city', title: '所属地市', minWidth: 80 },
{ field: 'substation', title: '变电站', minWidth: 100 },
{
field: 'substation',
title: '变电站',
minWidth: 100,
formatter: (row: any) => {
row.cellValue = row.cellValue ? row.cellValue : '/'
return row.cellValue
}
},
{ field: 'projectName', title: '用户名称', minWidth: 170 },
{
field: 'userType',
@@ -120,37 +131,36 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId)
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
// {
// name: 'edit',
// title: '重新发起',
// type: 'warning',
// icon: 'el-icon-Open',
// render: 'basicButton',
// disabled: row => {
// return row.status == 1 || row.status == 2
// },
// click: row => {
// addForms.value.open({
// title: '重新发起',
// row: row
// })
// }
// },
// {
// name: 'cancel',
// title: '取消',
// type: 'danger',
// icon: 'el-icon-Open',
// render: 'basicButton',
// disabled: row => {
// return row.status == 3 || row.status == 2 || row.status == 4
// },
// click: row => {
// }
// }
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 1 || row.status == 2
},
click: row => {
addForms.value.open({
title: '重新发起',
row: row
})
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 3 || row.status == 2 || row.status == 4
},
click: row => {}
}
]
}
],
@@ -205,11 +215,12 @@ onMounted(() => {
})
/** 处理审批按钮 */
const handleAudit = (instanceId: any) => {
const handleAudit = (instanceId: any, historyInstanceId: any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
id: instanceId
state: {
id: instanceId,
historyInstanceId
}
})
}
@@ -242,11 +253,5 @@ const getUserTypeName = (userType: any) => {
</script>
<style scoped lang="scss">
:deep(.el-upload-list__item) {
width: 400px;
}
::v-deep .el-input__wrapper {
width: 200px !important;
}
</style>

59
src/views/pqs/supervise/plan/components/addForm.vue
View File

@@ -362,7 +362,7 @@ import { genFileId, ElMessage } from 'element-plus'
import { useDictData } from '@/stores/dictData'
import { useAdminInfo } from '@/stores/adminInfo'
import { uploadFile } from '@/api/system-boot/file'
import { addPlanFormData, getUserByDeptId, getPlanDetailsById } from '@/api/supervision-boot/plan/index'
import { addPlanFormData, getUserByDeptId, getPlanDetailsById,updatePlanFormData } from '@/api/supervision-boot/plan/index'
import Area from '@/components/form/area/index.vue'
const emits = defineEmits(['onSubmit'])
const dictData = useDictData()
@@ -557,11 +557,13 @@ watch(
immediate: true
}
)
const resendId=ref('')
const open = (row: any) => {
title.value = row.title
dialogFormVisible.value = true
title.value = row.title;
dialogFormVisible.value = true;
resendId.value=row.row.planId;
if (row.row) {
getPlanDetailsById({ id: '861efbc90d1fae8e276f477081dd85fe' }).then(res => {
getPlanDetailsById({ id: row.row.planId}).then(res => {
form.value = res.data
})
}
@@ -641,43 +643,6 @@ const confirmForm = () => {
if (valid) {
form.value.planUserId = adminInfo.$state.id
let confirmFormData = JSON.parse(JSON.stringify(form.value))
//1.判断是否上传
// if (!sealReport.value) {
// return ElMessage({
// message: '请上传盖章报告',
// type: 'warning'
// })
// }
// if (!evidenceMaterials.value) {
// return ElMessage({
// message: '请上传佐证材料',
// type: 'warning'
// })
// }
// if (!planChangeMaterials.value) {
// return ElMessage({
// message: '请上传计划变更材料',
// type: 'warning'
// })
// }
// if (!alarmMaterials.value) {
// return ElMessage({
// message: '请上传告预警单材料',
// type: 'warning'
// })
// }
// if (!alarmFeedbackMaterials.value) {
// return ElMessage({
// message: '请上传告预警单反馈材料',
// type: 'warning'
// })
// }
// if (!assessReport.value) {
// return ElMessage({
// message: '请上传评估报告',
// type: 'warning'
// })
// }
//提交终端信息
// confirmFormData = {
// ...confirmFormData,
@@ -702,6 +667,18 @@ const confirmForm = () => {
})
} else {
console.log(confirmFormData)
confirmFormData.id=resendId.value;
updatePlanFormData(confirmFormData).then(res => {
if (res.code == 'A0000') {
ElMessage({
message: '新建技术监督计划成功',
type: 'success'
})
ruleFormRef.value.resetFields()
resetForm()
close()
}
})
}
} else {
console.log('表单验证失败')

2
src/views/pqs/supervise/plan/components/detail.vue
View File

@@ -160,6 +160,7 @@ const { query } = useRoute() // 查询参数
const props = defineProps({
id: propTypes.string.def(undefined)
})
console.log(propTypes.string.def(undefined),"999999999999传参");
const detailLoading = ref(false) // 表单的加载中
const detailData = ref<any>({}) // 详情数据
const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
@@ -198,6 +199,7 @@ getEffectUserList()
/** 获得数据 */
const getInfo = async () => {
detailLoading.value = true
console.log(props.id , queryId ,"流程详情内部的id");
try {
await getPlanDetailsById({ id: props.id || queryId }).then(res => {
detailData.value = res.data

101
src/views/pqs/supervise/plan/index.vue
View File

@@ -169,28 +169,29 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
console.log(row.processInstanceId,"000000000");
handleDetails(row.processInstanceId)
},
disabled: row => {
return !row.processInstanceId
}
},
// {
// name: 'edit',
// title: '重新发起',
// type: 'warning',
// icon: 'el-icon-Open',
// render: 'basicButton',
// disabled: row => {
// return row.status == 1 || row.status == 2
// },
// click: row => {
// addForms.value.open({
// title: '重新发起',
// row: row
// })
// }
// },
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 1 || row.status == 2
},
click: row => {
addForms.value.open({
title: '重新发起',
row: row
})
}
},
{
name: 'productSetting',
@@ -216,19 +217,19 @@ const tableStore = new TableStore({
}
},
// {
// name: 'cancel',
// title: '取消',
// type: 'danger',
// icon: 'el-icon-Open',
// render: 'basicButton',
// disabled: row => {
// return row.status == 3 || row.status == 2 || row.status == 4
// },
// click: row => {
// // cancelLeave(row)
// }
// },
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 3 || row.status == 2 || row.status == 4
},
click: row => {
// cancelLeave(row)
}
},
{
name: 'productSetting',
title: '发起告警单',
@@ -332,45 +333,5 @@ const handleEffectProblem = (row: any) => {
}
})
}
/**获取用户性质*/
const getUserTypeName = (userType: any) => {
if (userType === 0) {
return '新建电网工程'
}
if (userType === 1) {
return '扩建电网工程'
}
if (userType === 2) {
return '新建非线性负荷用户'
}
if (userType === 3) {
return '扩建非线性负荷用户'
}
if (userType === 4) {
return '新建新能源发电站'
}
if (userType === 5) {
return '扩建新能源发电站'
}
if (userType === 6) {
return '敏感及重要用户'
}
return '新建电网工程'
}
</script>
<style scoped lang="scss">
// :deep(.el-upload-list__item) {
// width: 400px;
// }
// ::v-deep .el-input__wrapper {
// // width: 200px !important;
// }
// .bars_w {
// width: 100%;
// height: 500px;
// }
// :deep(.el-tabs__content) {
// height: v-bind('layout.height');
// overflow-y: auto;
// }
</style>

16
src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
View File

@@ -356,7 +356,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
import { uploadFile } from '@/api/system-boot/file'
import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
import { getDeviceList } from '@/api/supervision-boot/terminal/index'
import { addMointorPointFormData, getList } from '@/api/supervision-boot/monitorpoint/index'
import { addMointorPointFormData, getList, updateMointorPointFormData } from '@/api/supervision-boot/monitorpoint/index'
import { queryByAllCode } from '@/api/system-boot/dictTree'
import { object } from 'vue-types'
const emits = defineEmits(['onSubmit'])
@@ -875,6 +875,7 @@ watch(
immediate: true
}
)
const resendId = ref('')
const open = (row: any) => {
dialogFormVisible.value = true
//初始化数据
@@ -882,6 +883,7 @@ const open = (row: any) => {
title.value = row.title
nextTick(() => {
if (row.row) {
resendId.value = row.row.id
getTempLineDetailsById({ id: row.row.id }).then(res => {
form.value = res.data
form.value.loadType = loadTypeList.value.filter((item: any) => item.name == res.data.loadType)[0]?.id
@@ -982,6 +984,18 @@ const confirmForm = () => {
close()
})
} else {
confirmFormData.id = resendId.value
updateMointorPointFormData(confirmFormData).then(res => {
if (res.code == 'A0000') {
ElMessage({
message: '重新发起成功',
type: 'success'
})
ruleFormRef.value.resetFields()
resetForm()
close()
}
})
}
} else {
console.log('表单验证失败')

90
src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
View File

@@ -94,38 +94,38 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId)
handleAudit(row.processInstanceId,row.historyInstanceId)
}
},
// {
// name: 'edit',
// title: '重新发起',
// type: 'warning',
// icon: 'el-icon-Open',
// render: 'basicButton',
// disabled: row => {
// return row.status == 1 || row.status == 2
// },
// click: row => {
// addForms.value.open({
// title: '重新发起',
// row: row
// })
// }
// },
// {
// name: 'cancel',
// title: '取消',
// type: 'danger',
// icon: 'el-icon-Open',
// render: 'basicButton',
// disabled: row => {
// return row.status == 3 || row.status == 2 || row.status == 4
// },
// click: row => {
// // cancelLeave(row)
// }
// }
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 1 || row.status == 2
},
click: row => {
addForms.value.open({
title: '重新发起',
row: row
})
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 3 || row.status == 2 || row.status == 4
},
click: row => {
// cancelLeave(row)
}
}
]
}
],
@@ -173,40 +173,16 @@ onMounted(() => {
})
/** 处理审批按钮 */
const handleAudit = (instanceId: any) => {
const handleAudit = (instanceId: any,historyInstanceId:any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
id: instanceId
id: instanceId,
historyInstanceId
}
})
}
/**获取用户性质*/
const getUserTypeName = (userType: any) => {
if (userType === 0) {
return '新建电网工程'
}
if (userType === 1) {
return '扩建电网工程'
}
if (userType === 2) {
return '新建非线性负荷用户'
}
if (userType === 3) {
return '扩建非线性负荷用户'
}
if (userType === 4) {
return '新建新能源发电站'
}
if (userType === 5) {
return '扩建新能源发电站'
}
if (userType === 6) {
return '敏感及重要用户'
}
return '新建电网工程'
}
</script>
<style scoped lang="scss">

23
src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
View File

@@ -34,8 +34,24 @@ const tableStore = new TableStore({
method: 'POST',
column: [
{ title: '序号', type: 'seq', width: 80 },
{ field: 'orgName', title: '填报部门名称', minWidth: 170 },
{ field: 'substationName', title: '所属变电站', minWidth: 170 },
{
field: 'orgName',
title: '填报部门名称',
minWidth: 170,
formatter: (row: any) => {
row.cellValue = row.cellValue ? row.cellValue : ''
return row.cellValue
}
},
{
field: 'substationName',
title: '所属变电站',
minWidth: 170,
formatter: (row: any) => {
row.cellValue = row.cellValue ? row.cellValue : '/'
return row.cellValue
}
},
{ field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
{ field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
{ field: 'reportDate', title: '填报日期', minWidth: 170 },
@@ -189,13 +205,12 @@ onMounted(() => {
const handleAudit = (instanceId: any, historyInstanceId: any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
state: {
id: instanceId,
historyInstanceId
}
})
}
</script>
<style scoped lang="scss">

2
src/views/system/bpm/task/done/index.vue
View File

@@ -4,7 +4,7 @@
<TableHeader date-picker>
<template v-slot:select>
<el-form-item label="任务名称">
<el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入任务名称" />
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" />
</el-form-item>
</template>
</TableHeader>

3
src/views/system/bpm/task/todo/index.vue
View File

@@ -6,9 +6,8 @@
<el-form-item label='任务名称'>
<el-input
v-model='tableStore.table.params.searchValue'
clearable
placeholder='请输入任务名称'
/>
></el-input>
</el-form-item>
</template>