问题修改

2024-05-29 15:06:53 +08:00
parent 62e68e4434
commit 32be424616
12 changed files with 137 additions and 244 deletions
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/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) => {
-    // 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
+            }
+        })
    })
 }

--- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue
+++ b/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>
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/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-input type="textarea" v-model="form.evaluationConclusion" autocomplete="off" placeholder="请输入预测评估结论" />
+            <el-form-item for="-" label="预测评估结论：" prop="evaluationConclusion" style="width: 100%">
+                <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()
-                resetForm()
-                close()
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        message: '新增成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
            })
        } else {
            console.log('表单验证失败')
--- 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 ? '否' : '是' }}
                </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;