问题修改

src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue

@@ -3,7 +3,7 @@
         <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" :scroll-to-error="true">
             <el-row>
                 <el-col :span="12">
-                    <el-form-item for="-"  label="用户名称:" prop="userName">
+                    <el-form-item for="-" label="用户名称:" prop="userName">
                         <el-input
                             v-model="form.userName"
                             clearable
@@ -120,6 +120,7 @@
 import { ref, defineEmits } from 'vue'
 import { useDictData } from '@/stores/dictData'
 import { useAdminInfo } from '@/stores/adminInfo'
+import { genFileId, ElMessage } from 'element-plus'
 import { addComplaintsData, getLineDetailByDeptId } from '@/api/process-boot/electricitymanagement'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
@@ -176,10 +177,16 @@ const submit = () => {
                 })?.name
             }
             addComplaintsData(form.value).then(res => {
-                emits('onSubmit')
+                if (res.code == 'A0000') {
-                formRef.value && formRef.value.resetFields()
+                    ElMessage({
-                resetForm()
+                        message: '新增成功',
-                handleClose()
+                        type: 'success'
+                    })
+                    emits('onSubmit')
+                    formRef.value && formRef.value.resetFields()
+                    resetForm()
+                    handleClose()
+                }
             })
         } else {
             console.log('表单验证失败')

src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue

@@ -59,7 +59,7 @@
                 /> -->
             </el-form-item>
             <!-- <el-form :model="formdata" label-width="auto"> -->
-             <el-form-item for="-" class="uploadFile" label="上传文件:" prop="fileList">
+             <el-form-item for="-" class="uploadFile" label="普测报告:" prop="fileList">
                 <el-upload
                     v-model:file-list="formdata.fileList"
                     ref="upload"

src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue

@@ -43,9 +43,8 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
-
+import { getUserReportById } from '@/api/supervision-boot/userReport/form'
 import BpmUserReportDetail from '../../components/undocumented/detail.vue'
-
 const dictData = useDictData()
 const areaOptionList = dictData.getBasicData('jibei_area')
 
@@ -100,7 +99,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        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) => {
+const open = async val => {
-    // detailsRef.value.open()
+    interId.value = val.id
     dialogVisible.value = true
-    interId.value = id
 }
 
+const needGovernance = ref()
 /** 方案审查 */
-const toFangAn = (id: any, typeNo: number) => {
+const toFangAn = (row: any, typeNo: number) => {
-    push({
+    //查询详情拿到needGovernance
-        name: 'ProgramReview',
+    /** 获得数据 */
-        query: {
+    getUserReportById(row.id).then(res => {
-            id: id,
+        if (res.data.userType == '0' || res.data.userType == '1') {
-            type: typeNo
+            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
+            }
+        })
     })
 }
 

src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue

@@ -23,7 +23,8 @@
             </template>
         </TableHeader> -->
         <div class="header_btn">
-            <el-button icon="" type="primary" @click="toGoNet()">{{ titleButton }}</el-button>
+            <el-button v-if="bussType==0" icon="" type="primary" @click="toGoNet()">{{ titleButton }}</el-button>
+            <el-button v-if="bussType==1&&needGovernance!='0'" icon="" type="primary" @click="toGoNet()">{{ titleButton }}</el-button>
             <el-button style="margin-left: 50px" :icon="Back" @click="go(-1)">返回</el-button>
         </div>
         <Table ref="tableRef" />
@@ -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;
 }
 </style>

src/views/pqs/supervise/interfere/components/undocumented/addForm.vue

@@ -289,8 +289,13 @@
             >
                 <el-input v-model="form.evaluationChekDept" autocomplete="off" placeholder="请输入预测评估评审单位" />
             </el-form-item>
-            <el-form-item for="-" label="预测评估结论：" prop="evaluationConclusion" style="width:100%">
+            <el-form-item for="-" label="预测评估结论：" prop="evaluationConclusion" style="width: 100%">
-                <el-input type="textarea" v-model="form.evaluationConclusion" autocomplete="off" placeholder="请输入预测评估结论" />
+                <el-input
+                    type="textarea"
+                    v-model="form.evaluationConclusion"
+                    autocomplete="off"
+                    placeholder="请输入预测评估结论"
+                />
             </el-form-item>
             <el-form-item class="uploadFile" for="-" label="可研报告：" prop="feasibilityReport">
                 <el-upload
@@ -1377,9 +1382,15 @@ const confirmForm = () => {
                 }
             }
             submitFormData(confirmFormData).then(res => {
-                ruleFormRef.value.resetFields()
+                if (res.code == 'A0000') {
-                resetForm()
+                    ElMessage({
-                close()
+                        message: '新增成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
             })
         } else {
             console.log('表单验证失败')

src/views/pqs/supervise/interfere/components/undocumented/detail.vue

@@ -105,7 +105,10 @@
                     {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
                 </span>
             </el-descriptions-item>
-            <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData.userType == 0 || detailData.userType == 1">
+            <el-descriptions-item
+                label="用户协议容量（MVA）"
+                v-if="detailData.userType == 0 || detailData.userType == 1"
+            >
                 {{ proviteData.agreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item
@@ -266,7 +269,9 @@
                 <el-icon>
                     <Link />
                 </el-icon>
-                <a :href="proviteData?.additionalAttachments.url" target="_blank">{{ proviteData?.additionalAttachments.name }}</a>
+                <a :href="proviteData?.additionalAttachments.url" target="_blank">
+                    {{ proviteData?.additionalAttachments.name }}
+                </a>
             </el-descriptions-item>
         </el-descriptions>
     </div>
@@ -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;

src/views/pqs/supervise/plan/components/addForm.vue

@@ -71,7 +71,7 @@
             <el-form-item for="-" label="监督对象名称：" prop="supvObjName">
                 <el-input v-model="form.supvObjName" autocomplete="off" placeholder="请输入监督对象名称" />
             </el-form-item>
-            <el-form-item for="-" label="监督对象电压等级：" prop="supvObjName">
+            <el-form-item for="-" label="监督对象电压等级：" prop="objVoltageLevel">
                 <el-select
                     v-model="form.objVoltageLevel"
                     clearable
@@ -99,8 +99,15 @@
             <el-form-item for="-" label="监督对象属性名称：" prop="objTypeName">
                 <el-input v-model="form.objTypeName" autocomplete="off" placeholder="请输入监督对象属性名称" />
             </el-form-item>
-            <el-form-item for="-" label="监督对象协议容量(MVA)：" prop="objCapacity">
+            <el-form-item for="-" label="监督对象协议容量：" prop="objCapacity">
-                <el-input v-model="form.objCapacity" autocomplete="off" placeholder="请输入监督对象监督对象协议容量" />
+                <el-input
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    v-model="form.objCapacity"
+                    autocomplete="off"
+                    placeholder="请输入监督对象监督对象协议容量"
+                >
+                    <template #append>MVA</template>
+                </el-input>
             </el-form-item>
             <el-form-item for="-" label="监督对象关联电站：" prop="substationName">
                 <el-input v-model="form.substationName" autocomplete="off" placeholder="请输入监督对象关联电站" />
@@ -130,6 +137,16 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item for="-" label="实施人员：">
+                <el-select v-model="form.effectUserId" clearable style="width: 100%" placeholder="请选择实施人员">
+                    <el-option
+                        v-for="item in effectUserIdList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item for="-" label="开始实施时间：">
                 <el-date-picker
                     style="width: 100%"
@@ -170,16 +187,6 @@
                     placeholder="请选择电能质量问题发生时间"
                 />
             </el-form-item>
-            <el-form-item for="-" label="实施人员：">
-                <el-select v-model="form.effectUserId" clearable style="width: 100%" placeholder="请选择实施人员">
-                    <el-option
-                        v-for="item in effectUserIdList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
             <el-form-item for="-" label="计划状态：">
                 <el-select v-model="form.planStatus" clearable style="width: 100%" placeholder="请选择计划状态">
                     <el-option
@@ -190,8 +197,9 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item for="-" label="其他要求：">
+            <el-form-item for="-" label="其他要求：" style="width:100%;">
                 <el-input
+                    type="textarea"
                     v-model="form.otherRemark"
                     autocomplete="off"
                     placeholder="请输入其他要求"
@@ -399,7 +407,7 @@ const resetForm = () => {
         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()
+                if (res.code == 'A0000') {
-                resetForm()
+                    ElMessage({
-                close()
+                        message: '新建技术监督计划成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
             })
         } else {
             console.log('表单验证失败')
@@ -685,16 +699,5 @@ const confirmForm = () => {
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
-.fixed-dialog {
+
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    max-height: calc(100% - 30px);
-}
-.el-form {
-}
-.dialog-footer {
-    padding: 10px;
-}
 </style>

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()
+                if (res.code == 'A0000') {
-                resetForm()
+                    ElMessage({
-                close()
+                        message: '新增实施问题成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
             })
         } else {
             console.log('表单验证失败')
@@ -407,17 +413,3 @@ const confirmForm = () => {
 }
 defineExpose({ open })
 </script>
-<style lang="scss" scoped>
-.fixed-dialog {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    max-height: calc(100% - 30px);
-}
-.el-form {
-}
-.dialog-footer {
-    padding: 10px;
-}
-</style>

src/views/pqs/supervise/plan/components/effectProblem/index.vue

@@ -205,76 +205,3 @@ const handleEdit = (row: any) => {
 onMounted(() => {})
 defineExpose({ open })
 </script>
-<style lang="scss" scoped>
-.fixed-dialog {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    max-height: calc(100% - 30px);
-}
-.el-form {
-    width: 96%;
-    height: 400px;
-    margin: 0 auto;
-    overflow-y: auto;
-    padding-top: 20px;
-}
-.dialog-footer {
-    padding: 10px;
-}
-/* 调整标签的换行行为 */
-.label_over_warp::v-deep .el-form-item__label {
-    // white-space: pre-line !important;
-    line-height: 16px !important;
-}
-::v-deep .el-form-item {
-    padding: 0 10px;
-    height: auto !important;
-}
-::v-deep .el-form-item__label {
-    justify-content: flex-start !important;
-}
-.form-label-left-align {
-    text-align: left;
-}
-::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-}
-.no_required::v-deep .el-form-item__label {
-    padding-left: 10px !important;
-}
-::v-deep .el-input {
-    width: 200px !important;
-}
-::v-deep .el-select {
-    width: 200px !important;
-}
-::v-deep .required_position {
-    position: relative;
-    .required_icon {
-        position: absolute;
-        left: -10px;
-        margin-top: 8px;
-        color: #f56c6c;
-        margin-left: 20px;
-        margin-right: 10px;
-    }
-    .required_icon_white {
-        color: #fff;
-        position: absolute;
-        left: -10px;
-        padding-left: 10px;
-        margin: 8px 10px 0 10px;
-    }
-    .required_text {
-        // padding-left: 20px;
-    }
-    .el-form-item__label {
-        padding-left: 10px;
-    }
-}
-// ::v-deep .tabs_form{
-//     height:300px !important;
-// }
-</style>

src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue

@@ -118,67 +118,4 @@ const confirmForm = () => {
 }
 defineExpose({ open })
 </script>
-<style lang="scss" scoped>
-.el-form {
-    // width: 96%;
-    height: 100px;
-    margin: 0 auto;
-    // overflow-y: auto;
-    padding-top: 20px;
-}
-.dialog-footer {
-    padding: 10px;
-}
-/* 调整标签的换行行为 */
-.label_over_warp::v-deep .el-form-item__label {
-    // white-space: pre-line !important;
-    line-height: 16px !important;
-}
-::v-deep .el-form-item {
-    padding: 0 10px;
-    height: auto !important;
-}
-::v-deep .el-form-item__label {
-    justify-content: flex-start !important;
-}
-.form-label-left-align {
-    text-align: left;
-}
-::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-}
 
-//表单tab容器
-.form_tab_item {
-    height: 400px;
-    overflow-y: auto;
-}
-::v-deep .el-input {
-    width: 200px !important;
-}
-::v-deep .el-select {
-    width: 200px !important;
-}
-::v-deep .required_position {
-    position: relative;
-    .required_icon {
-        position: absolute;
-        left: -10px;
-        margin-top: 8px;
-        color: #f56c6c;
-        margin-left: 10px;
-    }
-    .required_text {
-        padding-left: 20px;
-    }
-}
-.no_required::v-deep .el-form-item__label {
-    padding-left: 10px !important;
-    width: 70px !important;
-    margin-left: 0px !important;
-}
-
-// ::v-deep .tabs_form{
-//     height:300px !important;
-// }
-</style>

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()
+                if (res.code == 'A0000') {
-                resetForm()
+                    ElMessage({
-                close()
+                        message: '新增成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
             })
         } else {
             console.log('表单验证失败')
@@ -879,16 +885,6 @@ const confirmForm = () => {
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
-.el-form {
-    // width: 96%;
-    // height: 400px;
-    // margin: 0 auto;
-    // overflow-y: auto;
-    // padding-top: 20px;
-}
-.dialog-footer {
-    padding: 10px;
-}
 .fixed_upload {
     width: 100%;
     height: auto;

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue

@@ -1327,9 +1327,15 @@ const confirmForm = () => {
                 otherAttachments: otherAttachments?.value //其他附件
             }
             addTerminalFormData(confirmFormData).then(res => {
-                ruleFormRef.value.resetFields()
+                if (res.code == 'A0000') {
-                resetForm()
+                    ElMessage({
-                close()
+                        message: '新增成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
             })
         } else {
             console.log('表单验证失败')
@@ -1340,9 +1346,6 @@ const confirmForm = () => {
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
-.dialog-footer {
-    padding: 10px;
-}
 .fixed_upload {
     width: 100%;
     height: auto;