From 346a5866d2c73a11f9e463e241a4b2183785356f Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Mon, 18 Mar 2024 18:00:46 +0800 Subject: [PATCH] update --- src/views/supervision_company_check/index.vue | 5 ++++- .../index.vue | 6 ++++-- .../supervision_excess_risk_security_monitoring/index.vue | 5 ++++- .../supervision_high_risk_security_monitoring/index.vue | 6 ++++-- .../supervision_large_mechanical_equipment/index.vue | 8 +++++++- src/views/supervision_project_acceptance_report/index.vue | 5 ++++- src/views/supervision_project_case_review/index.vue | 6 ++++-- src/views/supervision_project_data_archiving/index.vue | 5 ++++- src/views/supervision_project_info_report/index.vue | 5 ++++- src/views/supervision_project_milestones/index.vue | 6 ++++-- src/views/supervision_project_monthly_report/index.vue | 5 ++++- src/views/supervision_project_owner_evaluation/index.vue | 8 ++++---- src/views/supervision_project_personnel/index.vue | 5 ++++- src/views/supervision_safety_warning_sign/index.vue | 5 ++++- 14 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/views/supervision_company_check/index.vue b/src/views/supervision_company_check/index.vue index 75b5276..c1c0155 100644 --- a/src/views/supervision_company_check/index.vue +++ b/src/views/supervision_company_check/index.vue @@ -2,6 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="检查名称" prop="name"> <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入检查名称" /> </el-form-item> @@ -71,7 +74,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionCompanyCheckLists, apiSupervisionCompanyCheckDelete, apiSupervisionCompanyCheckDetail } from '@/api/supervision_company_check' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_dangerous_engineering_monitoring/index.vue b/src/views/supervision_dangerous_engineering_monitoring/index.vue index db068e4..a3544a8 100644 --- a/src/views/supervision_dangerous_engineering_monitoring/index.vue +++ b/src/views/supervision_dangerous_engineering_monitoring/index.vue @@ -2,7 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> - + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="危大工程类型" prop="type"> <el-select class="flex-1" v-model="queryParams.type" clearable placeholder="请选择危大工程类型"> <el-option label="超规模工程" :value="parseInt(0)" /> @@ -103,7 +105,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionDangerousEngineeringMonitoringLists, apiSupervisionDangerousEngineeringMonitoringDelete, apiSupervisionDangerousEngineeringMonitoringDetail } from '@/api/supervision_dangerous_engineering_monitoring' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_excess_risk_security_monitoring/index.vue b/src/views/supervision_excess_risk_security_monitoring/index.vue index 09b814a..0cf01e2 100644 --- a/src/views/supervision_excess_risk_security_monitoring/index.vue +++ b/src/views/supervision_excess_risk_security_monitoring/index.vue @@ -2,6 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="分部分项工程" prop="partial_project"> <el-select class="flex-1" v-model="queryParams.partial_project" clearable placeholder="请选择分部分项工程"> <el-option v-for="(item, index) in dictData.partial_project" :key="index" :label="item.name" @@ -69,7 +72,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionExcessRiskSecurityMonitoringLists, apiSupervisionExcessRiskSecurityMonitoringDelete, apiSupervisionExcessRiskSecurityMonitoringDetail } from '@/api/supervision_excess_risk_security_monitoring' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_high_risk_security_monitoring/index.vue b/src/views/supervision_high_risk_security_monitoring/index.vue index cfd8309..5a4b33f 100644 --- a/src/views/supervision_high_risk_security_monitoring/index.vue +++ b/src/views/supervision_high_risk_security_monitoring/index.vue @@ -2,7 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> - + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="分部分项工程" prop="partial_project"> <el-select class="flex-1" v-model="queryParams.partial_project" clearable placeholder="请选择分部分项工程"> <el-option v-for="(item, index) in dictData.partial_project" :key="index" :label="item.name" @@ -68,7 +70,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionHighRiskSecurityMonitoringLists, apiSupervisionHighRiskSecurityMonitoringDelete, apiSupervisionHighRiskSecurityMonitoringDetail } from '@/api/supervision_high_risk_security_monitoring' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_large_mechanical_equipment/index.vue b/src/views/supervision_large_mechanical_equipment/index.vue index 01cf156..ff39814 100644 --- a/src/views/supervision_large_mechanical_equipment/index.vue +++ b/src/views/supervision_large_mechanical_equipment/index.vue @@ -3,6 +3,12 @@ <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" label-width="80px"> <el-row> + <el-col :span="6"> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" + :api="apiSupervisionProjectSearch" /> + </el-form-item> + </el-col> <el-col :span="6"> <el-form-item label="序号" prop="sn"> <el-input v-model="queryParams.sn" clearable placeholder="请输入序号" /> @@ -97,7 +103,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionLargeMechanicalEquipmentLists, apiSupervisionLargeMechanicalEquipmentDelete } from '@/api/supervision_large_mechanical_equipment' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_project_acceptance_report/index.vue b/src/views/supervision_project_acceptance_report/index.vue index 67eab09..cbe0810 100644 --- a/src/views/supervision_project_acceptance_report/index.vue +++ b/src/views/supervision_project_acceptance_report/index.vue @@ -2,6 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="文档名称" prop="title"> <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入文档名称" /> </el-form-item> @@ -56,7 +59,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionProjectAcceptanceReportLists, apiSupervisionProjectAcceptanceReportDelete, apiSupervisionProjectAcceptanceReportDetail } from '@/api/supervision_project_acceptance_report' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_project_case_review/index.vue b/src/views/supervision_project_case_review/index.vue index a7bdd97..96711f4 100644 --- a/src/views/supervision_project_case_review/index.vue +++ b/src/views/supervision_project_case_review/index.vue @@ -2,7 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> - + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="专项审批类型" prop="review_type"> <el-select class="flex-1" v-model="queryParams.review_type" clearable placeholder="请选择专项审批类型"> <el-option v-for="(item, index) in dictData.supervision_planning_approval_type" :key="index" @@ -65,7 +67,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionProjectCaseReviewLists, apiSupervisionProjectCaseReviewDelete, apiSupervisionProjectCaseReviewDetail } from '@/api/supervision_project_case_review' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_project_data_archiving/index.vue b/src/views/supervision_project_data_archiving/index.vue index bffec77..d5cfc49 100644 --- a/src/views/supervision_project_data_archiving/index.vue +++ b/src/views/supervision_project_data_archiving/index.vue @@ -2,6 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="项目总监意见" prop="opinion"> <el-input class="w-[280px]" v-model="queryParams.opinion" clearable placeholder="请输入项目总监意见" /> </el-form-item> @@ -57,7 +60,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionProjectDataArchivingLists, apiSupervisionProjectDataArchivingDelete, apiSupervisionProjectDataArchivingDetail } from '@/api/supervision_project_data_archiving' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_project_info_report/index.vue b/src/views/supervision_project_info_report/index.vue index a887c30..d1dec0c 100644 --- a/src/views/supervision_project_info_report/index.vue +++ b/src/views/supervision_project_info_report/index.vue @@ -2,6 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="信息摘要" prop="abstract"> <el-input class="w-[280px]" v-model="queryParams.abstract" clearable placeholder="请输入信息摘要" /> </el-form-item> @@ -70,7 +73,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionProjectInfoReportLists, apiSupervisionProjectInfoReportDelete, apiSupervisionProjectInfoReportDetail } from '@/api/supervision_project_info_report' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_project_milestones/index.vue b/src/views/supervision_project_milestones/index.vue index 3837271..3308790 100644 --- a/src/views/supervision_project_milestones/index.vue +++ b/src/views/supervision_project_milestones/index.vue @@ -2,7 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> - + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="标题" prop="title"> <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入标题" /> </el-form-item> @@ -58,7 +60,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionProjectMilestonesLists, apiSupervisionProjectMilestonesDelete } from '@/api/supervision_project_milestones' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_project_monthly_report/index.vue b/src/views/supervision_project_monthly_report/index.vue index a664b07..5e6c79c 100644 --- a/src/views/supervision_project_monthly_report/index.vue +++ b/src/views/supervision_project_monthly_report/index.vue @@ -2,6 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="年月" prop="date"> <el-date-picker class="flex-1 !flex" v-model="queryParams.date" clearable type="month" value-format="YYYY-MM" placeholder="请选择日期"> @@ -80,7 +83,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionProjectMonthlyReportLists, apiSupervisionProjectMonthlyReportDelete, apiSupervisionProjectMonthlyReportDetail } from '@/api/supervision_project_monthly_report' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_project_owner_evaluation/index.vue b/src/views/supervision_project_owner_evaluation/index.vue index 7d7afb7..a72d9af 100644 --- a/src/views/supervision_project_owner_evaluation/index.vue +++ b/src/views/supervision_project_owner_evaluation/index.vue @@ -2,9 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> - <!-- <el-form-item label="项目id" prop="project_id"> - <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" /> - </el-form-item> --> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="文档名称" prop="title"> <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入文档名称" /> </el-form-item> @@ -59,7 +59,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionProjectOwnerEvaluationLists, apiSupervisionProjectOwnerEvaluationDelete, apiSupervisionProjectOwnerEvaluationDetail } from '@/api/supervision_project_owner_evaluation' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_project_personnel/index.vue b/src/views/supervision_project_personnel/index.vue index 4a5678e..7fa8f6e 100644 --- a/src/views/supervision_project_personnel/index.vue +++ b/src/views/supervision_project_personnel/index.vue @@ -2,6 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="姓名" prop="name"> <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入姓名" /> </el-form-item> @@ -66,7 +69,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionProjectPersonnelLists, apiSupervisionProjectPersonnelDelete } from '@/api/supervision_project_personnel' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' diff --git a/src/views/supervision_safety_warning_sign/index.vue b/src/views/supervision_safety_warning_sign/index.vue index bf37ad5..3e9dcbf 100644 --- a/src/views/supervision_safety_warning_sign/index.vue +++ b/src/views/supervision_safety_warning_sign/index.vue @@ -2,6 +2,9 @@ <div> <el-card class="!border-none mb-4" shadow="never"> <el-form class="mb-[-16px]" :model="queryParams" inline> + <el-form-item label="所属项目" prop="project_id"> + <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" /> + </el-form-item> <el-form-item label="检查人" prop="check_user"> <el-input class="w-[280px]" v-model="queryParams.check_user" clearable placeholder="请输入检查人" /> </el-form-item> @@ -62,7 +65,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionSafetyWarningSignLists, apiSupervisionSafetyWarningSignDelete } from '@/api/supervision_safety_warning_sign' -import { timeFormat } from '@/utils/util' +import { apiSupervisionProjectSearch } from '@/api/supervision_project' import feedback from '@/utils/feedback' import EditPopup from './edit.vue'