diff --git a/src/api/supervision_device_entry.ts b/src/api/supervision_device_entry.ts
index 5590baf..b73b370 100644
--- a/src/api/supervision_device_entry.ts
+++ b/src/api/supervision_device_entry.ts
@@ -23,4 +23,14 @@ export function apiSupervisionDeviceEntryDelete(params: any) {
 // 工程监理--设备进场详情
 export function apiSupervisionDeviceEntryDetail(params: any) {
     return request.get({ url: '/supervision_work.supervision_device_entry/detail', params })
-}
\ No newline at end of file
+}
+
+
+// 工程监理--设备进场详情
+export function apisupervision_device_entry_detail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_device_entry_detail/lists', params })
+}
+
+export function apisupervision_device_entry_detail_delete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_device_entry_detail/delete', params })
+}
diff --git a/src/api/supervision_diary.ts b/src/api/supervision_diary.ts
new file mode 100644
index 0000000..3d9b370
--- /dev/null
+++ b/src/api/supervision_diary.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--监理日记列表
+export function apiSupervisionDiaryLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_diary/lists', params })
+}
+
+// 添加工程监理--监理日记
+export function apiSupervisionDiaryAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_diary/add', params })
+}
+
+// 编辑工程监理--监理日记
+export function apiSupervisionDiaryEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_diary/edit', params })
+}
+
+// 删除工程监理--监理日记
+export function apiSupervisionDiaryDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_diary/delete', params })
+}
+
+// 工程监理--监理日记详情
+export function apiSupervisionDiaryDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_diary/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_entity_parallel_testing.ts b/src/api/supervision_entity_parallel_testing.ts
new file mode 100644
index 0000000..a2b03e8
--- /dev/null
+++ b/src/api/supervision_entity_parallel_testing.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--实体平行检验列表
+export function apiSupervisionEntityParallelTestingLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_entity_parallel_testing/lists', params })
+}
+
+// 添加工程监理--实体平行检验
+export function apiSupervisionEntityParallelTestingAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_entity_parallel_testing/add', params })
+}
+
+// 编辑工程监理--实体平行检验
+export function apiSupervisionEntityParallelTestingEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_entity_parallel_testing/edit', params })
+}
+
+// 删除工程监理--实体平行检验
+export function apiSupervisionEntityParallelTestingDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_entity_parallel_testing/delete', params })
+}
+
+// 工程监理--实体平行检验详情
+export function apiSupervisionEntityParallelTestingDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_entity_parallel_testing/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_material_entry.ts b/src/api/supervision_material_entry.ts
index 29362a9..cdac2f5 100644
--- a/src/api/supervision_material_entry.ts
+++ b/src/api/supervision_material_entry.ts
@@ -23,4 +23,14 @@ export function apiSupervisionMaterialEntryDelete(params: any) {
 // 工程监理--材料进场详情
 export function apiSupervisionMaterialEntryDetail(params: any) {
     return request.get({ url: '/supervision_work.supervision_material_entry/detail', params })
-}
\ No newline at end of file
+}
+
+// 工程监理--材料进场详情
+export function apisupervision_material_entry_detail(params: any) {
+    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 })
+}
+
diff --git a/src/api/supervision_material_equipment_info.ts b/src/api/supervision_material_equipment_info.ts
new file mode 100644
index 0000000..0f3cbd7
--- /dev/null
+++ b/src/api/supervision_material_equipment_info.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--材料设备信息列表
+export function apiSupervisionMaterialEquipmentInfoLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_material_equipment_info/lists', params })
+}
+
+// 添加工程监理--材料设备信息
+export function apiSupervisionMaterialEquipmentInfoAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_material_equipment_info/add', params })
+}
+
+// 编辑工程监理--材料设备信息
+export function apiSupervisionMaterialEquipmentInfoEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_material_equipment_info/edit', params })
+}
+
+// 删除工程监理--材料设备信息
+export function apiSupervisionMaterialEquipmentInfoDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_material_equipment_info/delete', params })
+}
+
+// 工程监理--材料设备信息详情
+export function apiSupervisionMaterialEquipmentInfoDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_material_equipment_info/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_meeting_minutes.ts b/src/api/supervision_meeting_minutes.ts
new file mode 100644
index 0000000..e2a63dd
--- /dev/null
+++ b/src/api/supervision_meeting_minutes.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--会议纪要列表
+export function apiSupervisionMeetingMinutesLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_meeting_minutes/lists', params })
+}
+
+// 添加工程监理--会议纪要
+export function apiSupervisionMeetingMinutesAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_meeting_minutes/add', params })
+}
+
+// 编辑工程监理--会议纪要
+export function apiSupervisionMeetingMinutesEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_meeting_minutes/edit', params })
+}
+
+// 删除工程监理--会议纪要
+export function apiSupervisionMeetingMinutesDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_meeting_minutes/delete', params })
+}
+
+// 工程监理--会议纪要详情
+export function apiSupervisionMeetingMinutesDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_meeting_minutes/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_notice.ts b/src/api/supervision_notice.ts
index 577e63d..93528f5 100644
--- a/src/api/supervision_notice.ts
+++ b/src/api/supervision_notice.ts
@@ -23,4 +23,14 @@ export function apiSupervisionNoticeDelete(params: any) {
 // 工程监理--监理通知单详情
 export function apiSupervisionNoticeDetail(params: any) {
     return request.get({ url: '/supervision_work.supervision_notice/detail', params })
-}
\ No newline at end of file
+}
+
+// 工程监理--监理通知单详情
+export function apisupervision_notice_problem(params: any) {
+    return request.get({ url: '/supervision_work.supervision_notice_problem/lists', params })
+}
+
+// 工程监理--监理通知单详情
+export function apisupervision_notice_problem_delete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_notice_problem/delete', params })
+}
diff --git a/src/api/supervision_problem.ts b/src/api/supervision_problem.ts
new file mode 100644
index 0000000..dc1b6e7
--- /dev/null
+++ b/src/api/supervision_problem.ts
@@ -0,0 +1,30 @@
+import request from '@/utils/request'
+
+// 工程监理--问题跟踪台账列表
+export function apiSupervisionProblemLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_problem/lists', params })
+}
+
+// 添加工程监理--问题跟踪台账
+export function apiSupervisionProblemAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_problem/add', params })
+}
+
+// 编辑工程监理--问题跟踪台账
+export function apiSupervisionProblemEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_problem/edit', params })
+}
+
+// 删除工程监理--问题跟踪台账
+export function apiSupervisionProblemDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_problem/delete', params })
+}
+
+// 工程监理--问题跟踪台账详情
+export function apiSupervisionProblemDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_problem/detail', params })
+}
+// 检查验收
+export function apisupervision_problem(params: any) {
+    return request.post({ url: '/supervision_work.supervision_problem/check', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_witness_sampling.ts b/src/api/supervision_witness_sampling.ts
index 5af333f..00d9d67 100644
--- a/src/api/supervision_witness_sampling.ts
+++ b/src/api/supervision_witness_sampling.ts
@@ -23,4 +23,16 @@ export function apiSupervisionWitnessSamplingDelete(params: any) {
 // 工程监理--见证取样详情
 export function apiSupervisionWitnessSamplingDetail(params: any) {
     return request.get({ url: '/supervision_work.supervision_witness_sampling/detail', params })
-}
\ No newline at end of file
+}
+
+
+// 工程监理--见证取样列表
+export function apiSupervisionWitnessSamplingListsDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_witness_sampling_detail/lists', params })
+}
+// 检验结果
+
+// 工程监理--见证取样列表
+export function apisupervision_witness_sampling_detail(params: any) {
+    return request.post({ url: '/supervision_work.supervision_witness_sampling_detail/check', params })
+}
diff --git a/src/api/supervision_work_contact.ts b/src/api/supervision_work_contact.ts
index 26c52d0..000b96d 100644
--- a/src/api/supervision_work_contact.ts
+++ b/src/api/supervision_work_contact.ts
@@ -23,4 +23,14 @@ export function apiSupervisionWorkContactDelete(params: any) {
 // 工程监理--监理工作联系单详情
 export function apiSupervisionWorkContactDetail(params: any) {
     return request.get({ url: '/supervision_work.supervision_work_contact/detail', params })
-}
\ No newline at end of file
+}
+
+// 工程监理--监理工作联系单详情
+export function apisupervision_work_contact_problem(params: any) {
+    return request.get({ url: '/supervision_work.supervision_work_contact_problem/lists', params })
+}
+
+// 工程监理--监理工作联系单详情
+export function apisupervision_work_contact_problem_delete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_work_contact_problem/delete', params })
+}
diff --git a/src/components/supervision_material_entry/index.vue b/src/components/supervision_material_entry/index.vue
new file mode 100644
index 0000000..4041731
--- /dev/null
+++ b/src/components/supervision_material_entry/index.vue
@@ -0,0 +1,77 @@
+<template>
+    <div>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="进场主题" prop="theme">
+                    <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入进场主题" />
+                </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>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+                    <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 />
+                    <el-table-column label="是否平行检验" prop="parallel_test_text" show-overflow-tooltip />
+                </el-table>
+
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+// import { apiSupervisionMaterialEquipmentInfoLists, } from '@/api/supervision_material_equipment_info'
+import { apiSupervisionMaterialEntryLists } from '@/api/supervision_material_entry'
+import { defineEmits } from "vue"
+import { useDictData } from '@/hooks/useDictOptions'
+
+const props = defineProps({
+    project_id: Number,
+    task_allocation: Number
+})
+// 查询条件
+const queryParams = reactive({
+    name: '',
+    brand: '',
+    model: '',
+    contract_brand: '',
+    type: ''
+});
+const { dictData } = useDictData('')
+
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionMaterialEntryLists,
+    params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/components/supervision_material_equipment_info/index.vue b/src/components/supervision_material_equipment_info/index.vue
new file mode 100644
index 0000000..86d143f
--- /dev/null
+++ b/src/components/supervision_material_equipment_info/index.vue
@@ -0,0 +1,78 @@
+<template>
+    <div>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="材料/设备名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入材料/设备名称" />
+                </el-form-item>
+                <el-form-item label="材料/设备品牌" prop="brand">
+                    <el-input class="w-[280px]" v-model="queryParams.brand" clearable placeholder="请输入材料/设备品牌" />
+                </el-form-item>
+                <el-form-item label="合同约定品牌" prop="contract_brand">
+                    <el-select v-model="queryParams.contract_brand">
+                        <el-option label="否" value="0"></el-option>
+                        <el-option label="是" value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="材料/设备名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="材料/设备品牌" prop="brand" show-overflow-tooltip />
+                    <el-table-column label="型号" prop="model" show-overflow-tooltip />
+                    <el-table-column label="计数单位" prop="unit" show-overflow-tooltip />
+                    <el-table-column label="计划数量" prop="number" show-overflow-tooltip />
+                    <el-table-column label="合同约定品牌" prop="contract_brand_text" show-overflow-tooltip />
+                    <el-table-column label="类型" prop="type_text" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                </el-table>
+
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { apiSupervisionMaterialEquipmentInfoLists, } from '@/api/supervision_material_equipment_info'
+import { defineEmits } from "vue"
+import { useDictData } from '@/hooks/useDictOptions'
+
+const props = defineProps({
+    project_id: Number,
+    task_allocation: Number
+})
+// 查询条件
+const queryParams = reactive({
+    name: '',
+    brand: '',
+    model: '',
+    contract_brand: '',
+    type: ''
+});
+const { dictData } = useDictData('')
+
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionMaterialEquipmentInfoLists,
+    params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/views/supervision_accept/index.vue b/src/views/supervision_accept/index.vue
index a551937..63c2df3 100644
--- a/src/views/supervision_accept/index.vue
+++ b/src/views/supervision_accept/index.vue
@@ -87,7 +87,7 @@
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
                 </el-form-item>
-                <div class="flex mt-4 justify-end">
+                <div class="flex justify-end mt-4">
                     <el-button type="primary" @click="handleAccept">确定</el-button>
                     <el-button @click="dialogTableVisible = false">取消</el-button>
                 </div>
diff --git a/src/views/supervision_device_entry/edit.vue b/src/views/supervision_device_entry/edit.vue
index 236c0b7..822b925 100644
--- a/src/views/supervision_device_entry/edit.vue
+++ b/src/views/supervision_device_entry/edit.vue
@@ -1,32 +1,152 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="项目id" prop="project_id">
-                    <el-input v-model="formData.project_id" clearable placeholder="请选择项目" />
-                </el-form-item>
-                <el-form-item label="编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入编号" />
-                </el-form-item>
-                <el-form-item label="进场时间" prop="enter_time">
-                    <el-input v-model="formData.enter_time" clearable placeholder="请输入进场时间" />
-                </el-form-item>
-                <el-form-item label="施工单位" prop="company_id">
-                    <el-input v-model="formData.company_id" clearable placeholder="请输入施工单位" />
-                </el-form-item>
-                <el-form-item label="进场结果 0-进场 1-退场" prop="enter_result">
-                    <el-input v-model="formData.enter_result" clearable placeholder="请输入进场结果 0-进场 1-退场" />
-                </el-form-item>
-                <el-form-item label="共同参与人" prop="co_participant">
-                    <el-input v-model="formData.co_participant" clearable placeholder="请输入共同参与人" />
-                </el-form-item>
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
-                </el-form-item>
-                <el-form-item label="操作人" prop="create_user">
-                    <el-input v-model="formData.create_user" clearable placeholder="请输入操作人" />
-                </el-form-item>
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="进场时间" prop="enter_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.enter_time" clearable type="datetime"
+                                value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择进场时间">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="施工单位" prop="company_name">
+                            <el-input v-model="formData.company_name" clearable placeholder="点击选择施工单位" readonly
+                                @click="showDialog2 = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="进场结果" prop="enter_result">
+                            <el-radio-group v-model="formData.enter_result" placeholder="请选择骑缝盖章">
+                                <el-radio :label="0">进场</el-radio>
+                                <el-radio :label="1">退场</el-radio>
+                            </el-radio-group>
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="共同参与人" prop="co_participant">
+                            <el-input v-model="formData.co_participant" clearable placeholder="请输入共同参与人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                    <supervision_project @customEvent="customEvent"></supervision_project>
+                </el-dialog>
+                <div v-if="showDialog2">
+                    <el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
+                        <supervision_participating_units @customEvent="customEvent1" :project_id="formData.project_id"
+                            :unit_type="6">
+                        </supervision_participating_units>
+                    </el-dialog>
+                </div>
+                <el-dialog v-model="showDialog3" title="选择材料信息" width="70%">
+                    <supervision_material_equipment_info @customEvent="customEvent2"></supervision_material_equipment_info>
+                </el-dialog>
             </el-form>
+            <div style="margin-bottom: 30px;">设备信息</div>
+            <div style="margin-bottom: 30px;">
+                <el-table :data="formData.entry_detail">
+                    <el-table-column label="序号" width="150px">
+                        <template #default="{ row }">
+                            <el-button @click="handleAdd()">+</el-button>
+                            <el-button @click="handleDelete(row)">-</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="设备名称" prop="name">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.name" @click="showDialog3 = true, tableIndex = scope.$index" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="设备品牌" prop="brand">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.brand" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="计数单位" prop="unit">
+                        <template #default="{ row }">
+                            <el-input v-model="row.unit" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="是否合同约定品牌" prop="contract_brand">
+                        <template #default="{ row }">
+                            <el-select class="flex-1" v-model="row.contract_brand" clearable placeholder="请选择">
+                                <el-option label="否" :value="0" />
+                                <el-option label="是" :value="1" />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="型号" prop="model">
+                        <template #default="{ row }">
+                            <el-input v-model="row.model" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="进场数量" prop="entry_number">
+                        <template #default="{ row }">
+                            <el-input v-model="row.entry_number" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="证明文件是否安全" prop="documentation">
+                        <template #default="{ row }">
+                            <el-select class="flex-1" v-model="row.documentation" clearable placeholder="请选择">
+                                <el-option label="否" :value="0" />
+                                <el-option label="是" :value="1" />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="核对是否一致" prop="verify">
+                        <template #default="{ row }">
+                            <el-select class="flex-1" v-model="row.verify" clearable placeholder="请选择">
+                                <el-option label="否" :value="0" />
+                                <el-option label="是" :value="1" />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div style="margin-bottom: 30px;">问题</div>
+            <div style="margin-bottom: 30px;">
+                <el-table :data="formData.entry_problem">
+                    <el-table-column label="序号" width="150px">
+                        <template #default="{ row }">
+                            <el-button @click="handleAdd1()">+</el-button>
+                            <el-button @click="handleDelete1(row)">-</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="问题分类" prop="problem_cate">
+                        <template #default="scope">
+                            <el-select class="flex-1" v-model="scope.row.problem_cate" clearable placeholder="请输入问题分类">
+                                <el-option v-for="( item, index  ) in  dictData.problem_cate" :key="index"
+                                    :label="item.name" :value="item.value" />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="问题说明" prop="check_content">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_description" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="问题名称" prop="problem_name">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_name" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
         </popup>
     </div>
 </template>
@@ -34,8 +154,9 @@
 <script lang="ts" setup name="supervisionDeviceEntryEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiSupervisionDeviceEntryAdd, apiSupervisionDeviceEntryEdit, apiSupervisionDeviceEntryDetail } from '@/api/supervision_device_entry'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionDeviceEntryAdd, apiSupervisionDeviceEntryEdit, apiSupervisionDeviceEntryDetail, apisupervision_device_entry_detail, apisupervision_device_entry_detail_delete } from '@/api/supervision_device_entry'
+import { apisupervision_problem_delete, apisupervision_problem } from '@/api/supervision_inspection'
+
 import type { PropType } from 'vue'
 defineProps({
     dictData: {
@@ -47,7 +168,10 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-
+const showDialog = ref(false)
+const showDialog2 = ref(false)
+const showDialog3 = ref(false)
+const tableIndex = ref(0)
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -57,16 +181,94 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    project_id: '',
+    project_id: 0,
+    project_name: "",
     code: '',
     enter_time: '',
     company_id: '',
+    company_name: "",
     enter_result: '',
     co_participant: '',
     remark: '',
     create_user: '',
+    entry_detail: [{
+        "name": "",
+        "brand": "",
+        "model": "",
+        "unit": "",
+        "contract_brand": 0,
+        "entry_number": 0,
+        "documentation": 0,
+        "verify": 0
+    }],
+    entry_problem: [{
+        "problem_cate": 0,
+        "problem_description": "",
+        "problem_name": ""
+    }]
 })
 
+const handleAdd = () => {
+    formData.entry_detail.push({
+        "name": "",
+        "brand": "",
+        "model": "",
+        "unit": "",
+        "contract_brand": 0,
+        "entry_number": 0,
+        "documentation": 0,
+        "verify": 0
+    })
+}
+const handleDelete = async (row: any) => {
+    if (row.id) {
+        await apisupervision_device_entry_detail_delete({ id: row.id })
+        const index = formData.entry_detail.indexOf(row);
+        formData.entry_detail.splice(index, 1);
+    } else {
+        const index = formData.entry_detail.indexOf(row);
+        formData.entry_detail.splice(index, 1);
+    }
+}
+
+const handleAdd1 = () => {
+    formData.entry_problem.push({
+        "problem_cate": 0,
+        "problem_description": "",
+        "problem_name": ""
+    })
+}
+const handleDelete1 = async (row: any) => {
+    if (row.id) {
+        await apisupervision_problem_delete({ id: row.id })
+        const index = formData.entry_problem.indexOf(row);
+        formData.entry_problem.splice(index, 1);
+    } else {
+        const index = formData.entry_problem.indexOf(row);
+        formData.entry_problem.splice(index, 1);
+    }
+}
+
+
+const customEvent = (e) => {
+    formData.project_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+    formData.company_id = ''
+    formData.company_name = ''
+
+}
+const customEvent1 = (e) => {
+    formData.company_id = e.id
+    formData.company_name = e.project_name
+    showDialog2.value = false
+}
+const customEvent2 = (e) => {
+    for (let key in formData.entry_detail[tableIndex.value]) {
+        (formData.entry_detail[tableIndex.value])[key] = e[key]
+    }
+    showDialog3.value = false
+}
 
 // 表单验证
 const formRules = reactive<any>({
@@ -121,7 +323,12 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
+    apisupervision_device_entry_detail({ device_entry_id: formData.id }).then(res => {
+        formData.entry_detail = res.lists
+    })
+    apisupervision_problem({ data_id: formData.id }).then(res => {
+        formData.entry_problem = res.lists
+    })
 
 }
 
diff --git a/src/views/supervision_device_entry/index.vue b/src/views/supervision_device_entry/index.vue
index 5d2a84a..4344863 100644
--- a/src/views/supervision_device_entry/index.vue
+++ b/src/views/supervision_device_entry/index.vue
@@ -2,15 +2,14 @@
     <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="请选择项目" />
-                </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="进场结果 0-进场 1-退场" prop="enter_result">
-                    <el-input class="w-[280px]" v-model="queryParams.enter_result" clearable
-                        placeholder="请输入进场结果 0-进场 1-退场" />
+                <el-form-item label="进场结果" prop="enter_result">
+                    <el-select v-model="queryParams.enter_result">
+                        <el-option label="进场" value="0"></el-option>
+                        <el-option label="退场" value="1"></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -32,14 +31,13 @@
             <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="code" show-overflow-tooltip />
                     <el-table-column label="进场时间" prop="enter_time" show-overflow-tooltip />
-                    <el-table-column label="施工单位" prop="company_id" show-overflow-tooltip />
-                    <el-table-column label="进场结果 0-进场 1-退场" prop="enter_result" show-overflow-tooltip />
+                    <el-table-column label="施工单位" prop="company_name" show-overflow-tooltip />
+                    <el-table-column label="进场结果" prop="enter_result_text" show-overflow-tooltip />
                     <el-table-column label="共同参与人" prop="co_participant" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_device_entry/edit']" type="primary" link
@@ -54,7 +52,7 @@
                     </el-table-column>
                 </el-table>
             </div>
-            <div class="flex mt-4 justify-end">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
@@ -65,7 +63,7 @@
 <script lang="ts" setup name="supervisionDeviceEntryLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionDeviceEntryLists, apiSupervisionDeviceEntryDelete } from '@/api/supervision_device_entry'
+import { apiSupervisionDeviceEntryLists, apiSupervisionDeviceEntryDelete, apiSupervisionDeviceEntryDetail } from '@/api/supervision_device_entry'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -91,7 +89,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('accept_type,problem_cate')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -108,10 +106,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiSupervisionDeviceEntryDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
diff --git a/src/views/supervision_diary/edit.vue b/src/views/supervision_diary/edit.vue
new file mode 100644
index 0000000..5193de6
--- /dev/null
+++ b/src/views/supervision_diary/edit.vue
@@ -0,0 +1,203 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="项目id" prop="project_id">
+                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
+                </el-form-item>
+                <el-form-item label="日期" prop="date">
+                    <el-input v-model="formData.date" clearable placeholder="请输入日期" />
+                </el-form-item>
+                <el-form-item label="星期" prop="week">
+                    <el-input v-model="formData.week" clearable placeholder="请输入星期" />
+                </el-form-item>
+                <el-form-item label="气温" prop="air_temperature">
+                    <el-input v-model="formData.air_temperature" clearable placeholder="请输入气温" />
+                </el-form-item>
+                <el-form-item label="气候" prop="climate">
+                    <el-input v-model="formData.climate" clearable placeholder="请输入气候" />
+                </el-form-item>
+                <el-form-item label="监理人员" prop="user">
+                    <el-input v-model="formData.user" clearable placeholder="请输入监理人员" />
+                </el-form-item>
+                <el-form-item label="监理总监" prop="director">
+                    <el-input v-model="formData.director" clearable placeholder="请输入监理总监" />
+                </el-form-item>
+                <el-form-item label="工程动态" prop="engineering_dynamics">
+                    <el-input v-model="formData.engineering_dynamics" clearable placeholder="请输入工程动态" />
+                </el-form-item>
+                <el-form-item label="监理工作" prop="supervision_work">
+                    <el-input v-model="formData.supervision_work" clearable placeholder="请输入监理工作" />
+                </el-form-item>
+                <el-form-item label="安全文明施工情况" prop="construction_situation">
+                    <el-input v-model="formData.construction_situation" clearable placeholder="请输入安全文明施工情况" />
+                </el-form-item>
+                <el-form-item label="其他事项" prop="other_matters">
+                    <el-input v-model="formData.other_matters" clearable placeholder="请输入其他事项" />
+                </el-form-item>
+                <el-form-item label="附件" prop="annex">
+                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionDiaryEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiSupervisionDiaryAdd, apiSupervisionDiaryEdit, apiSupervisionDiaryDetail } from '@/api/supervision_diary'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑工程监理--监理日记' : '新增工程监理--监理日记'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_id: '',
+    date: '',
+    week: '',
+    air_temperature: '',
+    climate: '',
+    user: '',
+    director: '',
+    engineering_dynamics: '',
+    supervision_work: '',
+    construction_situation: '',
+    other_matters: '',
+    annex: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    date: [{
+        required: true,
+        message: '请输入日期',
+        trigger: ['blur']
+    }],
+    week: [{
+        required: true,
+        message: '请输入星期',
+        trigger: ['blur']
+    }],
+    air_temperature: [{
+        required: true,
+        message: '请输入气温',
+        trigger: ['blur']
+    }],
+    climate: [{
+        required: true,
+        message: '请输入气候',
+        trigger: ['blur']
+    }],
+    user: [{
+        required: true,
+        message: '请输入监理人员',
+        trigger: ['blur']
+    }],
+    director: [{
+        required: true,
+        message: '请输入监理总监',
+        trigger: ['blur']
+    }],
+    engineering_dynamics: [{
+        required: true,
+        message: '请输入工程动态',
+        trigger: ['blur']
+    }],
+    supervision_work: [{
+        required: true,
+        message: '请输入监理工作',
+        trigger: ['blur']
+    }],
+    construction_situation: [{
+        required: true,
+        message: '请输入安全文明施工情况',
+        trigger: ['blur']
+    }],
+    other_matters: [{
+        required: true,
+        message: '请输入其他事项',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiSupervisionDiaryDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiSupervisionDiaryEdit(data) 
+        : await apiSupervisionDiaryAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/supervision_diary/index.vue b/src/views/supervision_diary/index.vue
new file mode 100644
index 0000000..74ee966
--- /dev/null
+++ b/src/views/supervision_diary/index.vue
@@ -0,0 +1,148 @@
+<template>
+    <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="date">
+                    <el-input class="w-[280px]" v-model="queryParams.date" clearable placeholder="请输入日期" />
+                </el-form-item>
+                <el-form-item label="监理人员" prop="user">
+                    <el-input class="w-[280px]" v-model="queryParams.user" clearable placeholder="请输入监理人员" />
+                </el-form-item>
+                <el-form-item label="监理总监" prop="director">
+                    <el-input class="w-[280px]" v-model="queryParams.director" clearable placeholder="请输入监理总监" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['supervision_work.supervision_diary/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['supervision_work.supervision_diary/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button>
+            <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="date" show-overflow-tooltip />
+                    <el-table-column label="星期" prop="week" show-overflow-tooltip />
+                    <el-table-column label="气温" prop="air_temperature" show-overflow-tooltip />
+                    <el-table-column label="气候" prop="climate" show-overflow-tooltip />
+                    <el-table-column label="监理人员" prop="user" show-overflow-tooltip />
+                    <el-table-column label="监理总监" prop="director" show-overflow-tooltip />
+                    <el-table-column label="工程动态" prop="engineering_dynamics" show-overflow-tooltip />
+                    <el-table-column label="监理工作" prop="supervision_work" show-overflow-tooltip />
+                    <el-table-column label="安全文明施工情况" prop="construction_situation" show-overflow-tooltip />
+                    <el-table-column label="其他事项" prop="other_matters" show-overflow-tooltip />
+                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                             <el-button
+                                v-perms="['supervision_work.supervision_diary/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                v-perms="['supervision_work.supervision_diary/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionDiaryLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionDiaryLists, apiSupervisionDiaryDelete } from '@/api/supervision_diary'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    date: '',
+    user: '',
+    director: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionDiaryLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiSupervisionDiaryDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_entity_parallel_testing/edit.vue b/src/views/supervision_entity_parallel_testing/edit.vue
new file mode 100644
index 0000000..9553604
--- /dev/null
+++ b/src/views/supervision_entity_parallel_testing/edit.vue
@@ -0,0 +1,302 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="检验主题" prop="theme">
+                            <el-input v-model="formData.theme" clearable placeholder="请输入检验主题" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="编号">
+                            <el-input v-model="formData.code" clearable placeholder="请输入编号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="工程单位" prop="check_item_name">
+                            <el-input v-model="formData.check_item_name" clearable placeholder="请输入工程单位" readonly
+                                @click="showDialog2 = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="检验部位" prop="position">
+                            <el-input v-model="formData.position" clearable placeholder="请输入检验部位" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="开始时间" prop="start_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.start_time" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择开始日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="结束时间" prop="end_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.end_time" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择开始日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="检验结果" prop="result">
+                            <el-radio-group v-model="formData.result" placeholder="请选择检验结果">
+                                <el-radio :label="0">符合标准</el-radio>
+                                <el-radio :label="1">不符合标准</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="附件" prop="annex">
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                    <supervision_project @customEvent="customEvent"></supervision_project>
+                </el-dialog>
+                <div v-if="showDialog2">
+                    <el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
+                        <supervision_check_item @customEvent="customEvent1" :project_id="formData.project_id"
+                            :node_type="2">
+                        </supervision_check_item>
+                    </el-dialog>
+                </div>
+                <div style="margin-bottom: 30px;">问题</div>
+                <div style="margin-bottom: 30px;">
+                    <el-table :data="formData.problem">
+                        <el-table-column label="序号" width="150px">
+                            <template #default="{ row }">
+                                <el-button @click="handleAdd1()">+</el-button>
+                                <el-button @click="handleDelete1(row)">-</el-button>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="问题分类" prop="problem_cate">
+                            <template #default="scope">
+                                <el-select class="flex-1" v-model="scope.row.problem_cate" clearable placeholder="请输入问题分类">
+                                    <el-option v-for="( item, index  ) in  dictData.problem_cate" :key="index"
+                                        :label="item.name" :value="item.value" />
+                                </el-select>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="问题说明" prop="check_content">
+                            <template #default="{ row }">
+                                <el-input v-model="row.problem_description" />
+                            </template>
+                        </el-table-column>
+
+                        <el-table-column label="问题名称" prop="problem_name">
+                            <template #default="{ row }">
+                                <el-input v-model="row.problem_name" />
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionEntityParallelTestingEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiSupervisionEntityParallelTestingAdd, apiSupervisionEntityParallelTestingEdit, apiSupervisionEntityParallelTestingDetail } from '@/api/supervision_entity_parallel_testing'
+import { timeFormat } from '@/utils/util'
+import { apisupervision_problem_delete, apisupervision_problem } from '@/api/supervision_inspection'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const showDialog = ref(false)
+const showDialog2 = ref(false)
+const handleAvatarSuccess_four = (response: any) => {
+    Array.isArray(formData.annex) ? '' : 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' ? '编辑工程监理--实体平行检验' : '新增工程监理--实体平行检验'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_id: '',
+    project_name: '',
+    theme: '',
+    code: '',
+
+    check_item_id: "",
+    check_item_name: "",
+    position: '',
+    start_time: '',
+    end_time: '',
+    result: '',
+    remark: '',
+    annex: '',
+    create_user: '',
+    problem: [{
+        "problem_cate": '',
+        "problem_description": "",
+        "problem_name": ""
+    }]
+})
+const customEvent = (e) => {
+    formData.project_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+    formData.company_id = ''
+    formData.company_name = ''
+
+}
+const customEvent1 = (e) => {
+    formData.check_item_id = e.id
+    formData.check_item_name = e.project_name
+    showDialog2.value = false
+}
+
+
+const handleAdd1 = () => {
+    formData.problem.push({
+        "problem_cate": '',
+        "problem_description": "",
+        "problem_name": ""
+    })
+}
+const handleDelete1 = async (row: any) => {
+    if (row.id) {
+        await apisupervision_problem_delete({ id: row.id })
+        const index = formData.problem.indexOf(row);
+        formData.problem.splice(index, 1);
+    } else {
+        const index = formData.problem.indexOf(row);
+        formData.problem.splice(index, 1);
+    }
+}
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    theme: [{
+        required: true,
+        message: '请输入检验主题',
+        trigger: ['blur']
+    }],
+    company_id: [{
+        required: true,
+        message: '请输入工程单位',
+        trigger: ['blur']
+    }],
+    position: [{
+        required: true,
+        message: '请输入检验部位',
+        trigger: ['blur']
+    }],
+    start_time: [{
+        required: true,
+        message: '请输入开始时间',
+        trigger: ['blur']
+    }],
+    end_time: [{
+        required: true,
+        message: '请输入结束时间',
+        trigger: ['blur']
+    }],
+    result: [{
+        required: true,
+        message: '请输入检验结果 0-符合标准 1-不符合标准',
+        trigger: ['blur']
+    }],
+    remark: [{
+        required: true,
+        message: '请输入备注',
+        trigger: ['blur']
+    }],
+    create_user: [{
+        required: true,
+        message: '请输入创建人',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+    apisupervision_problem({ data_id: formData.id }).then(res => {
+        formData.problem = res.lists
+    })
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiSupervisionEntityParallelTestingDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiSupervisionEntityParallelTestingEdit(data)
+        : await apiSupervisionEntityParallelTestingAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/supervision_entity_parallel_testing/index.vue b/src/views/supervision_entity_parallel_testing/index.vue
new file mode 100644
index 0000000..f1703da
--- /dev/null
+++ b/src/views/supervision_entity_parallel_testing/index.vue
@@ -0,0 +1,135 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="检验主题" prop="theme">
+                    <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入检验主题" />
+                </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="position">
+                    <el-input class="w-[280px]" v-model="queryParams.position" clearable placeholder="请输入检验部位" />
+                </el-form-item>
+                <el-form-item label="检验结果" prop="result">
+                    <el-select v-model="queryParams.result">
+                        <el-option lable="0" value="符合标准"></el-option>
+                        <el-option lable="1" value="不符合标准"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['supervision_work.supervision_entity_parallel_testing/add']" type="primary"
+                @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['supervision_work.supervision_entity_parallel_testing/delete']"
+                :disabled="!selectData.length" @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <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="theme" show-overflow-tooltip />
+                    <el-table-column label="编号" prop="code" show-overflow-tooltip />
+                    <el-table-column label="工程单位" prop="check_item_name" show-overflow-tooltip />
+                    <el-table-column label="检验部位" prop="position" show-overflow-tooltip />
+                    <el-table-column label="开始时间" prop="start_time" show-overflow-tooltip />
+                    <el-table-column label="结束时间" prop="end_time" show-overflow-tooltip />
+                    <el-table-column label="检验结果" prop="result_text" 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_entity_parallel_testing/edit']"
+                                type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['supervision_work.supervision_entity_parallel_testing/delete']"
+                                type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionEntityParallelTestingLists">
+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 feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    theme: '',
+    code: '',
+    position: '',
+    result: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('problem_cate')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionEntityParallelTestingLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiSupervisionEntityParallelTestingDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_material_entry/edit.vue b/src/views/supervision_material_entry/edit.vue
index 777a594..2355500 100644
--- a/src/views/supervision_material_entry/edit.vue
+++ b/src/views/supervision_material_entry/edit.vue
@@ -1,38 +1,122 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="项目id" prop="project_id">
-                    <el-input v-model="formData.project_id" clearable placeholder="请选择项目" />
-                </el-form-item>
-                <el-form-item label="采购单位id" prop="company_id">
-                    <el-input v-model="formData.company_id" clearable placeholder="请输入采购单位id" />
-                </el-form-item>
-                <el-form-item label="进场主题" prop="theme">
-                    <el-input v-model="formData.theme" clearable placeholder="请输入进场主题" />
-                </el-form-item>
-                <el-form-item label="编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入编号" />
-                </el-form-item>
-                <el-form-item label="进场时间" prop="enter_time">
-                    <el-input v-model="formData.enter_time" clearable placeholder="请输入进场时间" />
-                </el-form-item>
-                <el-form-item label="共同参与人" prop="co_participant">
-                    <el-input v-model="formData.co_participant" clearable placeholder="请输入共同参与人" />
-                </el-form-item>
-                <el-form-item label="进场结果 0-进场 1-进场后复检 2-退检" prop="enter_result">
-                    <el-input v-model="formData.enter_result" clearable placeholder="请输入进场结果 0-进场 1-进场后复检 2-退检" />
-                </el-form-item>
-                <el-form-item label="是否平行检验 0-否 1-是" prop="parallel_test">
-                    <el-input v-model="formData.parallel_test" clearable placeholder="请输入是否平行检验 0-否 1-是" />
-                </el-form-item>
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
-                </el-form-item>
-                <el-form-item label="创建人" prop="create_user">
-                    <el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
-                </el-form-item>
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="70vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="采购单位" prop="company_name">
+                            <el-input v-model="formData.company_name" clearable placeholder="点击选择采购单位" readonly
+                                @click="showDialog2 = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="进场主题" prop="theme">
+                            <el-input v-model="formData.theme" clearable placeholder="请输入进场主题" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="进场时间" prop="enter_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.enter_time" clearable type="datetime"
+                                value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择进场时间">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="共同参与人" prop="co_participant">
+                            <el-input v-model="formData.co_participant" clearable placeholder="请输入共同参与人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="进场结果" prop="enter_result">
+                            <el-radio-group v-model="formData.enter_result" placeholder="请选择骑缝盖章">
+                                <el-radio :label="0">进场</el-radio>
+                                <el-radio :label="1">进场后复检</el-radio>
+                                <el-radio :label="2">退检</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="是否平行检验" prop="parallel_test">
+                            <el-radio-group v-model="formData.parallel_test" placeholder="请选择骑缝盖章">
+                                <el-radio :label="0">否</el-radio>
+                                <el-radio :label="1">是</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                    <supervision_project @customEvent="customEvent"></supervision_project>
+                </el-dialog>
+                <div v-if="showDialog2">
+                    <el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
+                        <supervision_participating_units @customEvent="customEvent1" :project_id="formData.project_id"
+                            :unit_type="6">
+                        </supervision_participating_units>
+                    </el-dialog>
+                </div>
+                <el-dialog v-model="showDialog3" title="选择材料信息" width="70%">
+                    <supervision_material_equipment_info @customEvent="customEvent2"></supervision_material_equipment_info>
+                </el-dialog>
             </el-form>
+            <div style="margin-bottom: 30px;">材料信息 <el-button type="primary" @click="handleAdd"
+                    v-if="formData.entry_detail.length == 0" style="float: right;">新增</el-button></div>
+            <div style="margin-bottom: 30px;">
+                <el-table :data="formData.entry_detail">
+                    <el-table-column label="序号" width="150px">
+                        <template #default="{ row }">
+                            <el-button @click="handleAdd()">+</el-button>
+                            <el-button @click="handleDelete(row)">-</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="材料名称" prop="name">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.name" @click="showDialog3 = true, tableIndex = scope.$index" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="材料品牌" prop="brand">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.brand" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="单位" prop="unit">
+                        <template #default="{ row }">
+                            <el-input v-model="row.unit" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="是否合同约定品牌" prop="contract_brand">
+                        <template #default="{ row }">
+                            <el-select class="flex-1" v-model="row.contract_brand" clearable placeholder="请选择">
+                                <el-option label="否" :value="0" />
+                                <el-option label="是" :value="1" />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="型号" prop="model">
+                        <template #default="{ row }">
+                            <el-input v-model="row.model" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="进场数量" prop="entry_number">
+                        <template #default="{ row }">
+                            <el-input v-model="row.entry_number" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+
+
         </popup>
     </div>
 </template>
@@ -40,7 +124,7 @@
 <script lang="ts" setup name="supervisionMaterialEntryEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiSupervisionMaterialEntryAdd, apiSupervisionMaterialEntryEdit, apiSupervisionMaterialEntryDetail } from '@/api/supervision_material_entry'
+import { apiSupervisionMaterialEntryAdd, apiSupervisionMaterialEntryEdit, apiSupervisionMaterialEntryDetail, apisupervision_material_entry_detail, apisupervision_material_entry_detail_delete } from '@/api/supervision_material_entry'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -53,6 +137,11 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const showDialog = ref(false)
+const showDialog2 = ref(false)
+const showDialog3 = ref(false)
+const tableIndex = ref(0)
+
 
 
 // 弹窗标题
@@ -63,8 +152,10 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    project_id: '',
+    project_id: 0,
+    project_name: "",
     company_id: '',
+    company_name: "",
     theme: '',
     code: '',
     enter_time: '',
@@ -73,9 +164,64 @@ const formData = reactive({
     parallel_test: '',
     remark: '',
     create_user: '',
+    entry_detail: [{
+        "name": "",
+        "brand": "",
+        "model": "",
+        "unit": "",
+        "contract_brand": 0,
+        "entry_number": 0
+    }]
 })
 
 
+const handleAdd = () => {
+    formData.entry_detail.push({
+        "name": "",
+        "brand": "",
+        "model": "",
+        "unit": "",
+        "contract_brand": 0,
+        "entry_number": 0
+    })
+}
+const handleDelete = async (row: any) => {
+    // if (formData.entry_detail.length == 1) return
+    if (row.id) {
+        await apisupervision_material_entry_detail_delete({ id: row.id })
+        const index = formData.entry_detail.indexOf(row);
+        formData.entry_detail.splice(index, 1);
+    } else {
+        const index = formData.entry_detail.indexOf(row);
+        formData.entry_detail.splice(index, 1);
+    }
+
+}
+
+
+
+const customEvent = (e) => {
+    formData.project_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+    formData.company_id = ''
+    formData.company_name = ''
+
+}
+const customEvent1 = (e) => {
+    formData.company_id = e.id
+    formData.company_name = e.project_name
+    showDialog2.value = false
+}
+const customEvent2 = (e) => {
+    console.log(e)
+    for (let key in formData.entry_detail[tableIndex.value]) {
+        (formData.entry_detail[tableIndex.value])[key] = e[key]
+    }
+    showDialog3.value = false
+}
+
+
 // 表单验证
 const formRules = reactive<any>({
     project_id: [{
@@ -139,8 +285,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
-
+    let res = await apisupervision_material_entry_detail({ material_entry_id: formData.id })
+    formData.entry_detail = res.lists
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/supervision_material_entry/index.vue b/src/views/supervision_material_entry/index.vue
index 5ead318..d1c7f43 100644
--- a/src/views/supervision_material_entry/index.vue
+++ b/src/views/supervision_material_entry/index.vue
@@ -2,9 +2,6 @@
     <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="请选择项目" />
-                </el-form-item>
                 <el-form-item label="进场主题" prop="theme">
                     <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入进场主题" />
                 </el-form-item>
@@ -31,16 +28,19 @@
             <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="采购单位id" prop="company_id" show-overflow-tooltip />
+                    <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="co_participant" show-overflow-tooltip />
-                    <el-table-column label="进场结果 0-进场 1-进场后复检 2-退检" prop="enter_result" show-overflow-tooltip />
-                    <el-table-column label="是否平行检验 0-否 1-是" prop="parallel_test" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
+                    <el-table-column label="进场结果" prop="enter_result_text" show-overflow-tooltip />
+                    <el-table-column label="是否平行检验" prop="parallel_test_text" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_material_entry/edit']" type="primary" link
@@ -55,7 +55,7 @@
                     </el-table-column>
                 </el-table>
             </div>
-            <div class="flex mt-4 justify-end">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
@@ -66,7 +66,7 @@
 <script lang="ts" setup name="supervisionMaterialEntryLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionMaterialEntryLists, apiSupervisionMaterialEntryDelete } from '@/api/supervision_material_entry'
+import { apiSupervisionMaterialEntryLists, apiSupervisionMaterialEntryDelete, apiSupervisionMaterialEntryDetail } from '@/api/supervision_material_entry'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -109,10 +109,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiSupervisionMaterialEntryDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
diff --git a/src/views/supervision_material_equipment_info/edit.vue b/src/views/supervision_material_equipment_info/edit.vue
new file mode 100644
index 0000000..19184d9
--- /dev/null
+++ b/src/views/supervision_material_equipment_info/edit.vue
@@ -0,0 +1,199 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="项目名称" prop="project_name">
+                    <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
+                        @click="showDialog = true" />
+                </el-form-item>
+                <el-form-item label="材料/设备名称" prop="name">
+                    <el-input v-model="formData.name" clearable placeholder="请输入材料/设备名称" />
+                </el-form-item>
+                <el-form-item label="材料/设备品牌" prop="brand">
+                    <el-input v-model="formData.brand" clearable placeholder="请输入材料/设备品牌" />
+                </el-form-item>
+                <el-form-item label="型号" prop="model">
+                    <el-input v-model="formData.model" clearable placeholder="请输入型号" />
+                </el-form-item>
+                <el-form-item label="计数单位" prop="unit">
+                    <el-input v-model="formData.unit" clearable placeholder="请输入计数单位" />
+                </el-form-item>
+                <el-form-item label="计划数量" prop="number">
+                    <el-input v-model="formData.number" clearable placeholder="请输入计划数量" />
+                </el-form-item>
+                <el-form-item label="合同约定品牌" prop="contract_brand">
+                    <el-radio-group v-model="formData.contract_brand" placeholder="合同约定品牌">
+                        <el-radio :label="0">
+                            否
+                        </el-radio>
+                        <el-radio :label="1">
+                            是
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="类型" prop="type">
+                    <el-radio-group v-model="formData.type" placeholder="类型">
+                        <el-radio :label="0">
+                            材料
+                        </el-radio>
+                        <el-radio :label="1">
+                            设备
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+                <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                    <supervision_project @customEvent="customEvent"></supervision_project>
+                </el-dialog>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionMaterialEquipmentInfoEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiSupervisionMaterialEquipmentInfoAdd, apiSupervisionMaterialEquipmentInfoEdit, apiSupervisionMaterialEquipmentInfoDetail } from '@/api/supervision_material_equipment_info'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const showDialog = ref(false)
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑工程监理--材料设备信息' : '新增工程监理--材料设备信息'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_id: '',
+    project_name: "",
+    name: '',
+    brand: '',
+    model: '',
+    unit: '',
+    number: '',
+    contract_brand: '',
+    type: '',
+    remark: '',
+})
+
+const customEvent = (e) => {
+    formData.project_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+}
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    name: [{
+        required: true,
+        message: '请输入材料/设备名称',
+        trigger: ['blur']
+    }],
+    brand: [{
+        required: true,
+        message: '请输入材料/设备品牌',
+        trigger: ['blur']
+    }],
+    model: [{
+        required: true,
+        message: '请输入型号',
+        trigger: ['blur']
+    }],
+    unit: [{
+        required: true,
+        message: '请输入计数单位',
+        trigger: ['blur']
+    }],
+    number: [{
+        required: true,
+        message: '请输入计划数量',
+        trigger: ['blur']
+    }],
+    contract_brand: [{
+        required: true,
+        message: '请输入合同约定品牌 0-否 1-是',
+        trigger: ['blur']
+    }],
+    type: [{
+        required: true,
+        message: '请输入类型 0-材料 1-设备',
+        trigger: ['blur']
+    }],
+    remark: [{
+        required: true,
+        message: '请输入备注',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiSupervisionMaterialEquipmentInfoDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiSupervisionMaterialEquipmentInfoEdit(data)
+        : await apiSupervisionMaterialEquipmentInfoAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/supervision_material_equipment_info/index.vue b/src/views/supervision_material_equipment_info/index.vue
new file mode 100644
index 0000000..c11c821
--- /dev/null
+++ b/src/views/supervision_material_equipment_info/index.vue
@@ -0,0 +1,141 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="材料/设备名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入材料/设备名称" />
+                </el-form-item>
+                <el-form-item label="材料/设备品牌" prop="brand">
+                    <el-input class="w-[280px]" v-model="queryParams.brand" clearable placeholder="请输入材料/设备品牌" />
+                </el-form-item>
+                <el-form-item label="型号" prop="model">
+                    <el-input class="w-[280px]" v-model="queryParams.model" clearable placeholder="请输入型号" />
+                </el-form-item>
+                <el-form-item label="合同约定品牌" prop="contract_brand">
+                    <el-select v-model="queryParams.contract_brand">
+                        <el-option label="否" value="0"></el-option>
+                        <el-option label="是" value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="类型" prop="type">
+                    <el-select v-model="queryParams.type">
+                        <el-option label="材料" value="0"></el-option>
+                        <el-option label="设备" value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['supervision_work.supervision_material_equipment_info/add']" type="primary"
+                @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['supervision_work.supervision_material_equipment_info/delete']"
+                :disabled="!selectData.length" @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <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="name" show-overflow-tooltip />
+                    <el-table-column label="材料/设备品牌" prop="brand" show-overflow-tooltip />
+                    <el-table-column label="型号" prop="model" show-overflow-tooltip />
+                    <el-table-column label="计数单位" prop="unit" show-overflow-tooltip />
+                    <el-table-column label="计划数量" prop="number" show-overflow-tooltip />
+                    <el-table-column label="合同约定品牌" prop="contract_brand_text" show-overflow-tooltip />
+                    <el-table-column label="类型" prop="type_text" 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_equipment_info/edit']"
+                                type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['supervision_work.supervision_material_equipment_info/delete']"
+                                type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionMaterialEquipmentInfoLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionMaterialEquipmentInfoLists, apiSupervisionMaterialEquipmentInfoDelete } from '@/api/supervision_material_equipment_info'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    name: '',
+    brand: '',
+    model: '',
+    contract_brand: '',
+    type: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionMaterialEquipmentInfoLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiSupervisionMaterialEquipmentInfoDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_meeting_minutes/edit.vue b/src/views/supervision_meeting_minutes/edit.vue
new file mode 100644
index 0000000..a3f73ef
--- /dev/null
+++ b/src/views/supervision_meeting_minutes/edit.vue
@@ -0,0 +1,187 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="项目id" prop="project_id">
+                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
+                </el-form-item>
+                <el-form-item label="会议主题" prop="theme">
+                    <el-input v-model="formData.theme" clearable placeholder="请输入会议主题" />
+                </el-form-item>
+                <el-form-item label="会议类型" prop="type">
+                    <el-input v-model="formData.type" clearable placeholder="请输入会议类型" />
+                </el-form-item>
+                <el-form-item label="会议时间" prop="time">
+                    <el-input v-model="formData.time" clearable placeholder="请输入会议时间" />
+                </el-form-item>
+                <el-form-item label="主持人" prop="emcee">
+                    <el-input v-model="formData.emcee" clearable placeholder="请输入主持人" />
+                </el-form-item>
+                <el-form-item label="记录人" prop="recorder">
+                    <el-input v-model="formData.recorder" clearable placeholder="请输入记录人" />
+                </el-form-item>
+                <el-form-item label="会议地点" prop="location">
+                    <el-input v-model="formData.location" clearable placeholder="请输入会议地点" />
+                </el-form-item>
+                <el-form-item label="与会人员" prop="attendees">
+                    <el-input v-model="formData.attendees" clearable placeholder="请输入与会人员" />
+                </el-form-item>
+                <el-form-item label="会议内容" prop="content">
+                    <el-input v-model="formData.content" clearable placeholder="请输入会议内容" />
+                </el-form-item>
+                <el-form-item label="附件" prop="annex">
+                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
+                </el-form-item>
+                <el-form-item label="" prop="create_user">
+                    <el-input v-model="formData.create_user" clearable placeholder="请输入" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionMeetingMinutesEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiSupervisionMeetingMinutesAdd, apiSupervisionMeetingMinutesEdit, apiSupervisionMeetingMinutesDetail } from '@/api/supervision_meeting_minutes'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑工程监理--会议纪要' : '新增工程监理--会议纪要'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_id: '',
+    theme: '',
+    type: '',
+    time: '',
+    emcee: '',
+    recorder: '',
+    location: '',
+    attendees: '',
+    content: '',
+    annex: '',
+    create_user: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    theme: [{
+        required: true,
+        message: '请输入会议主题',
+        trigger: ['blur']
+    }],
+    type: [{
+        required: true,
+        message: '请输入会议类型',
+        trigger: ['blur']
+    }],
+    time: [{
+        required: true,
+        message: '请输入会议时间',
+        trigger: ['blur']
+    }],
+    emcee: [{
+        required: true,
+        message: '请输入主持人',
+        trigger: ['blur']
+    }],
+    recorder: [{
+        required: true,
+        message: '请输入记录人',
+        trigger: ['blur']
+    }],
+    location: [{
+        required: true,
+        message: '请输入会议地点',
+        trigger: ['blur']
+    }],
+    attendees: [{
+        required: true,
+        message: '请输入与会人员',
+        trigger: ['blur']
+    }],
+    content: [{
+        required: true,
+        message: '请输入会议内容',
+        trigger: ['blur']
+    }],
+    create_user: [{
+        required: true,
+        message: '请输入',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiSupervisionMeetingMinutesDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiSupervisionMeetingMinutesEdit(data)
+        : await apiSupervisionMeetingMinutesAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/supervision_meeting_minutes/index.vue b/src/views/supervision_meeting_minutes/index.vue
new file mode 100644
index 0000000..95e359e
--- /dev/null
+++ b/src/views/supervision_meeting_minutes/index.vue
@@ -0,0 +1,151 @@
+<template>
+    <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="theme">
+                    <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入会议主题" />
+                </el-form-item>
+                <el-form-item label="会议类型" prop="type">
+                    <el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入会议类型" />
+                </el-form-item>
+                <el-form-item label="主持人" prop="emcee">
+                    <el-input class="w-[280px]" v-model="queryParams.emcee" clearable placeholder="请输入主持人" />
+                </el-form-item>
+                <el-form-item label="记录人" prop="recorder">
+                    <el-input class="w-[280px]" v-model="queryParams.recorder" clearable placeholder="请输入记录人" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['supervision_work.supervision_meeting_minutes/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['supervision_work.supervision_meeting_minutes/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button>
+            <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="theme" show-overflow-tooltip />
+                    <el-table-column label="会议类型" prop="type" show-overflow-tooltip />
+                    <el-table-column label="会议时间" prop="time" show-overflow-tooltip />
+                    <el-table-column label="主持人" prop="emcee" show-overflow-tooltip />
+                    <el-table-column label="记录人" prop="recorder" show-overflow-tooltip />
+                    <el-table-column label="会议地点" prop="location" show-overflow-tooltip />
+                    <el-table-column label="与会人员" prop="attendees" show-overflow-tooltip />
+                    <el-table-column label="会议内容" prop="content" show-overflow-tooltip />
+                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
+                    <el-table-column label="" prop="create_user" 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>
+                            <el-button
+                                v-perms="['supervision_work.supervision_meeting_minutes/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionMeetingMinutesLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionMeetingMinutesLists, apiSupervisionMeetingMinutesDelete } from '@/api/supervision_meeting_minutes'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    theme: '',
+    type: '',
+    emcee: '',
+    recorder: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionMeetingMinutesLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiSupervisionMeetingMinutesDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_notice/edit.vue b/src/views/supervision_notice/edit.vue
index 8d77a48..1d75137 100644
--- a/src/views/supervision_notice/edit.vue
+++ b/src/views/supervision_notice/edit.vue
@@ -1,51 +1,88 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="项目id" prop="project_id">
-                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
-                </el-form-item>
-                <el-form-item label="项目通知编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入项目通知编号" />
-                </el-form-item>
-                <el-form-item label="要求回复日期" prop="reply_date">
-                    <el-input v-model="formData.reply_date" clearable placeholder="请输入要求回复日期" />
-                </el-form-item>
-                <el-form-item label="施工单位" prop="company_id">
-                    <el-input v-model="formData.company_id" clearable placeholder="请输入施工单位" />
-                </el-form-item>
-                <el-form-item label="通知人员" prop="notify_user">
-                    <el-input v-model="formData.notify_user" clearable placeholder="请输入通知人员" />
-                </el-form-item>
-                <el-form-item label="下达日期" prop="issue_date">
-                    <el-input v-model="formData.issue_date" clearable placeholder="请输入下达日期" />
-                </el-form-item>
-                <el-form-item label="附件" prop="annex">
-                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                </el-form-item>
-                <el-form-item label="整改回复时间" prop="rectification_reply_time">
-                    <el-input v-model="formData.rectification_reply_time" clearable placeholder="请输入整改回复时间" />
-                </el-form-item>
-                <el-form-item label="整改回复人" prop="rectification_reply_user">
-                    <el-input v-model="formData.rectification_reply_user" clearable placeholder="请输入整改回复人" />
-                </el-form-item>
-                <el-form-item label="整改回复意见" prop="rectification_reply_opinions">
-                    <el-input v-model="formData.rectification_reply_opinions" clearable placeholder="请输入整改回复意见" />
-                </el-form-item>
-                <el-form-item label="整改回复附件" prop="rectification_reply_annex">
-                    <el-input v-model="formData.rectification_reply_annex" clearable placeholder="请输入整改回复附件" />
-                </el-form-item>
-                <el-form-item label="填写人" prop="create_user">
-                    <el-input v-model="formData.create_user" clearable placeholder="请输入填写人" />
-                </el-form-item>
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目通知编号">
+                            <el-input v-model="formData.code" clearable placeholder="系统自动生成" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="要求回复日期" prop="reply_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.reply_date" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择时间">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="施工单位" prop="company_name">
+                            <el-input v-model="formData.company_name" clearable placeholder="点击选择施工单位" readonly
+                                @click="showDialog2 = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="通知人员" prop="notify_user">
+                            <el-input v-model="formData.notify_user" clearable placeholder="请输入通知人员" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="下达日期" prop="issue_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.issue_date" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择时间">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="附件" prop="annex">
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                    <supervision_project @customEvent="customEvent"></supervision_project>
+                </el-dialog>
+                <div v-if="showDialog2">
+                    <el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
+                        <supervision_participating_units @customEvent="customEvent1" :project_id="formData.project_id"
+                            :unit_type="6">
+                        </supervision_participating_units>
+                    </el-dialog>
+                </div>
             </el-form>
+            <div style="margin-bottom: 30px;">通知问题</div>
+            <div style="margin-bottom: 30px;">
+                <el-table :data="formData.problem">
+                    <el-table-column label="序号" width="150px">
+                        <template #default="{ row }">
+                            <el-button @click="handleAdd1()">+</el-button>
+                            <el-button @click="handleDelete1(row)">-</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="事由描述" prop="problem_description">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_description" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="内容描述" prop="content_description">
+                        <template #default="{ row }">
+                            <el-input v-model="row.content_description" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="要求描述" prop="demand_description">
+                        <template #default="{ row }">
+                            <el-input v-model="row.demand_description" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
         </popup>
     </div>
 </template>
@@ -53,7 +90,7 @@
 <script lang="ts" setup name="supervisionNoticeEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiSupervisionNoticeAdd, apiSupervisionNoticeEdit, apiSupervisionNoticeDetail } from '@/api/supervision_notice'
+import { apiSupervisionNoticeAdd, apiSupervisionNoticeEdit, apiSupervisionNoticeDetail, apisupervision_notice_problem, apisupervision_notice_problem_delete } from '@/api/supervision_notice'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -66,31 +103,70 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const showDialog = ref(false)
+const showDialog2 = ref(false)
 
 
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑工程监理--监理通知单' : '新增工程监理--监理通知单'
 })
+const handleAvatarSuccess_four = (response: any) => {
+    Array.isArray(formData.annex) ? '' : 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 formData = reactive({
     id: '',
     project_id: '',
+    project_name: '',
     code: '',
     reply_date: '',
     company_id: '',
+    company_name: '',
     notify_user: '',
     issue_date: '',
     annex: '',
-    rectification_reply_time: '',
-    rectification_reply_user: '',
-    rectification_reply_opinions: '',
-    rectification_reply_annex: '',
-    create_user: '',
+    problem: [{
+        "problem_description": "",
+        "content_description": "",
+        "demand_description": ""
+    }]
 })
+const handleAdd1 = () => {
+    formData.problem.push({
+        "problem_description": "",
+        "content_description": "",
+        "demand_description": ""
+    })
+}
+const handleDelete1 = async (row: any) => {
+    if (row.id) {
+        await apisupervision_notice_problem_delete({ id: row.id })
+        const index = formData.problem.indexOf(row);
+        formData.problem.splice(index, 1);
+    } else {
+        const index = formData.problem.indexOf(row);
+        formData.problem.splice(index, 1);
+    }
+}
 
-
+const customEvent = (e) => {
+    formData.project_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+    formData.company_id = ''
+    formData.company_name = ''
+}
+const customEvent1 = (e) => {
+    formData.company_id = e.id
+    formData.company_name = e.project_name
+    showDialog2.value = false
+}
 // 表单验证
 const formRules = reactive<any>({
     project_id: [{
@@ -154,8 +230,9 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+    let res = await apisupervision_notice_problem({ notice_id: formData.id })
+    formData.problem = res.lists
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -169,9 +246,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiSupervisionNoticeEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiSupervisionNoticeEdit(data)
         : await apiSupervisionNoticeAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/supervision_notice/index.vue b/src/views/supervision_notice/index.vue
index d96c69d..871370b 100644
--- a/src/views/supervision_notice/index.vue
+++ b/src/views/supervision_notice/index.vue
@@ -1,14 +1,7 @@
 <template>
     <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 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>
@@ -28,51 +21,34 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['supervision_work.supervision_notice/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['supervision_work.supervision_notice/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <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="code" show-overflow-tooltip />
                     <el-table-column label="要求回复日期" prop="reply_date" show-overflow-tooltip />
-                    <el-table-column label="施工单位" prop="company_id" show-overflow-tooltip />
+                    <el-table-column label="施工单位" prop="company_name" show-overflow-tooltip />
                     <el-table-column label="通知人员" prop="notify_user" show-overflow-tooltip />
                     <el-table-column label="下达日期" prop="issue_date" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
-                    <el-table-column label="整改回复时间" prop="rectification_reply_time" show-overflow-tooltip />
-                    <el-table-column label="整改回复人" prop="rectification_reply_user" show-overflow-tooltip />
-                    <el-table-column label="整改回复意见" prop="rectification_reply_opinions" show-overflow-tooltip />
-                    <el-table-column label="整改回复附件" prop="rectification_reply_annex" show-overflow-tooltip />
-                    <el-table-column label="填写人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['supervision_work.supervision_notice/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['supervision_work.supervision_notice/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['supervision_work.supervision_notice/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['supervision_work.supervision_notice/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
             </div>
-            <div class="flex mt-4 justify-end">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
diff --git a/src/views/supervision_problem/edit.vue b/src/views/supervision_problem/edit.vue
new file mode 100644
index 0000000..c171d76
--- /dev/null
+++ b/src/views/supervision_problem/edit.vue
@@ -0,0 +1,131 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="整改回复时间" prop="rectification_time">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.rectification_time" clearable
+                        value-format="YYYY-MM-DD" placeholder="选择时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="整改回复人" prop="rectification_user">
+                    <el-input v-model="formData.rectification_user" clearable placeholder="请输入整改回复人" />
+                </el-form-item>
+                <el-form-item label="检查结果" prop="rectification_result">
+                    <el-radio-group v-model="formData.rectification_result">
+                        <el-radio :label="0">
+                            通过
+                        </el-radio>
+                        <el-radio :label="1">
+                            不通过
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="整改回复意见" prop="rectification_opinion">
+                    <el-input v-model="formData.rectification_opinion" clearable placeholder="请输入整改回复意见" type="textarea" />
+                </el-form-item>
+                <el-form-item label="附件" prop="rectification_annex">
+                    <annexUpload :annex="formData.rectification_annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                        @delFile="delFileFn" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionProblemEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiSupervisionProblemAdd, apiSupervisionProblemEdit, apiSupervisionProblemDetail, apisupervision_problem } from '@/api/supervision_problem'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return "检查验收"
+})
+
+// 表单数据
+const formData = reactive({
+    "id": 1,
+    "rectification_time": "2024-03-01",
+    "rectification_user": "张三",
+    "rectification_result": 1,
+    "rectification_opinion": "aa",
+    "rectification_annex": []
+})
+const handleAvatarSuccess_four = (response: any) => {
+    Array.isArray(formData.rectification_annex) ? '' : formData.rectification_annex = []
+    // @ts-ignore
+    response.code != 0 ? formData.rectification_annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.rectification_annex.splice(index, 1) }
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiSupervisionProblemDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apisupervision_problem(data)
+        : await apisupervision_problem(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/supervision_problem/index.vue b/src/views/supervision_problem/index.vue
new file mode 100644
index 0000000..0274447
--- /dev/null
+++ b/src/views/supervision_problem/index.vue
@@ -0,0 +1,128 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="问题分类" prop="problem_cate">
+                    <el-input class="w-[280px]" v-model="queryParams.problem_cate" clearable placeholder="请输入问题分类" />
+                </el-form-item>
+                <el-form-item label="问题说明" prop="problem_description">
+                    <el-input class="w-[280px]" v-model="queryParams.problem_description" clearable placeholder="请输入问题说明" />
+                </el-form-item>
+                <el-form-item label="问题名称" prop="problem_name">
+                    <el-input class="w-[280px]" v-model="queryParams.problem_name" clearable placeholder="请输入问题名称" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <!-- <el-button v-perms="['supervision_work.supervision_problem/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button> -->
+            <el-button v-perms="['supervision_work.supervision_problem/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+                <!-- 1-巡视 2-旁站 3-验收 4-设备进场 5-见证取样 6-材料平行检验 7-实体平行检验 -->
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="问题分类" prop="problem_cate_text" show-overflow-tooltip />
+                    <el-table-column label="问题说明" prop="problem_description" show-overflow-tooltip />
+                    <el-table-column label="问题名称" prop="problem_name" show-overflow-tooltip />
+                    <el-table-column label="整改时间" prop="rectification_time" show-overflow-tooltip />
+                    <el-table-column label="整改人" prop="rectification_user" show-overflow-tooltip />
+                    <el-table-column label="整改结果" prop="rectification_result_text" show-overflow-tooltip />
+                    <el-table-column label="整改意见" prop="rectification_opinion" show-overflow-tooltip />
+                    <el-table-column label="是否整改" prop="is_rectification_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['supervision_work.supervision_problem/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                检查验收
+                            </el-button>
+                            <el-button v-perms="['supervision_work.supervision_problem/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionProblemLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionProblemLists, apiSupervisionProblemDelete } from '@/api/supervision_problem'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    data_id: '',
+    data_type: '',
+    problem_cate: '',
+    problem_description: '',
+    problem_name: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionProblemLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiSupervisionProblemDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_test_blocks_specimens/edit.vue b/src/views/supervision_test_blocks_specimens/edit.vue
index 34c194d..42146c3 100644
--- a/src/views/supervision_test_blocks_specimens/edit.vue
+++ b/src/views/supervision_test_blocks_specimens/edit.vue
@@ -1,51 +1,114 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="项目id" prop="project_id">
-                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
-                </el-form-item>
-                <el-form-item label="试验类型" prop="test_type">
-                    <el-input v-model="formData.test_type" clearable placeholder="请输入试验类型" />
-                </el-form-item>
-                <el-form-item label="编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入编号" />
-                </el-form-item>
-                <el-form-item label="见证人" prop="witness">
-                    <el-input v-model="formData.witness" clearable placeholder="请输入见证人" />
-                </el-form-item>
-                <el-form-item label="试验部位" prop="test_site">
-                    <el-input v-model="formData.test_site" clearable placeholder="请输入试验部位" />
-                </el-form-item>
-                <el-form-item label="单位名称" prop="company_id">
-                    <el-input v-model="formData.company_id" clearable placeholder="请输入单位名称" />
-                </el-form-item>
-                <el-form-item label="开始日期" prop="start_date">
-                    <el-input v-model="formData.start_date" clearable placeholder="请输入开始日期" />
-                </el-form-item>
-                <el-form-item label="结束日期" prop="end_date">
-                    <el-input v-model="formData.end_date" clearable placeholder="请输入结束日期" />
-                </el-form-item>
-                <el-form-item label="试验结果 0-符合标准 1-不符合标准" prop="test_result">
-                    <el-input v-model="formData.test_result" clearable placeholder="请输入试验结果 0-符合标准 1-不符合标准" />
-                </el-form-item>
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
-                </el-form-item>
-                <el-form-item label="附件" prop="annex">
-                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                </el-form-item>
-                <el-form-item label="创建人" prop="create_user">
-                    <el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
-                </el-form-item>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="试验类型" prop="test_type">
+                            <el-input v-model="formData.test_type" clearable placeholder="请输入试验类型" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="编号">
+                            <el-input v-model="formData.code" clearable placeholder="系统自动生成" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="见证人" prop="witness">
+                            <el-input v-model="formData.witness" clearable placeholder="请输入见证人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="试验部位" prop="test_site">
+                            <el-input v-model="formData.test_site" clearable placeholder="请输入试验部位" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="单位名称" prop="company_id">
+                            <!-- <el-input v-model="formData.company_id" clearable placeholder="请输入单位名称" /> -->
+                            <el-input v-model="formData.company_name" clearable placeholder="点击选择采购单位" readonly
+                                @click="showDialog2 = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="开始日期" prop="start_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.start_date" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择开始日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="结束日期" prop="end_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.end_date" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择开始日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="试验结果" prop="test_result">
+                            <el-radio-group v-model="formData.test_result" placeholder="请选择试验结果">
+                                <el-radio :label="0">符合标准</el-radio>
+                                <el-radio :label="1">不符合标准</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="附件" prop="annex">
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
             </el-form>
+            <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                <supervision_project @customEvent="customEvent"></supervision_project>
+            </el-dialog>
+            <el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
+                <supervision_participating_units @customEvent="customEvent1">
+                </supervision_participating_units>
+            </el-dialog>
+            <div style="margin-bottom: 30px;">问题</div>
+            <div style="margin-bottom: 30px;">
+                <el-table :data="formData.problem">
+                    <el-table-column label="序号" width="150px">
+                        <template #default="{ row }">
+                            <el-button @click="handleAdd1()">+</el-button>
+                            <el-button @click="handleDelete1(row)">-</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="问题分类" prop="problem_cate">
+                        <template #default="scope">
+                            <el-select class="flex-1" v-model="scope.row.problem_cate" clearable placeholder="请输入问题分类">
+                                <el-option v-for="( item, index  ) in  dictData.problem_cate" :key="index"
+                                    :label="item.name" :value="item.value" />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="问题说明" prop="check_content">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_description" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="问题名称" prop="problem_name">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_name" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
         </popup>
     </div>
 </template>
@@ -54,7 +117,9 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiSupervisionTestBlocksSpecimensAdd, apiSupervisionTestBlocksSpecimensEdit, apiSupervisionTestBlocksSpecimensDetail } from '@/api/supervision_test_blocks_specimens'
-import { timeFormat } from '@/utils/util'
+// import { timeFormat } from '@/utils/util'
+import { apisupervision_problem_delete, apisupervision_problem } from '@/api/supervision_inspection'
+
 import type { PropType } from 'vue'
 defineProps({
     dictData: {
@@ -66,7 +131,16 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const showDialog = ref(false)
+const showDialog2 = ref(false)
+const handleAvatarSuccess_four = (response: any) => {
+    Array.isArray(formData.annex) ? '' : 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(() => {
@@ -76,26 +150,64 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    project_id: '',
+    project_id: 0,
+    project_name: '',
     test_type: '',
     code: '',
     witness: '',
     test_site: '',
     company_id: '',
+    company_name: "",
     start_date: '',
     end_date: '',
     test_result: '',
     remark: '',
-    annex: '',
+    annex: [],
     create_user: '',
+    problem: [{
+        "problem_cate": '',
+        "problem_description": "",
+        "problem_name": ""
+    }]
 })
 
+const handleAdd1 = () => {
+    formData.problem.push({
+        "problem_cate": '',
+        "problem_description": "",
+        "problem_name": ""
+    })
+}
+const handleDelete1 = async (row: any) => {
+    if (row.id) {
+        await apisupervision_problem_delete({ id: row.id })
+        const index = formData.problem.indexOf(row);
+        formData.problem.splice(index, 1);
+    } else {
+        const index = formData.problem.indexOf(row);
+        formData.problem.splice(index, 1);
+    }
+}
 
+
+const customEvent = (e) => {
+    formData.project_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+    // formData.company_id = ''
+    // formData.company_name = ''
+
+}
+const customEvent1 = (e) => {
+    formData.company_id = e.id
+    formData.company_name = e.project_name
+    showDialog2.value = false
+}
 // 表单验证
 const formRules = reactive<any>({
     project_id: [{
         required: true,
-        message: '请输入项目id',
+        message: '请选择项目',
         trigger: ['blur']
     }],
     test_type: [{
@@ -159,8 +271,10 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+    apisupervision_problem({ data_id: formData.id }).then(res => {
+        formData.problem = res.lists
+    })
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -174,9 +288,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiSupervisionTestBlocksSpecimensEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiSupervisionTestBlocksSpecimensEdit(data)
         : await apiSupervisionTestBlocksSpecimensAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/supervision_test_blocks_specimens/index.vue b/src/views/supervision_test_blocks_specimens/index.vue
index a7f15dd..59d0865 100644
--- a/src/views/supervision_test_blocks_specimens/index.vue
+++ b/src/views/supervision_test_blocks_specimens/index.vue
@@ -1,11 +1,7 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <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>
@@ -22,7 +18,8 @@
                     <el-input class="w-[280px]" v-model="queryParams.test_site" clearable placeholder="请输入试验部位" />
                 </el-form-item>
                 <el-form-item label="试验结果 0-符合标准 1-不符合标准" prop="test_result">
-                    <el-input class="w-[280px]" v-model="queryParams.test_result" clearable placeholder="请输入试验结果 0-符合标准 1-不符合标准" />
+                    <el-input class="w-[280px]" v-model="queryParams.test_result" clearable
+                        placeholder="请输入试验结果 0-符合标准 1-不符合标准" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -31,57 +28,45 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['supervision_work.supervision_test_blocks_specimens/add']" type="primary" @click="handleAdd">
+            <el-button v-perms="['supervision_work.supervision_test_blocks_specimens/add']" type="primary"
+                @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['supervision_work.supervision_test_blocks_specimens/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['supervision_work.supervision_test_blocks_specimens/delete']"
+                :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
             <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="test_type" show-overflow-tooltip />
                     <el-table-column label="编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="见证人" prop="witness" show-overflow-tooltip />
                     <el-table-column label="试验部位" prop="test_site" show-overflow-tooltip />
-                    <el-table-column label="单位名称" prop="company_id" show-overflow-tooltip />
+                    <el-table-column label="单位名称" prop="company_name" 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="试验结果 0-符合标准 1-不符合标准" prop="test_result" show-overflow-tooltip />
+                    <el-table-column label="试验结果" prop="test_result_text" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['supervision_work.supervision_test_blocks_specimens/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['supervision_work.supervision_test_blocks_specimens/edit']" type="primary"
+                                link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['supervision_work.supervision_test_blocks_specimens/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['supervision_work.supervision_test_blocks_specimens/delete']" type="danger"
+                                link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
             </div>
-            <div class="flex mt-4 justify-end">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
@@ -121,7 +106,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('accept_type,problem_cate')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
diff --git a/src/views/supervision_witness_sampling/edit.vue b/src/views/supervision_witness_sampling/edit.vue
index 7eab6e6..d003214 100644
--- a/src/views/supervision_witness_sampling/edit.vue
+++ b/src/views/supervision_witness_sampling/edit.vue
@@ -1,39 +1,106 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="项目id" prop="project_id">
-                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
-                </el-form-item>
-                <el-form-item label="来源单据" prop="material_entry_id">
-                    <el-input v-model="formData.material_entry_id" clearable placeholder="请输入来源单据" />
-                </el-form-item>
-                <el-form-item label="编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入编号" />
-                </el-form-item>
-                <el-form-item label="取样日期" prop="sampling_date">
-                    <el-input v-model="formData.sampling_date" clearable placeholder="请输入取样日期" />
-                </el-form-item>
-                <el-form-item label="见证人" prop="witness">
-                    <el-input v-model="formData.witness" clearable placeholder="请输入见证人" />
-                </el-form-item>
-                <el-form-item label="取样人" prop="sampler">
-                    <el-input v-model="formData.sampler" clearable placeholder="请输入取样人" />
-                </el-form-item>
-                <el-form-item label="附件" prop="annex">
-                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                </el-form-item>
-                <el-form-item label="创建人" prop="create_user">
-                    <el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
-                </el-form-item>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="来源单据" prop="material_entry_name">
+                            <el-input v-model="formData.material_entry_name" clearable placeholder="点击来源单据" readonly
+                                @click="showDialog2 = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="编号">
+                            <el-input v-model="formData.code" clearable placeholder="系统自动生成" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="取样日期" prop="sampling_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.sampling_date" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择取样日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="见证人" prop="witness">
+                            <el-input v-model="formData.witness" clearable placeholder="请输入见证人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="取样人" prop="sampler">
+                            <el-input v-model="formData.sampler" clearable placeholder="请输入取样人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="附件" prop="annex">
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                    <supervision_project @customEvent="customEvent"></supervision_project>
+                </el-dialog>
+                <el-dialog v-model="showDialog2" title="选择来源单据" width="70%">
+                    <supervision_material_entry @customEvent="customEvent1"></supervision_material_entry>
+                </el-dialog>
             </el-form>
+            <div style="margin-bottom: 30px;">材料信息</div>
+            <div style="margin-bottom: 30px;">
+                <el-table :data="formData.sampling_detail">
+                    <!-- <el-table-column label="序号" width="150px">
+                        <template #default="{ row }">
+                            <el-button @click="handleAdd()">+</el-button>
+                            <el-button @click="handleDelete(row)">-</el-button>
+                        </template> 
+                    </el-table-column> -->
+                    <el-table-column label="材料名称" prop="name">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.name" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="材料品牌" prop="brand">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.brand" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="单位" prop="unit">
+                        <template #default="{ row }">
+                            <el-input v-model="row.unit" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="是否合同约定品牌" prop="contract_brand">
+                        <template #default="{ row }">
+                            <el-select class="flex-1" v-model="row.contract_brand" clearable placeholder="请选择">
+                                <el-option label="否" :value="0" />
+                                <el-option label="是" :value="1" />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="型号" prop="model">
+                        <template #default="{ row }">
+                            <el-input v-model="row.model" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="进场数量" prop="entry_number">
+                        <template #default="{ row }">
+                            <el-input v-model="row.entry_number" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="取样数量" prop="num">
+                        <template #default="{ row }">
+                            <el-input v-model="row.num" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
         </popup>
     </div>
 </template>
@@ -42,7 +109,9 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiSupervisionWitnessSamplingAdd, apiSupervisionWitnessSamplingEdit, apiSupervisionWitnessSamplingDetail } from '@/api/supervision_witness_sampling'
-import { timeFormat } from '@/utils/util'
+// import { timeFormat } from '@/utils/util'
+import { apisupervision_material_entry_detail, apisupervision_material_entry_detail_delete } from '@/api/supervision_material_entry'
+
 import type { PropType } from 'vue'
 defineProps({
     dictData: {
@@ -54,7 +123,17 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const showDialog = ref(false)
+const showDialog2 = ref(false)
 
+const handleAvatarSuccess_four = (response: any) => {
+    Array.isArray(formData.annex) ? '' : 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(() => {
@@ -65,21 +144,48 @@ const popupTitle = computed(() => {
 const formData = reactive({
     id: '',
     project_id: '',
+    project_name: "",
     material_entry_id: '',
+    material_entry_name: "",
     code: '',
     sampling_date: '',
     witness: '',
     sampler: '',
     annex: '',
     create_user: '',
-})
+    sampling_detail: [
+        {
+            "name": "",
+            "brand": "",
+            "model": "",
+            "unit": "",
+            "contract_brand": 0,
+            "entry_number": 0,
+            num: ""
+        }
 
+    ]
+})
+const customEvent = (e) => {
+    formData.project_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+}
+const customEvent1 = async (e) => {
+    formData.project_name = e.project_name
+    formData.project_id = e.project_id
+    formData.material_entry_id = e.id
+    formData.material_entry_name = e.theme
+    showDialog2.value = false
+    let res = await apisupervision_material_entry_detail({ material_entry_id: e.id })
+    formData.sampling_detail = res.lists
+}
 
 // 表单验证
 const formRules = reactive<any>({
-    project_id: [{
+    project_name: [{
         required: true,
-        message: '请输入项目id',
+        message: '请选择项目',
         trigger: ['blur']
     }],
     material_entry_id: [{
@@ -87,11 +193,6 @@ const formRules = reactive<any>({
         message: '请输入来源单据',
         trigger: ['blur']
     }],
-    code: [{
-        required: true,
-        message: '请输入编号',
-        trigger: ['blur']
-    }],
     sampling_date: [{
         required: true,
         message: '请输入取样日期',
@@ -107,11 +208,7 @@ const formRules = reactive<any>({
         message: '请输入取样人',
         trigger: ['blur']
     }],
-    create_user: [{
-        required: true,
-        message: '请输入创建人',
-        trigger: ['blur']
-    }]
+
 })
 
 
@@ -123,8 +220,9 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+    let res = await apisupervision_material_entry_detail({ material_entry_id: formData.material_entry_id })
+    formData.sampling_detail = res.lists
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -138,9 +236,10 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiSupervisionWitnessSamplingEdit(data) 
+    formData.sampling_detail = formData.sampling_detail.map(item => ({ material_entry_detail_id: item.id, num: item.num }))
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiSupervisionWitnessSamplingEdit(data)
         : await apiSupervisionWitnessSamplingAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/supervision_witness_sampling/index.vue b/src/views/supervision_witness_sampling/index.vue
index aec5eb2..fad0cf7 100644
--- a/src/views/supervision_witness_sampling/index.vue
+++ b/src/views/supervision_witness_sampling/index.vue
@@ -1,14 +1,7 @@
 <template>
     <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 class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="来源单据" prop="material_entry_id">
                     <el-input class="w-[280px]" v-model="queryParams.material_entry_id" clearable placeholder="请输入来源单据" />
                 </el-form-item>
@@ -34,47 +27,46 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['supervision_work.supervision_witness_sampling/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['supervision_work.supervision_witness_sampling/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <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="material_entry_id" show-overflow-tooltip />
-                    <el-table-column label="编号" prop="code" show-overflow-tooltip />
+                    <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="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="sampling_date" show-overflow-tooltip />
                     <el-table-column label="见证人" prop="witness" show-overflow-tooltip />
                     <el-table-column label="取样人" prop="sampler" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['supervision_work.supervision_witness_sampling/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['supervision_work.supervision_witness_sampling/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['supervision_work.supervision_witness_sampling/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['supervision_work.supervision_witness_sampling/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+
+                            <router-link :to="{
+                                path: '/supervision/supervision_work/supervision_witness_sampling_detail',
+                                query: { id: row.id }
+                            }">
+                                <el-button type="primary" link>
+                                    明细
+                                </el-button>
+                            </router-link>
+
                         </template>
                     </el-table-column>
                 </el-table>
             </div>
-            <div class="flex mt-4 justify-end">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
@@ -85,10 +77,12 @@
 <script lang="ts" setup name="supervisionWitnessSamplingLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionWitnessSamplingLists, apiSupervisionWitnessSamplingDelete } from '@/api/supervision_witness_sampling'
+import { apiSupervisionWitnessSamplingLists, apiSupervisionWitnessSamplingDelete, apiSupervisionWitnessSamplingDetail } from '@/api/supervision_witness_sampling'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import { useRouter } from 'vue-router'
+const router = useRouter()
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
@@ -130,10 +124,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiSupervisionWitnessSamplingDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
@@ -142,6 +137,12 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionWitnessSamplingDelete({ id })
     getLists()
 }
+// 明细
+// const handleDetail = async (id: number | any[]) => {
+//     router.push('/supervision_work/supervision_witness_sampling')
+
+//     // await apiSupervisionWitnessSamplingDelete({ id })
+// }
 
 getLists()
 </script>
diff --git a/src/views/supervision_witness_sampling_detail/edit.vue b/src/views/supervision_witness_sampling_detail/edit.vue
new file mode 100644
index 0000000..63548ac
--- /dev/null
+++ b/src/views/supervision_witness_sampling_detail/edit.vue
@@ -0,0 +1,253 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="报告编号" prop="check_code">
+                            <el-input v-model="formData.check_code" clearable placeholder="请输入报告编号" type="number" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="检验结果" prop="check_result">
+                            <el-radio-group v-model="formData.check_result">
+                                <el-radio label="1">
+                                    符合标准
+                                </el-radio>
+                                <el-radio label="2">
+                                    不符合标准
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="获得日期" prop="check_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.check_time" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择开始日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="操作人" prop="check_user">
+                            <el-input v-model="formData.check_user" clearable placeholder="请输入操作人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="附件" prop="annex">
+                            <annexUpload :annex="formData.check_annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+
+            </el-form>
+            <div style="margin-bottom: 30px;">问题</div>
+            <div style="margin-bottom: 30px;">
+                <el-table :data="formData.check_problem">
+                    <el-table-column label="序号" width="150px">
+                        <template #default="{ row }">
+                            <el-button @click="handleAdd1()">+</el-button>
+                            <el-button @click="handleDelete1(row)">-</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="问题分类" prop="problem_cate">
+                        <template #default="scope">
+                            <el-select class="flex-1" v-model="scope.row.problem_cate" clearable placeholder="请输入问题分类">
+                                <el-option v-for="( item, index  ) in  dictData.problem_cate" :key="index"
+                                    :label="item.name" :value="item.value" />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="问题说明" prop="check_content">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_description" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="问题名称" prop="problem_name">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_name" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionDiaryEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+// import { apiSupervisionDiaryAdd, apiSupervisionDiaryEdit, apiSupervisionDiaryDetail } from '@/api/supervision_diary'
+
+import { apisupervision_witness_sampling_detail } from '@/api/supervision_witness_sampling'
+
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.check_annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.check_annex.splice(index, 1) }
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return '检验结果'
+})
+
+const handleAdd1 = () => {
+    formData.check_problem.push({
+        "problem_cate": 0,
+        "problem_description": "",
+        "problem_name": ""
+    })
+}
+const handleDelete1 = async (row: any) => {
+    const index = formData.problem.indexOf(row);
+    formData.problem.splice(index, 1);
+}
+
+
+// 表单数据
+const formData = reactive({
+    "id": 1,
+    "check_code": 1,
+    "check_result": 1,
+    "check_time": "",
+    "check_user": "",
+    "check_remark": "",
+    "check_annex": [
+    ],
+    "check_problem": [
+        {
+            "problem_cate": '',
+            "problem_description": "",
+            "problem_name": ""
+        }
+    ]
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    date: [{
+        required: true,
+        message: '请输入日期',
+        trigger: ['blur']
+    }],
+    week: [{
+        required: true,
+        message: '请输入星期',
+        trigger: ['blur']
+    }],
+    air_temperature: [{
+        required: true,
+        message: '请输入气温',
+        trigger: ['blur']
+    }],
+    climate: [{
+        required: true,
+        message: '请输入气候',
+        trigger: ['blur']
+    }],
+    user: [{
+        required: true,
+        message: '请输入监理人员',
+        trigger: ['blur']
+    }],
+    director: [{
+        required: true,
+        message: '请输入监理总监',
+        trigger: ['blur']
+    }],
+    engineering_dynamics: [{
+        required: true,
+        message: '请输入工程动态',
+        trigger: ['blur']
+    }],
+    supervision_work: [{
+        required: true,
+        message: '请输入监理工作',
+        trigger: ['blur']
+    }],
+    construction_situation: [{
+        required: true,
+        message: '请输入安全文明施工情况',
+        trigger: ['blur']
+    }],
+    other_matters: [{
+        required: true,
+        message: '请输入其他事项',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+const getDetail = async (row: Record<string, any>) => {
+
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apisupervision_witness_sampling_detail(data)
+        : await apisupervision_witness_sampling_detail(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/supervision_witness_sampling_detail/index.vue b/src/views/supervision_witness_sampling_detail/index.vue
new file mode 100644
index 0000000..b826c5d
--- /dev/null
+++ b/src/views/supervision_witness_sampling_detail/index.vue
@@ -0,0 +1,130 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="来源单据" prop="material_entry_id">
+                    <el-input class="w-[280px]" v-model="queryParams.material_entry_id" clearable placeholder="请输入来源单据" />
+                </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="witness">
+                    <el-input class="w-[280px]" v-model="queryParams.witness" clearable placeholder="请输入见证人" />
+                </el-form-item>
+                <el-form-item label="取样人" prop="sampler">
+                    <el-input class="w-[280px]" v-model="queryParams.sampler" clearable placeholder="请输入取样人" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['supervision_work.supervision_witness_sampling/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['supervision_work.supervision_witness_sampling/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="材料名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="型号" prop="model" show-overflow-tooltip />
+                    <el-table-column label="取样时间" prop="sampling_date" show-overflow-tooltip />
+                    <el-table-column label="进场数量" prop="entry_number" show-overflow-tooltip />
+                    <el-table-column label="进场日期" prop="enter_time" show-overflow-tooltip />
+                    <el-table-column label="检验结果" prop="check_result_text" show-overflow-tooltip />
+                    <el-table-column label="问题数量" prop="check_result_text" show-overflow-tooltip />
+                    <el-table-column label="回复数量" prop="check_result_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['supervision_work.supervision_witness_sampling/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                检验结果
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionWitnessSamplingLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionWitnessSamplingListsDetail, apiSupervisionWitnessSamplingDelete } from '@/api/supervision_witness_sampling'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import { useRoute } from "vue-router"
+
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const route = useRoute()
+
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    material_entry_id: '',
+    code: '',
+    witness: '',
+    sampler: '',
+    witness_sampling_id: route.query.id || ""
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('problem_cate')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionWitnessSamplingListsDetail,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiSupervisionWitnessSamplingDelete({ id })
+    getLists()
+}
+// 明细
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_work_contact/edit.vue b/src/views/supervision_work_contact/edit.vue
index f8a110d..0a3060e 100644
--- a/src/views/supervision_work_contact/edit.vue
+++ b/src/views/supervision_work_contact/edit.vue
@@ -1,36 +1,74 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="项目id" prop="project_id">
-                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
-                </el-form-item>
-                <el-form-item label="联系编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入联系编号" />
-                </el-form-item>
-                <el-form-item label="发起人" prop="initiator">
-                    <el-input v-model="formData.initiator" clearable placeholder="请输入发起人" />
-                </el-form-item>
-                <el-form-item label="发起日期" prop="initiation_date">
-                    <el-input v-model="formData.initiation_date" clearable placeholder="请输入发起日期" />
-                </el-form-item>
-                <el-form-item label="主题" prop="theme">
-                    <el-input v-model="formData.theme" clearable placeholder="请输入主题" />
-                </el-form-item>
-                <el-form-item label="抄送人员" prop="copy_user">
-                    <el-input v-model="formData.copy_user" clearable placeholder="请输入抄送人员" />
-                </el-form-item>
-                <el-form-item label="附件" prop="annex">
-                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                </el-form-item>
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_id">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="联系编号">
+                            <el-input v-model="formData.code" clearable placeholder="系统自动生成" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="发起人" prop="initiator">
+                            <el-input v-model="formData.initiator" clearable placeholder="请输入发起人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="发起日期" prop="initiation_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.initiation_date" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择时间">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="主题" prop="theme">
+                            <el-input v-model="formData.theme" clearable placeholder="请输入主题" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="抄送人员" prop="copy_user">
+                            <el-input v-model="formData.copy_user" clearable placeholder="请输入抄送人员" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="附件" prop="annex">
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                    <supervision_project @customEvent="customEvent"></supervision_project>
+                </el-dialog>
             </el-form>
+            <div style="margin-bottom: 30px;">通知问题</div>
+            <div style="margin-bottom: 30px;">
+                <el-table :data="formData.problem">
+                    <el-table-column label="序号" width="150px">
+                        <template #default="{ row }">
+                            <el-button @click="handleAdd1()">+</el-button>
+                            <el-button @click="handleDelete1(row)">-</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="问题名称" prop="problem_name">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_name" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="问题说明" prop="problem_description">
+                        <template #default="{ row }">
+                            <el-input v-model="row.problem_description" />
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+            </div>
         </popup>
     </div>
 </template>
@@ -38,7 +76,7 @@
 <script lang="ts" setup name="supervisionWorkContactEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiSupervisionWorkContactAdd, apiSupervisionWorkContactEdit, apiSupervisionWorkContactDetail } from '@/api/supervision_work_contact'
+import { apiSupervisionWorkContactAdd, apiSupervisionWorkContactEdit, apiSupervisionWorkContactDetail, apisupervision_work_contact_problem, apisupervision_work_contact_problem_delete } from '@/api/supervision_work_contact'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -51,6 +89,7 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const showDialog = ref(false)
 
 
 // 弹窗标题
@@ -58,17 +97,51 @@ const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑工程监理--监理工作联系单' : '新增工程监理--监理工作联系单'
 })
 
+const handleAvatarSuccess_four = (response: any) => {
+    Array.isArray(formData.annex) ? '' : 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 formData = reactive({
     id: '',
     project_id: '',
+    project_name: '',
     code: '',
     initiator: '',
     initiation_date: '',
     theme: '',
     copy_user: '',
     annex: '',
+    problem: [{
+        "problem_name": "",
+        "problem_description": "",
+    }]
 })
+const customEvent = (e) => {
+    formData.project_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+}
+const handleAdd1 = () => {
+    formData.problem.push({
+        "problem_name": "",
+        "problem_description": ""
+    })
+}
+const handleDelete1 = async (row: any) => {
+    if (row.id) {
+        await apisupervision_work_contact_problem_delete({ id: row.id })
+        const index = formData.problem.indexOf(row);
+        formData.problem.splice(index, 1);
+    } else {
+        const index = formData.problem.indexOf(row);
+        formData.problem.splice(index, 1);
+    }
+}
 
 
 // 表单验证
@@ -114,8 +187,9 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+    let res = await apisupervision_work_contact_problem({ work_contact_id: formData.id })
+    formData.problem = res.lists
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -129,9 +203,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiSupervisionWorkContactEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiSupervisionWorkContactEdit(data)
         : await apiSupervisionWorkContactAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/supervision_work_contact/index.vue b/src/views/supervision_work_contact/index.vue
index 460f7a7..dcd8d55 100644
--- a/src/views/supervision_work_contact/index.vue
+++ b/src/views/supervision_work_contact/index.vue
@@ -1,14 +1,7 @@
 <template>
     <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 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>
@@ -34,46 +27,34 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['supervision_work.supervision_work_contact/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['supervision_work.supervision_work_contact/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <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="code" show-overflow-tooltip />
                     <el-table-column label="发起人" prop="initiator" show-overflow-tooltip />
                     <el-table-column label="发起日期" prop="initiation_date" show-overflow-tooltip />
                     <el-table-column label="主题" prop="theme" show-overflow-tooltip />
                     <el-table-column label="抄送人员" prop="copy_user" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['supervision_work.supervision_work_contact/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['supervision_work.supervision_work_contact/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['supervision_work.supervision_work_contact/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['supervision_work.supervision_work_contact/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
             </div>
-            <div class="flex mt-4 justify-end">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
@@ -84,7 +65,7 @@
 <script lang="ts" setup name="supervisionWorkContactLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionWorkContactLists, apiSupervisionWorkContactDelete } from '@/api/supervision_work_contact'
+import { apiSupervisionWorkContactLists, apiSupervisionWorkContactDelete, apiSupervisionWorkContactDetail } from '@/api/supervision_work_contact'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -129,10 +110,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiSupervisionWorkContactDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除