add

src/api/project_change_visa.ts

@@ -1,26 +1,49 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 项目变更签证列表
 export function apiProjectChangeVisaLists(params: any) {
-    return request.get({ url: '/project_process_management.project_change_visa/lists', params })
+  return request.get({
+    url: "/project_process_management.project_change_visa/lists",
+    params,
+  });
 }
 
 // 添加项目变更签证
 export function apiProjectChangeVisaAdd(params: any) {
-    return request.post({ url: '/project_process_management.project_change_visa/add', params })
+  return request.post({
+    url: "/project_process_management.project_change_visa/add",
+    params,
+  });
 }
 
 // 编辑项目变更签证
 export function apiProjectChangeVisaEdit(params: any) {
-    return request.post({ url: '/project_process_management.project_change_visa/edit', params })
+  return request.post({
+    url: "/project_process_management.project_change_visa/edit",
+    params,
+  });
 }
 
 // 删除项目变更签证
 export function apiProjectChangeVisaDelete(params: any) {
-    return request.post({ url: '/project_process_management.project_change_visa/delete', params })
+  return request.post({
+    url: "/project_process_management.project_change_visa/delete",
+    params,
+  });
 }
 
 // 项目变更签证详情
 export function apiProjectChangeVisaDetail(params: any) {
-    return request.get({ url: '/project_process_management.project_change_visa/detail', params })
-}
+  return request.get({
+    url: "/project_process_management.project_change_visa/detail",
+    params,
+  });
+}
+
+//apiProjectChangeVisaSearch
+export function apiProjectChangeVisaSearch(params: any) {
+  return request.get({
+    url: "/project_process_management.project_change_visa/datas",
+    params,
+  });
+}

src/api/project_commission.ts

@@ -1,26 +1,30 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 项目提成列表
 export function apiProjectCommissionLists(params: any) {
-    return request.get({ url: '/project_commission/lists', params })
+  return request.get({ url: "/project_commission/lists", params });
 }
 
 // 添加项目提成
 export function apiProjectCommissionAdd(params: any) {
-    return request.post({ url: '/project_commission/add', params })
+  return request.post({ url: "/project_commission/add", params });
 }
 
 // 编辑项目提成
 export function apiProjectCommissionEdit(params: any) {
-    return request.post({ url: '/project_commission/edit', params })
+  return request.post({ url: "/project_commission/edit", params });
 }
 
 // 删除项目提成
 export function apiProjectCommissionDelete(params: any) {
-    return request.post({ url: '/project_commission/delete', params })
+  return request.post({ url: "/project_commission/delete", params });
 }
 
 // 项目提成详情
 export function apiProjectCommissionDetail(params: any) {
-    return request.get({ url: '/project_commission/detail', params })
-}
+  return request.get({ url: "/project_commission/detail", params });
+}
+
+export function apiProjectCommissionSearch(params: any) {
+  return request.get({ url: "/project_commission/datas", params });
+}

src/api/project_progress_payment.ts

@@ -1,26 +1,49 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 项目进度款列表
 export function apiProjectProgressPaymentLists(params: any) {
-    return request.get({ url: '/project_process_management.project_progress_payment/lists', params })
+  return request.get({
+    url: "/project_process_management.project_progress_payment/lists",
+    params,
+  });
 }
 
 // 添加项目进度款
 export function apiProjectProgressPaymentAdd(params: any) {
-    return request.post({ url: '/project_process_management.project_progress_payment/add', params })
+  return request.post({
+    url: "/project_process_management.project_progress_payment/add",
+    params,
+  });
 }
 
 // 编辑项目进度款
 export function apiProjectProgressPaymentEdit(params: any) {
-    return request.post({ url: '/project_process_management.project_progress_payment/edit', params })
+  return request.post({
+    url: "/project_process_management.project_progress_payment/edit",
+    params,
+  });
 }
 
 // 删除项目进度款
 export function apiProjectProgressPaymentDelete(params: any) {
-    return request.post({ url: '/project_process_management.project_progress_payment/delete', params })
+  return request.post({
+    url: "/project_process_management.project_progress_payment/delete",
+    params,
+  });
 }
 
 // 项目进度款详情
 export function apiProjectProgressPaymentDetail(params: any) {
-    return request.get({ url: '/project_process_management.project_progress_payment/detail', params })
-}
+  return request.get({
+    url: "/project_process_management.project_progress_payment/detail",
+    params,
+  });
+}
+
+//apiProjectProgressPaymentSearch
+export function apiProjectProgressPaymentSearch(params: any) {
+  return request.get({
+    url: "/project_process_management.project_progress_payment/datas",
+    params,
+  });
+}

src/api/supervision_material_entry.ts

@@ -1,36 +1,63 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 工程监理--材料进场列表
 export function apiSupervisionMaterialEntryLists(params: any) {
-    return request.get({ url: '/supervision_work.supervision_material_entry/lists', params })
+  return request.get({
+    url: "/supervision_work.supervision_material_entry/lists",
+    params,
+  });
 }
 
 // 添加工程监理--材料进场
 export function apiSupervisionMaterialEntryAdd(params: any) {
-    return request.post({ url: '/supervision_work.supervision_material_entry/add', params })
+  return request.post({
+    url: "/supervision_work.supervision_material_entry/add",
+    params,
+  });
 }
 
 // 编辑工程监理--材料进场
 export function apiSupervisionMaterialEntryEdit(params: any) {
-    return request.post({ url: '/supervision_work.supervision_material_entry/edit', params })
+  return request.post({
+    url: "/supervision_work.supervision_material_entry/edit",
+    params,
+  });
 }
 
 // 删除工程监理--材料进场
 export function apiSupervisionMaterialEntryDelete(params: any) {
-    return request.post({ url: '/supervision_work.supervision_material_entry/delete', params })
+  return request.post({
+    url: "/supervision_work.supervision_material_entry/delete",
+    params,
+  });
 }
 
 // 工程监理--材料进场详情
 export function apiSupervisionMaterialEntryDetail(params: any) {
-    return request.get({ url: '/supervision_work.supervision_material_entry/detail', params })
+  return request.get({
+    url: "/supervision_work.supervision_material_entry/detail",
+    params,
+  });
 }
 
 // 工程监理--材料进场详情
 export function apisupervision_material_entry_detail(params: any) {
-    return request.get({ url: '/supervision_work.supervision_material_entry_detail/lists', params })
+  return request.get({
+    url: "/supervision_work.supervision_material_entry_detail/lists",
+    params,
+  });
 }
 
 export function apisupervision_material_entry_detail_delete(params: any) {
-    return request.post({ url: '/supervision_work.supervision_material_entry_detail/delete', params })
+  return request.post({
+    url: "/supervision_work.supervision_material_entry_detail/delete",
+    params,
+  });
 }
 
+export function apiSupervisionMaterialEntrySearch(params: any) {
+  return request.post({
+    url: "/supervision_work.supervision_material_entry/datas",
+    params,
+  });
+}

src/api/supervision_participating_units.ts

@@ -1,32 +1,57 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 工程监理--参建单位列表
 export function apiSupervisionParticipatingUnitsLists(params: any) {
-    return request.get({ url: '/supervision_project.supervision_participating_units/lists', params })
+  return request.get({
+    url: "/supervision_project.supervision_participating_units/lists",
+    params,
+  });
 }
 
 // 添加工程监理--参建单位
 export function apiSupervisionParticipatingUnitsAdd(params: any) {
-    return request.post({ url: '/supervision_project.supervision_participating_units/add', params })
+  return request.post({
+    url: "/supervision_project.supervision_participating_units/add",
+    params,
+  });
 }
 
 // 编辑工程监理--参建单位
 export function apiSupervisionParticipatingUnitsEdit(params: any) {
-    return request.post({ url: '/supervision_project.supervision_participating_units/edit', params })
+  return request.post({
+    url: "/supervision_project.supervision_participating_units/edit",
+    params,
+  });
 }
 
 // 删除工程监理--参建单位
 export function apiSupervisionParticipatingUnitsDelete(params: any) {
-    return request.post({ url: '/supervision_project.supervision_participating_units/delete', params })
+  return request.post({
+    url: "/supervision_project.supervision_participating_units/delete",
+    params,
+  });
 }
 
 // 工程监理--参建单位详情
 export function apiSupervisionParticipatingUnitsDetail(params: any) {
-    return request.get({ url: '/supervision_project.supervision_participating_units/detail', params })
+  return request.get({
+    url: "/supervision_project.supervision_participating_units/detail",
+    params,
+  });
 }
 
 // 工程监理--参建单位列表
 export function supervision_participating_units_contactsapi(params: any) {
-    return request.get({ url: '/supervision_project.supervision_participating_units_contacts/lists', params })
+  return request.get({
+    url: "/supervision_project.supervision_participating_units_contacts/lists",
+    params,
+  });
 }
 
+//apiSupervisionParticipatingUnitsSearch
+export function apiSupervisionParticipatingUnitsSearch(params: any) {
+  return request.get({
+    url: "/supervision_project.supervision_participating_units/datas",
+    params,
+  });
+}

src/api/supervision_project.ts

@@ -1,26 +1,48 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 工程监理--监理项目信息列表
 export function apiSupervisionProjectLists(params: any) {
-    return request.get({ url: '/supervision_project.supervision_project/lists', params })
+  return request.get({
+    url: "/supervision_project.supervision_project/lists",
+    params,
+  });
 }
 
 // 添加工程监理--监理项目信息
 export function apiSupervisionProjectAdd(params: any) {
-    return request.post({ url: '/supervision_project.supervision_project/add', params })
+  return request.post({
+    url: "/supervision_project.supervision_project/add",
+    params,
+  });
 }
 
 // 编辑工程监理--监理项目信息
 export function apiSupervisionProjectEdit(params: any) {
-    return request.post({ url: '/supervision_project.supervision_project/edit', params })
+  return request.post({
+    url: "/supervision_project.supervision_project/edit",
+    params,
+  });
 }
 
 // 删除工程监理--监理项目信息
 export function apiSupervisionProjectDelete(params: any) {
-    return request.post({ url: '/supervision_project.supervision_project/delete', params })
+  return request.post({
+    url: "/supervision_project.supervision_project/delete",
+    params,
+  });
 }
 
 // 工程监理--监理项目信息详情
 export function apiSupervisionProjectDetail(params: any) {
-    return request.get({ url: '/supervision_project.supervision_project/detail', params })
-}
+  return request.get({
+    url: "/supervision_project.supervision_project/detail",
+    params,
+  });
+}
+
+export function apiSupervisionProjectSearch(params: any) {
+  return request.get({
+    url: "/supervision_project.supervision_project/datas",
+    params,
+  });
+}

src/views/apply_with_seal/edit.vue

@@ -80,8 +80,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="项目负责人" prop="principal">
-                            <el-input v-model="formData.principal" clearable placeholder="请输入项目负责人" readonly />
+                        <el-form-item label="项目负责人" prop="project_director">
+                            <el-input v-model="formData.project_director" clearable placeholder="请输入项目负责人" readonly />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -231,7 +231,7 @@ const formData = reactive({
     stampman: '',
     project_id: '',
     project_name: '',
-    principal: '',
+    project_director: '',
     content: '',
     loan: '',
     borrow: '',
@@ -250,7 +250,7 @@ const formData = reactive({
 const customEvent = (e: any) => {
     formData.project_id = e.id
     formData.project_name = e.project_name
-    formData.principal = e.principal
+    formData.principal = e.contract.project_director
     showDialog.value = false
 }
 

src/views/apply_with_seal/index.vue

@@ -58,7 +58,7 @@
                     <el-table-column label="盖章次数" prop="frequency" show-overflow-tooltip />
                     <el-table-column label="限制次数" prop="limit" show-overflow-tooltip />
                     <el-table-column label="盖章人" prop="stampman" show-overflow-tooltip />
-                    <el-table-column label="项目负责人" prop="projectInfo.principal" show-overflow-tooltip />
+                    <el-table-column label="项目负责人" prop="project_director" show-overflow-tooltip />
                     <el-table-column label="盖章内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="印章是否外借" prop="loan" show-overflow-tooltip>
                         <template #default="{ row }">

src/views/project_change_visa_content/index.vue

@@ -2,6 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="变更单号" prop="project_change_visa_id">
+                    <selectRemote :formData="queryParams" model="project_change_visa_id"
+                        :api="apiProjectChangeVisaSearch" />
+                </el-form-item>
                 <el-form-item label="所在目录" prop="directory">
                     <el-input class="w-[280px]" v-model="queryParams.directory" clearable placeholder="请输入所在目录" />
                 </el-form-item>
@@ -47,6 +51,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
+                    <el-table-column label="变更单号" prop="project_change_visa_num" show-overflow-tooltip />
                     <el-table-column label="所在目录" prop="directory" show-overflow-tooltip />
                     <el-table-column label="单位名称" prop="unit_name" show-overflow-tooltip />
                     <el-table-column label="所属专业" prop="major" show-overflow-tooltip />
@@ -83,7 +88,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiProjectChangeVisaContentLists, apiProjectChangeVisaContentDelete } from '@/api/project_change_visa_content'
-import { timeFormat } from '@/utils/util'
+import { apiProjectChangeVisaSearch } from '@/api/project_change_visa'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
@@ -94,7 +99,7 @@ const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    project_change_visa_dataid: '',
+    project_change_visa_id: '',
     directory: '',
     unit_name: '',
     time: '',

src/views/project_commission_detail/index.vue

@@ -2,6 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="提成单号" prop="project_commission_id">
+                    <selectRemote :formData="queryParams" model="project_commission_id"
+                        :api="apiProjectCommissionSearch" />
+                </el-form-item>
                 <el-form-item label="工程师" prop="engineer">
                     <el-input class="w-[280px]" v-model="queryParams.engineer" clearable placeholder="请输入工程师" />
                 </el-form-item>
@@ -25,6 +29,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
+                    <el-table-column label="提成单号" prop="project_commission_num" show-overflow-tooltip />
                     <el-table-column label="工程师" prop="engineer" show-overflow-tooltip />
                     <el-table-column label="任务名称" prop="task_name" show-overflow-tooltip />
                     <el-table-column label="任务类型" prop="task_type">
@@ -69,7 +74,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiProjectCommissionDetailLists, apiProjectCommissionDetailDelete, apiProjectCommissionDetailDetail } from '@/api/project_commission_detail'
-import { timeFormat } from '@/utils/util'
+import { apiProjectCommissionSearch } from '@/api/project_commission'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
@@ -80,6 +85,7 @@ const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
+    project_commission_id: '',
     engineer: '',
     task_name: '',
 })
@@ -126,4 +132,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/project_progress_payment_detail/index.vue

@@ -1,8 +1,11 @@
 <template>
     <div>
-        <!-- <el-card class="!border-none mb-4" shadow="never">
+        <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-
+                <el-form-item label="项目进度款单据编号" prop="project_progress_payment_id">
+                    <selectRemote :formData="queryParams" model="project_progress_payment_id"
+                        :api="apiProjectProgressPaymentSearch" />
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -10,7 +13,7 @@
                         :page-size="pager.size" />
                 </el-form-item>
             </el-form>
-        </el-card> -->
+        </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <!-- <el-button v-perms="['project_process_management.project_progress_payment_detail/add']" type="primary"
                 @click="handleAdd">
@@ -26,6 +29,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
+                    <el-table-column label="项目进度款单据编号" prop="project_progress_payment_num" show-overflow-tooltip />
                     <el-table-column label="所在目录" prop="directory" show-overflow-tooltip />
                     <el-table-column label="单位工程名称" prop="unit_project_name" show-overflow-tooltip />
                     <el-table-column label="时间" prop="time" show-overflow-tooltip />
@@ -73,7 +77,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiProjectProgressPaymentDetailLists, apiProjectProgressPaymentDetailDelete } from '@/api/project_progress_payment_detail'
-import { timeFormat } from '@/utils/util'
+import { apiProjectProgressPaymentSearch } from '@/api/project_progress_payment'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
@@ -84,7 +88,7 @@ const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-
+    project_progress_payment_id:''
 })
 
 // 选中数据

src/views/supervision_accept/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="accept_code">
                     <el-input class="w-[280px]" v-model="queryParams.accept_code" clearable placeholder="请输入验收编号" />
                 </el-form-item>
@@ -109,6 +112,10 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete, apiSupervisionAcceptDetail, apisupervision_accept } from '@/api/supervision_accept'
+<<<<<<< HEAD
+=======
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'

src/views/supervision_check_item/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="node_name">
                     <el-input class="w-[280px]" v-model="queryParams.node_name" clearable placeholder="请输入节点名称" />
                 </el-form-item>
@@ -79,7 +82,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionCheckItemLists, apiSupervisionCheckItemDelete, apiSupervisionCheckItemDetail } from '@/api/supervision_check_item'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 

src/views/supervision_commencement_report/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="doc_name">
                     <el-input class="w-[280px]" v-model="queryParams.doc_name" clearable placeholder="请输入文档名称" />
                 </el-form-item>
@@ -62,7 +64,12 @@
 <script lang="ts" setup name="supervisionCommencementReportLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+<<<<<<< HEAD
 import { apiSupervisionCommencementReportLists, apiSupervisionCommencementReportDelete, apiSupervisionCommencementReportDetail } from '@/api/supervision_commencement_report'
+=======
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+import { apiSupervisionCommencementReportLists, apiSupervisionCommencementReportDelete } from '@/api/supervision_commencement_report'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'

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'
 

src/views/supervision_construction_management_personnel/index.vue

@@ -2,6 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属单位" prop="company_id">
+                    <selectRemote :formData="queryParams" model="company_id"
+                        :api="apiSupervisionParticipatingUnitsSearch" />
+                </el-form-item>
                 <el-form-item label="姓名" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入姓名" />
                 </el-form-item>
@@ -88,6 +92,7 @@
 <script lang="ts" setup name="supervisionConstructionManagementPersonnelLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionParticipatingUnitsSearch } from '@/api/supervision_participating_units'
 import { apiSupervisionConstructionManagementPersonnelLists, apiSupervisionConstructionManagementPersonnelDelete, apiSupervisionConstructionManagementPersonnelDetail } from '@/api/supervision_construction_management_personnel'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

src/views/supervision_construction_planning/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="doc_name">
                     <el-input class="w-[280px]" v-model="queryParams.doc_name" clearable placeholder="请输入文档名称" />
                 </el-form-item>
@@ -61,6 +64,7 @@
 <script lang="ts" setup name="supervisionConstructionPlanningLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionConstructionPlanningLists, apiSupervisionConstructionPlanningDelete, apiSupervisionConstructionPlanningDetail } from '@/api/supervision_construction_planning'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

src/views/supervision_contract_disclosure/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="doc_name">
                     <el-input class="w-[280px]" v-model="queryParams.doc_name" clearable placeholder="请输入文档名称" />
                 </el-form-item>
@@ -62,6 +65,7 @@
 <script lang="ts" setup name="supervisionContractDisclosureLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionContractDisclosureLists, apiSupervisionContractDisclosureDelete, apiSupervisionContractDisclosureDetail } from '@/api/supervision_contract_disclosure'
 import feedback from '@/utils/feedback'
 import detailConfig from './detail'

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'
 

src/views/supervision_design_disclosure/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="doc_name">
                     <el-input class="w-[280px]" v-model="queryParams.doc_name" clearable placeholder="请输入文档名称" />
                 </el-form-item>
@@ -61,8 +64,12 @@
 <script lang="ts" setup name="supervisionDesignDisclosureLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionDesignDisclosureLists, apiSupervisionDesignDisclosureDelete, apiSupervisionDesignDisclosureDetail } from '@/api/supervision_design_disclosure'
+<<<<<<< HEAD
 import detailConfig from './detail'
+=======
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 

src/views/supervision_device_entry/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="code">
                     <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编号" />
                 </el-form-item>
@@ -70,7 +73,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionDeviceEntryLists, apiSupervisionDeviceEntryDelete, apiSupervisionDeviceEntryDetail } from '@/api/supervision_device_entry'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'

src/views/supervision_diary/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="user">
                     <el-input class="w-[280px]" v-model="queryParams.user" clearable placeholder="请输入监理人员" />
                 </el-form-item>
@@ -65,7 +68,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionDiaryLists, apiSupervisionDiaryDelete, apiSupervisionDiaryDetail } from '@/api/supervision_diary'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 

src/views/supervision_entity_parallel_testing/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="theme">
                     <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入检验主题" />
                 </el-form-item>
@@ -73,7 +76,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionEntityParallelTestingLists, apiSupervisionEntityParallelTestingDelete } from '@/api/supervision_entity_parallel_testing'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 

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'
 

src/views/supervision_first_meeting/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="doc_name">
                     <el-input class="w-[280px]" v-model="queryParams.doc_name" clearable placeholder="请输入文档名称" />
                 </el-form-item>
@@ -61,6 +64,7 @@
 <script lang="ts" setup name="supervisionFirstMeetingLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionFirstMeetingLists, apiSupervisionFirstMeetingDelete, apiSupervisionFirstMeetingDetail } from '@/api/supervision_first_meeting'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

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'
 

src/views/supervision_inspection/index.vue

@@ -2,7 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="编号" prop="inspection_code">
+                <el-form-item label="所属项目" prop="project_id">
+                    <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
+                </el-form-item>
+                <el-form-item label="巡视编号" prop="inspection_code">
                     <el-input class="w-[280px]" v-model="queryParams.inspection_code" clearable placeholder="请输入编号" />
                 </el-form-item>
                 <el-form-item label="巡视类型" prop="inspection_type">
@@ -78,6 +81,10 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionInspectionLists, apiSupervisionInspectionDelete, apiSupervisionInspectionDetail } from '@/api/supervision_inspection'
+<<<<<<< HEAD
+=======
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'

src/views/supervision_large_equipment/index.vue

@@ -2,7 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-
+                <el-form-item label="所属单位" prop="company_id">
+                    <selectRemote :formData="queryParams" model="company_id"
+                        :api="apiSupervisionParticipatingUnitsSearch" />
+                </el-form-item>
                 <el-form-item label="设备名称" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入设备名称" />
                 </el-form-item>
@@ -81,8 +84,8 @@
 <script lang="ts" setup name="supervisionLargeEquipmentLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionParticipatingUnitsSearch } from '@/api/supervision_participating_units'
 import { apiSupervisionLargeEquipmentLists, apiSupervisionLargeEquipmentDelete, apiSupervisionLargeEquipmentDetail } from '@/api/supervision_large_equipment'
-import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'

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'
 

src/views/supervision_material_entry/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="theme">
                     <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入进场主题" />
                 </el-form-item>
@@ -31,12 +34,6 @@
                     <el-table-column label="项目" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="采购单位" prop="company_name" show-overflow-tooltip />
                     <el-table-column label="进场主题" prop="theme" show-overflow-tooltip />
-                    <!-- <el-table-column label="材料名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="型号" prop="model" show-overflow-tooltip />
-                    <el-table-column label="数量" prop="entry_number" show-overflow-tooltip />
-                    <el-table-column label="合同约定品牌" prop="contract_brand_text" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="取样数量" prop="theme" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="取样结果" prop="theme" show-overflow-tooltip /> -->
                     <el-table-column label="编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="进场时间" prop="enter_time" show-overflow-tooltip />
                     <el-table-column label="进场结果" prop="enter_result_text" show-overflow-tooltip />
@@ -72,7 +69,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionMaterialEntryLists, apiSupervisionMaterialEntryDelete, apiSupervisionMaterialEntryDetail } from '@/api/supervision_material_entry'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'

src/views/supervision_material_equipment_info/index.vue

@@ -3,6 +3,12 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" label-width="120px">
                 <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="name">
                             <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入材料/设备名称" />
@@ -99,7 +105,12 @@
 <script lang="ts" setup name="supervisionMaterialEquipmentInfoLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+<<<<<<< HEAD
 import { apiSupervisionMaterialEquipmentInfoLists, apiSupervisionMaterialEquipmentInfoDelete, apiSupervisionMaterialEquipmentInfoDetail } from '@/api/supervision_material_equipment_info'
+=======
+import { apiSupervisionMaterialEquipmentInfoLists, apiSupervisionMaterialEquipmentInfoDelete } from '@/api/supervision_material_equipment_info'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'
@@ -114,6 +125,7 @@ const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
+    project_id: '',
     name: '',
     brand: '',
     model: '',

src/views/supervision_material_parallel_testing/index.vue

@@ -2,8 +2,15 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="编号" prop="code">
-                    <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编号" />
+                <el-form-item label="所属项目" prop="project_id">
+                    <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
+                </el-form-item>
+                <el-form-item label="来源单据">
+                    <select-remote :formData="queryParams" model="material_entry_id"
+                        :api="apiSupervisionMaterialEntrySearch" />
+                </el-form-item>
+                <el-form-item label="检验编号" prop="code">
+                    <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入检验编号" />
                 </el-form-item>
                 <el-form-item label="送检人" prop="check_user">
                     <el-input class="w-[280px]" v-model="queryParams.inspector" clearable placeholder="请输入操作人" />
@@ -30,13 +37,13 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="来源单据" prop="theme" show-overflow-tooltip />
-                    <el-table-column label="编号" prop="code" show-overflow-tooltip />
+                    <el-table-column label="来源单据" prop="material_entry_code" show-overflow-tooltip />
+                    <el-table-column label="进场主题" prop="theme" show-overflow-tooltip />
+                    <el-table-column label="检验编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="送检人" prop="inspector" show-overflow-tooltip />
                     <el-table-column label="送检日期" prop="inspection_date" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
-
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_material_parallel_testing/edit']"
                                 type="primary" link @click="handleEdit(row)">
@@ -69,6 +76,8 @@
 <script lang="ts" setup name="supervisionMaterialParallelTestingLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+import { apiSupervisionMaterialEntrySearch } from '@/api/supervision_material_entry'
 import { apiSupervisionMaterialParallelTestingLists, apiSupervisionMaterialParallelTestingDelete, apiSupervisionMaterialParallelTestingDetail } from '@/api/supervision_material_parallel_testing'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -80,6 +89,8 @@ const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
+    project_id: '',
+    material_entry_id: '',
     code: "",
     inspector: "",
 })

src/views/supervision_meeting_minutes/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="theme">
                     <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入会议主题" />
                 </el-form-item>
@@ -45,12 +48,12 @@
                     <el-table-column label="会议内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['supervision_work.supervision_meeting_minutes/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                            <el-button v-perms="['supervision_work.supervision_meeting_minutes/edit']" type="primary"
+                                link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['supervision_work.supervision_meeting_minutes/delete']" type="danger" link
-                                @click="handleDelete(row.id)">
+                            <el-button v-perms="['supervision_work.supervision_meeting_minutes/delete']" type="danger"
+                                link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
@@ -69,7 +72,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionMeetingMinutesLists, apiSupervisionMeetingMinutesDelete } from '@/api/supervision_meeting_minutes'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
@@ -128,4 +131,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_monitoring_equipment/index.vue

@@ -3,6 +3,9 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-row>
+                    <el-form-item label="所属项目" prop="project_id">
+                        <selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
+                    </el-form-item>
                     <el-col :span="6">
                         <el-form-item label="监控设备名称" prop="device_name">
                             <el-input class="w-[280px]" v-model="queryParams.device_name" clearable
@@ -57,6 +60,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
+                    <el-table-column label="所属项目" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="监控设备名称" prop="device_name" show-overflow-tooltip />
                     <el-table-column label="设备类型" prop="device_type_text" show-overflow-tooltip />
                     <el-table-column label="设备序列号" prop="device_sn" show-overflow-tooltip />
@@ -93,6 +97,7 @@
 <script lang="ts" setup name="supervisionMonitoringEquipmentLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionMonitoringEquipmentLists, apiSupervisionMonitoringEquipmentDelete, apiSupervisionMonitoringEquipmentDetail } from '@/api/supervision_monitoring_equipment'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

src/views/supervision_notice/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="code">
                     <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入项目通知编号" />
                 </el-form-item>
@@ -66,7 +69,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionNoticeLists, apiSupervisionNoticeDelete } from '@/api/supervision_notice'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import replyForm from './replyForm.vue'

src/views/supervision_participating_units/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="unit_type">
                     <el-select class="w-[280px]" v-model="queryParams.unit_type" clearable placeholder="请选择行业">
                         <el-option v-for="(item, index) in dictData.unit_type" :key="index" :label="item.name"
@@ -36,7 +39,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <!-- <el-table-column label="项目id" prop="project_id" show-overflow-tooltip /> -->
+                    <el-table-column label="所属项目" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="单位名称" prop="unit_name" show-overflow-tooltip />
                     <el-table-column label="单位类别" prop="unit_type_text" show-overflow-tooltip />
                     <el-table-column label="资质等级" prop="qualification_grade" show-overflow-tooltip />
@@ -73,6 +76,7 @@
 <script lang="ts" setup name="supervisionParticipatingUnitsLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionParticipatingUnitsLists, apiSupervisionParticipatingUnitsDelete, apiSupervisionParticipatingUnitsDetail } from '@/api/supervision_participating_units'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

src/views/supervision_participating_units_contacts/index.vue

@@ -2,6 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属单位" prop="unit_id">
+                    <selectRemote :formData="queryParams" model="unit_id"
+                        :api="apiSupervisionParticipatingUnitsSearch" />
+                </el-form-item>
                 <el-form-item label="姓名" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入姓名" />
                 </el-form-item>
@@ -64,8 +68,8 @@
 <script lang="ts" setup name="supervisionParticipatingUnitsContactsLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionParticipatingUnitsSearch } from '@/api/supervision_participating_units'
 import { apiSupervisionParticipatingUnitsContactsLists, apiSupervisionParticipatingUnitsContactsDelete } from '@/api/supervision_participating_units_contacts'
-import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 

src/views/supervision_participating_units_qualifications/index.vue

@@ -2,6 +2,13 @@
     <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="company_id">
+                    <selectRemote :formData="queryParams" model="company_id"
+                        :api="apiSupervisionParticipatingUnitsSearch" />
+                </el-form-item>
                 <el-form-item label="资质名称" prop="qualification_name">
                     <el-input class="w-[280px]" v-model="queryParams.qualification_name" clearable
                         placeholder="请输入资质名称" />
@@ -74,8 +81,9 @@
 <script lang="ts" setup name="supervisionParticipatingUnitsQualificationsLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+import { apiSupervisionParticipatingUnitsSearch } from '@/api/supervision_participating_units'
 import { apiSupervisionParticipatingUnitsQualificationsLists, apiSupervisionParticipatingUnitsQualificationsDelete, apiSupervisionParticipatingUnitsQualificationsDetail } from '@/api/supervision_participating_units_qualifications'
-import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'

src/views/supervision_planning/index.vue

@@ -2,9 +2,12 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-
                 <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-form-item label="专项审批类型" prop="approval_type">
                             <el-select class="w-[280px]" v-model="queryParams.approval_type" clearable
                                 placeholder="请选择专项审批类型">
@@ -92,6 +95,7 @@
 <script lang="ts" setup name="supervisionPlanningLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionPlanningLists, apiSupervisionPlanningDelete, apiSupervisionPlanningDetail } from '@/api/supervision_planning'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

src/views/supervision_rules/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="doc_name">
                     <el-input class="w-[280px]" v-model="queryParams.doc_name" clearable placeholder="请输入文档名称" />
                 </el-form-item>
@@ -60,8 +63,13 @@
 <script lang="ts" setup name="supervisionRulesLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+<<<<<<< HEAD
 import { apiSupervisionRulesLists, apiSupervisionRulesDelete, apiSupervisionRulesDetail } from '@/api/supervision_rules'
 import { timeFormat } from '@/utils/util'
+=======
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+import { apiSupervisionRulesLists, apiSupervisionRulesDelete } from '@/api/supervision_rules'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'

src/views/supervision_rules_disclosure/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="doc_name">
                     <el-input class="w-[280px]" v-model="queryParams.doc_name" clearable placeholder="请输入文档名称" />
                 </el-form-item>
@@ -62,8 +64,13 @@
 <script lang="ts" setup name="supervisionRulesDisclosureLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+<<<<<<< HEAD
 import { apiSupervisionRulesDisclosureLists, apiSupervisionRulesDisclosureDelete, apiSupervisionRulesDisclosureDetail } from '@/api/supervision_rules_disclosure'
 import { timeFormat } from '@/utils/util'
+=======
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+import { apiSupervisionRulesDisclosureLists, apiSupervisionRulesDisclosureDelete } from '@/api/supervision_rules_disclosure'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'

src/views/supervision_safety_management_personnel/index.vue

@@ -2,6 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属单位" prop="company_id">
+                    <selectRemote :formData="queryParams" model="company_id"
+                        :api="apiSupervisionParticipatingUnitsSearch" />
+                </el-form-item>
                 <el-form-item label="姓名" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入姓名" />
                 </el-form-item>
@@ -87,6 +91,7 @@
 <script lang="ts" setup name="supervisionSafetyManagementPersonnelLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionParticipatingUnitsSearch } from '@/api/supervision_participating_units'
 import { apiSupervisionSafetyManagementPersonnelLists, apiSupervisionSafetyManagementPersonnelDelete, apiSupervisionSafetyManagementPersonnelDetail } from '@/api/supervision_safety_management_personnel'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

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'
 

src/views/supervision_side_station/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="side_station_code">
                     <el-input class="w-[280px]" v-model="queryParams.side_station_code" clearable
                         placeholder="请输入旁站编号" />
@@ -77,6 +80,10 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionSideStationLists, apiSupervisionSideStationDelete, apiSupervisionSideStationDetail } from '@/api/supervision_side_station'
+<<<<<<< HEAD
+=======
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'

src/views/supervision_special_operation_personnel/index.vue

@@ -2,6 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属单位" prop="company_id">
+                    <selectRemote :formData="queryParams" model="company_id"
+                        :api="apiSupervisionParticipatingUnitsSearch" />
+                </el-form-item>
                 <el-form-item label="项目名称" prop="project_id">
                     <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目名称" />
                 </el-form-item>
@@ -76,6 +80,7 @@
 <script lang="ts" setup name="supervisionSpecialOperationPersonnelLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionParticipatingUnitsSearch } from '@/api/supervision_participating_units'
 import { apiSupervisionSpecialOperationPersonnelLists, apiSupervisionSpecialOperationPersonnelDelete, apiSupervisionSpecialOperationPersonnelDetail } from '@/api/supervision_special_operation_personnel'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

src/views/supervision_test_blocks_specimens/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="test_type">
                             <el-input v-model="queryParams.test_type" clearable placeholder="请输入试验类型" />
@@ -96,8 +102,13 @@
 <script lang="ts" setup name="supervisionTestBlocksSpecimensLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
+<<<<<<< HEAD
 import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete, apiSupervisionTestBlocksSpecimensDetail } from '@/api/supervision_test_blocks_specimens'
 import { timeFormat } from '@/utils/util'
+=======
+import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete } from '@/api/supervision_test_blocks_specimens'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'

src/views/supervision_witness_sampling/index.vue

@@ -4,14 +4,19 @@
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-row>
                     <el-col :span="6">
-                        <el-form-item label="来源单据">
-                            <!-- <el-input class="w-[280px]" v-model="queryParams.material_entry_id" clearable
-                                placeholder="请输入来源单据" /> -->
-                            <select-remote :formData="queryParams" model="material_entry_id"></select-remote>
+                        <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="code">
+                        <el-form-item label="来源单据">
+                            <select-remote :formData="queryParams" model="material_entry_id"
+                                :api="apiSupervisionMaterialEntrySearch" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="取样编号" prop="code">
                             <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编号" />
                         </el-form-item>
                     </el-col>
@@ -50,10 +55,9 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="来源单据" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="来源编码" prop="material_entry_code" show-overflow-tooltip />
                     <el-table-column label="进场主题" prop="theme" show-overflow-tooltip />
-                    <el-table-column label="来源编码" prop="code" show-overflow-tooltip />
-                    <el-table-column label="编号" prop="material_entry_code" show-overflow-tooltip />
+                    <el-table-column label="取样编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="取样日期" prop="sampling_date" show-overflow-tooltip />
                     <el-table-column label="见证人" prop="witness" show-overflow-tooltip />
                     <el-table-column label="取样人" prop="sampler" show-overflow-tooltip />
@@ -93,6 +97,11 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionWitnessSamplingLists, apiSupervisionWitnessSamplingDelete, apiSupervisionWitnessSamplingDetail } from '@/api/supervision_witness_sampling'
+<<<<<<< HEAD
+=======
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+import { apiSupervisionMaterialEntrySearch } from '@/api/supervision_material_entry'
+>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import { useRouter } from 'vue-router'

src/views/supervision_work_contact/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="code">
                     <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入联系编号" />
                 </el-form-item>
@@ -66,7 +69,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionWorkContactLists, apiSupervisionWorkContactDelete, apiSupervisionWorkContactDetail } from '@/api/supervision_work_contact'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
@@ -126,4 +129,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/task_allocation/edit.vue

@@ -21,8 +21,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="项目负责人" prop="head">
-                            <el-input v-model="formData.head" clearable placeholder="请输入项目负责人" />
+                        <el-form-item label="项目负责人" prop="project_director">
+                            <el-input v-model="formData.project_director" clearable placeholder="项目负责人" readonly />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -210,10 +210,6 @@ import { apiTaskAllocationAdd, apiTaskAllocationEdit, } from '@/api/task_allocat
 import { cost_project, task_type } from "@/components/dialogTable/dialogTableConfig"
 import type { PropType } from 'vue'
 import { timeFormat } from '@/utils/util'
-import useUserStore from "@/stores/modules/user";
-const userStore = useUserStore().userInfo;
-
-
 
 defineProps({
     dictData: {
@@ -231,15 +227,6 @@ const showDialog1 = ref(false)
 const showDialog3 = ref(false)
 const personnel = ref<any>()
 
-const handleAvatarSuccess_four = (response: any) => {
-    formData.annex ||= []
-    // @ts-ignore
-    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
-};
-
-// 删除上传的文件
-const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
-
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑任务分配' : '新增任务分配'
@@ -253,7 +240,7 @@ const formData = reactive({
     project_id: '',
     project_name: "",
     project_num: '',
-    head: userStore.account,
+    project_director: '',
     apptime: timeFormat('', 'yyyy-mm-dd'),
     annex: [],
     task_detail: [],
@@ -302,6 +289,7 @@ const customEvent = (e) => {
     formData.project_id = e.id
     formData.project_name = e.project_name
     formData.project_num = e.project_num
+    formData.project_director = e.contract.project_director
     showDialog.value = false
 }
 

src/views/task_allocation/index.vue

@@ -31,47 +31,10 @@
             </el-button>
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <!-- <el-table-column type="expand">
-                        <template #default="props">
-                            <div style="width: 95%;margin: 0 auto;">
-                                <el-table :data="props.row.children">
-                                    <el-table-column label="任务名称" prop="taskTypeInfo.name" show-overflow-tooltip />
-                                    <el-table-column label="工序" prop="process" show-overflow-tooltip />
-                                    <el-table-column label="任务类型" prop="task_type_id">
-                                        <template #default="{ row }">
-                                            <dict-value :options="dictData.task_type" :value="row.task_type_id" />
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column label="专业类型" prop="professional_type">
-                                        <template #default="{ row }">
-                                            <dict-value :options="dictData.major_type" :value="row.professional_type" />
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column label="工程师" prop="engineer" show-overflow-tooltip />
-                                    <el-table-column label="任务级次" prop="level" show-overflow-tooltip />
-                                    <el-table-column label="一级审核人" prop="first_reviewer" show-overflow-tooltip />
-                                    <el-table-column label="二级审核人" prop="secondary_reviewer" show-overflow-tooltip />
-                                    <el-table-column label="三级审核人" prop="third_level_reviewer" show-overflow-tooltip />
-                                    <el-table-column label="中标金额（元）" prop="bid_winning_amount" show-overflow-tooltip />
-                                    <el-table-column label="送审造价（元）" prop="cost" show-overflow-tooltip />
-                                    <el-table-column label="第三方核定金额（元）" prop="approved_amount" show-overflow-tooltip />
-                                    <el-table-column label="施工单位" prop="construction_unit" show-overflow-tooltip />
-                                    <el-table-column label="施工单位id" prop="construction_unit_id" show-overflow-tooltip />
-                                    <el-table-column label="联系人" prop="contact" show-overflow-tooltip />
-                                    <el-table-column label="联系电话" prop="contact_phone" show-overflow-tooltip />
-                                    <el-table-column label="天数" prop="days" show-overflow-tooltip />
-                                    <el-table-column label="开始日期" prop="start_date" show-overflow-tooltip />
-                                    <el-table-column label="结束日期" prop="end_date" show-overflow-tooltip />
-                                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                                </el-table>
-                            </div>
-                        </template>
-                    </el-table-column> -->
                     <el-table-column label="单据编号" prop="num" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="projectInfo.project_name" show-overflow-tooltip />
                     <el-table-column label="项目编号" prop="projectInfo.project_num" show-overflow-tooltip />
-                    <el-table-column label="项目负责人" prop="projectInfo.principal" show-overflow-tooltip />
+                    <el-table-column label="项目负责人" prop="project_director" show-overflow-tooltip />
                     <el-table-column label="登记日期" prop="apptime" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">