From 32be424616e62790ccbe703128a75de1011b300e Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Wed, 29 May 2024 15:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components1/form/complaintsForm.vue | 17 +++-- .../harmonicSurvey/components/planAdd.vue | 2 +- .../interferenceUserTable.vue | 45 ++++++++---- .../normalizationManager/programReview.vue | 17 +++-- .../components/undocumented/addForm.vue | 21 ++++-- .../components/undocumented/detail.vue | 17 +++-- .../pqs/supervise/plan/components/addForm.vue | 63 ++++++++-------- .../plan/components/effectProblem/addForm.vue | 26 +++---- .../plan/components/effectProblem/index.vue | 73 ------------------- .../components/jointDebugList/debug.vue | 63 ---------------- .../components/monitorpoint/addForm.vue | 22 +++--- .../components/terminainal/addForm.vue | 15 ++-- 12 files changed, 137 insertions(+), 244 deletions(-) diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue index 38450684..a54585a5 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue @@ -3,7 +3,7 @@ - + { })?.name } addComplaintsData(form.value).then(res => { - emits('onSubmit') - formRef.value && formRef.value.resetFields() - resetForm() - handleClose() + if (res.code == 'A0000') { + ElMessage({ + message: '新增成功', + type: 'success' + }) + emits('onSubmit') + formRef.value && formRef.value.resetFields() + resetForm() + handleClose() + } }) } else { console.log('表单验证失败') diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue index a4c9141e..b3e02476 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue @@ -59,7 +59,7 @@ /> --> - + { - open(row.id) + open(row) } } ] @@ -119,7 +118,7 @@ const tableStore = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', click: row => { - toFangAn(row.id, 0) + toFangAn(row, 0) } }, { @@ -129,7 +128,7 @@ const tableStore = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', click: row => { - toFangAn(row.id, 1) + toFangAn(row, 1) } } ] @@ -149,27 +148,43 @@ tableStore.table.params.relationUserName = '' tableStore.table.params.aisFileUpload = '' const dialogVisible = ref(false) const interId = ref() - provide('tableStore', tableStore) onMounted(() => { tableStore.index() }) const detailsRef = ref(null) /** 打开弹窗 */ -const open = async (id: string) => { - // detailsRef.value.open() +const open = async val => { + interId.value = val.id dialogVisible.value = true - interId.value = id } +const needGovernance = ref() /** 方案审查 */ -const toFangAn = (id: any, typeNo: number) => { - push({ - name: 'ProgramReview', - query: { - id: id, - type: typeNo +const toFangAn = (row: any, typeNo: number) => { + //查询详情拿到needGovernance + /** 获得数据 */ + getUserReportById(row.id).then(res => { + if (res.data.userType == '0' || res.data.userType == '1') { + needGovernance.value = res.data.userReportProjectPO?.needGovernance + } else if ( + res.data.userType == '2' || + res.data.userType == '3' || + res.data.userType == '4' || + res.data.userType == '5' + ) { + needGovernance.value = res.data.userReportSubstationPO?.needGovernance + } else if (res.data.userType == '6') { + needGovernance.value = res.data.userReportSensitivePO?.needGovernance } + push({ + name: 'ProgramReview', + query: { + id: row.id, + type: typeNo, + needGovernance: needGovernance.value + } + }) }) } diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue index c9804eb5..ae6889bb 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue @@ -23,7 +23,8 @@ -->
- {{ titleButton }} + {{ titleButton }} + {{ titleButton }} 返回
@@ -51,13 +52,13 @@ import Table from '@/components/table/index.vue' import TableHeader from '@/components/table/header/index.vue' import { useDictData } from '@/stores/dictData' import addForm from './addForm.vue' -import { useRouter } from 'vue-router' +import { useRouter, useRoute } from 'vue-router' import { Back } from '@element-plus/icons-vue' const { go, currentRoute, push } = useRouter() - +const { query } = useRoute() // 查询参数 +const needGovernance = query.needGovernance as unknown as string // 从 URL 传递过来的 是否需要治理 const dictData = useDictData() const areaOptionList = dictData.getBasicData('jibei_area') - const TableHeaderRef = ref() const tableStore = new TableStore({ url: '/supervision-boot/userReportNormal/userReportGoNetPage', @@ -154,9 +155,9 @@ bussType.value = Number(currentRoute.value.query.type) const titleButton = ref() if (bussType.value === 0) { - titleButton.value = '入网设计方案审查' + titleButton.value = '入网设计方案申请' } else { - titleButton.value = '治理工程验收' + titleButton.value = '治理工程申请' } provide('tableStore', tableStore) @@ -213,9 +214,9 @@ const getUserTypeName = (userType: any) => { width: 100%; height: 60px; display: flex; - padding:13px 15px; + padding: 13px 15px; justify-content: flex-end; align-items: center; - border:1px solid #DDDFE6; + border: 1px solid #dddfe6; } diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue index 6237e269..d6b769e5 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue @@ -289,8 +289,13 @@ > - - + + { } } submitFormData(confirmFormData).then(res => { - ruleFormRef.value.resetFields() - resetForm() - close() + if (res.code == 'A0000') { + ElMessage({ + message: '新增成功', + type: 'success' + }) + ruleFormRef.value.resetFields() + resetForm() + close() + } }) } else { console.log('表单验证失败') diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue index 670a663b..fe4a432b 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue @@ -105,7 +105,10 @@ {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }} - + {{ proviteData.agreementCapacity }} - {{ proviteData?.additionalAttachments.name }} + + {{ proviteData?.additionalAttachments.name }} + @@ -357,7 +362,6 @@ const evaluationTypeList = dictData.getBasicData('Evaluation_Type') const evaluationDeptList = dictData.getBasicData('evaluation_dept') /** 获得数据 */ const getInfo = async () => { - console.log(666666666, '加载了') detailLoading.value = true try { await getUserReportById(props.id || queryId).then(res => { @@ -375,7 +379,6 @@ const getProviteData = async () => { proviteData.value = detailData.value.userReportProjectPO //查询非线性设备类型 await getDictTreeById(proviteData.value.nonlinearDeviceType).then(res => { - console.log(res, '==========') proviteData.value.nonlinearDeviceType = res.data?.name }) } else if ( @@ -387,13 +390,11 @@ const getProviteData = async () => { proviteData.value = detailData.value.userReportSubstationPO //查询非线性负荷类型 await getDictTreeById(proviteData.value.nonlinearLoadType).then(res => { - console.log(res, '==========') proviteData.value.nonlinearLoadType = res.data?.name }) } else { proviteData.value = detailData.value.userReportSensitivePO } - console.log(proviteData.value, '++++++++++++proviteData.evaluationType') //可研报告 if (proviteData.value.feasibilityReport) { await getFileNamePath(proviteData.value.feasibilityReport, 'feasibilityReport') @@ -536,10 +537,10 @@ onMounted(() => { position: absolute !important; top: 20px !important; } -.el-icon{ +.el-icon { float: left; } -a{ +a { display: block; width: 200px; float: left; diff --git a/src/views/pqs/supervise/plan/components/addForm.vue b/src/views/pqs/supervise/plan/components/addForm.vue index 6a66a702..f3f23de5 100644 --- a/src/views/pqs/supervise/plan/components/addForm.vue +++ b/src/views/pqs/supervise/plan/components/addForm.vue @@ -71,7 +71,7 @@ - + - - + + + + @@ -130,6 +137,16 @@ > + + + + + - - - - - - + { workPlanName: '', //计划名称 supvOrgId: '', //监督单位 planOrgId: '', //计划编制单位 - supvType: '', //监督类型 + supvType: supvTypeList[0].id, //监督类型 supvStage: supvStageList[0]?.id, //监督阶段 planSupvDate: '', //计划监督时间 supvObjType: supvObjTypeList[0]?.id, //监督对象类型 @@ -672,9 +680,15 @@ const confirmForm = () => { // assessReport: assessReport.value //评估报告 // } addPlanFormData(confirmFormData).then(res => { - ruleFormRef.value.resetFields() - resetForm() - close() + if (res.code == 'A0000') { + ElMessage({ + message: '新建技术监督计划成功', + type: 'success' + }) + ruleFormRef.value.resetFields() + resetForm() + close() + } }) } else { console.log('表单验证失败') @@ -685,16 +699,5 @@ const confirmForm = () => { defineExpose({ open }) diff --git a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue index 3ff867c6..b2f3cdb3 100644 --- a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue +++ b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue @@ -395,9 +395,15 @@ const confirmForm = () => { form.value.planId = props.planId let confirmFormData = JSON.parse(JSON.stringify(form.value)) addPlanProblemFormData(confirmFormData).then(res => { - ruleFormRef.value.resetFields() - resetForm() - close() + if (res.code == 'A0000') { + ElMessage({ + message: '新增实施问题成功', + type: 'success' + }) + ruleFormRef.value.resetFields() + resetForm() + close() + } }) } else { console.log('表单验证失败') @@ -407,17 +413,3 @@ const confirmForm = () => { } defineExpose({ open }) - diff --git a/src/views/pqs/supervise/plan/components/effectProblem/index.vue b/src/views/pqs/supervise/plan/components/effectProblem/index.vue index 24e65d95..c7e7fa26 100644 --- a/src/views/pqs/supervise/plan/components/effectProblem/index.vue +++ b/src/views/pqs/supervise/plan/components/effectProblem/index.vue @@ -205,76 +205,3 @@ const handleEdit = (row: any) => { onMounted(() => {}) defineExpose({ open }) - diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue index 2de162f8..0300f9eb 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue @@ -118,67 +118,4 @@ const confirmForm = () => { } defineExpose({ open }) - diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index 71e01f6c..7d3c3711 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -866,9 +866,15 @@ const confirmForm = () => { ctRatio: form.value.ctRatio / form.value.ctRatio2 //CT变比 } addMointorPointFormData(confirmFormData).then(res => { - ruleFormRef.value.resetFields() - resetForm() - close() + if (res.code == 'A0000') { + ElMessage({ + message: '新增成功', + type: 'success' + }) + ruleFormRef.value.resetFields() + resetForm() + close() + } }) } else { console.log('表单验证失败') @@ -879,16 +885,6 @@ const confirmForm = () => { defineExpose({ open })