From b410850f68dbe1024d7160551ad2e32597fdb760 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 1 Mar 2024 21:37:55 +0800
Subject: [PATCH] add

---
 src/api/supervision_accept.ts                 |   4 +-
 .../supervision_material_parallel_testing.ts  |  26 +++
 src/api/supervision_notice.ts                 |  26 +++
 src/api/supervision_test_blocks_specimens.ts  |  26 +++
 src/api/supervision_witness_sampling.ts       |  26 +++
 src/api/supervision_work_contact.ts           |  26 +++
 src/views/supervision_accept/edit.vue         | 200 -----------------
 src/views/supervision_accept/index.vue        |  65 +++++-
 .../edit.vue                                  | 167 ++++++++++++++
 .../index.vue                                 | 130 +++++++++++
 src/views/supervision_notice/edit.vue         | 198 +++++++++++++++++
 src/views/supervision_notice/index.vue        | 144 +++++++++++++
 .../edit.vue                                  | 203 ++++++++++++++++++
 .../index.vue                                 | 156 ++++++++++++++
 .../supervision_witness_sampling/edit.vue     | 167 ++++++++++++++
 .../supervision_witness_sampling/index.vue    | 148 +++++++++++++
 src/views/supervision_work_contact/edit.vue   | 158 ++++++++++++++
 src/views/supervision_work_contact/index.vue  | 147 +++++++++++++
 18 files changed, 1812 insertions(+), 205 deletions(-)
 create mode 100644 src/api/supervision_material_parallel_testing.ts
 create mode 100644 src/api/supervision_notice.ts
 create mode 100644 src/api/supervision_test_blocks_specimens.ts
 create mode 100644 src/api/supervision_witness_sampling.ts
 create mode 100644 src/api/supervision_work_contact.ts
 create mode 100644 src/views/supervision_material_parallel_testing/edit.vue
 create mode 100644 src/views/supervision_material_parallel_testing/index.vue
 create mode 100644 src/views/supervision_notice/edit.vue
 create mode 100644 src/views/supervision_notice/index.vue
 create mode 100644 src/views/supervision_test_blocks_specimens/edit.vue
 create mode 100644 src/views/supervision_test_blocks_specimens/index.vue
 create mode 100644 src/views/supervision_witness_sampling/edit.vue
 create mode 100644 src/views/supervision_witness_sampling/index.vue
 create mode 100644 src/views/supervision_work_contact/edit.vue
 create mode 100644 src/views/supervision_work_contact/index.vue

diff --git a/src/api/supervision_accept.ts b/src/api/supervision_accept.ts
index e5d322f..d4f71de 100644
--- a/src/api/supervision_accept.ts
+++ b/src/api/supervision_accept.ts
@@ -34,4 +34,6 @@ export function apisupervision_accept_result_delete(params: any) {
     return request.post({ url: '/supervision_work.supervision_accept_result/delete', params })
 }
 
-
+export function apisupervision_accept(params: any) {
+    return request.post({ url: '/supervision_work.supervision_accept/accept', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_material_parallel_testing.ts b/src/api/supervision_material_parallel_testing.ts
new file mode 100644
index 0000000..6d6feca
--- /dev/null
+++ b/src/api/supervision_material_parallel_testing.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--材料平行检验列表
+export function apiSupervisionMaterialParallelTestingLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_material_parallel_testing/lists', params })
+}
+
+// 添加工程监理--材料平行检验
+export function apiSupervisionMaterialParallelTestingAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_material_parallel_testing/add', params })
+}
+
+// 编辑工程监理--材料平行检验
+export function apiSupervisionMaterialParallelTestingEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_material_parallel_testing/edit', params })
+}
+
+// 删除工程监理--材料平行检验
+export function apiSupervisionMaterialParallelTestingDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_material_parallel_testing/delete', params })
+}
+
+// 工程监理--材料平行检验详情
+export function apiSupervisionMaterialParallelTestingDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_material_parallel_testing/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_notice.ts b/src/api/supervision_notice.ts
new file mode 100644
index 0000000..577e63d
--- /dev/null
+++ b/src/api/supervision_notice.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--监理通知单列表
+export function apiSupervisionNoticeLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_notice/lists', params })
+}
+
+// 添加工程监理--监理通知单
+export function apiSupervisionNoticeAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_notice/add', params })
+}
+
+// 编辑工程监理--监理通知单
+export function apiSupervisionNoticeEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_notice/edit', params })
+}
+
+// 删除工程监理--监理通知单
+export function apiSupervisionNoticeDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_notice/delete', params })
+}
+
+// 工程监理--监理通知单详情
+export function apiSupervisionNoticeDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_notice/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_test_blocks_specimens.ts b/src/api/supervision_test_blocks_specimens.ts
new file mode 100644
index 0000000..696aa1f
--- /dev/null
+++ b/src/api/supervision_test_blocks_specimens.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--试块试件见证列表
+export function apiSupervisionTestBlocksSpecimensLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_test_blocks_specimens/lists', params })
+}
+
+// 添加工程监理--试块试件见证
+export function apiSupervisionTestBlocksSpecimensAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_test_blocks_specimens/add', params })
+}
+
+// 编辑工程监理--试块试件见证
+export function apiSupervisionTestBlocksSpecimensEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_test_blocks_specimens/edit', params })
+}
+
+// 删除工程监理--试块试件见证
+export function apiSupervisionTestBlocksSpecimensDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_test_blocks_specimens/delete', params })
+}
+
+// 工程监理--试块试件见证详情
+export function apiSupervisionTestBlocksSpecimensDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_test_blocks_specimens/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_witness_sampling.ts b/src/api/supervision_witness_sampling.ts
new file mode 100644
index 0000000..5af333f
--- /dev/null
+++ b/src/api/supervision_witness_sampling.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--见证取样列表
+export function apiSupervisionWitnessSamplingLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_witness_sampling/lists', params })
+}
+
+// 添加工程监理--见证取样
+export function apiSupervisionWitnessSamplingAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_witness_sampling/add', params })
+}
+
+// 编辑工程监理--见证取样
+export function apiSupervisionWitnessSamplingEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_witness_sampling/edit', params })
+}
+
+// 删除工程监理--见证取样
+export function apiSupervisionWitnessSamplingDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_witness_sampling/delete', params })
+}
+
+// 工程监理--见证取样详情
+export function apiSupervisionWitnessSamplingDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_witness_sampling/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_work_contact.ts b/src/api/supervision_work_contact.ts
new file mode 100644
index 0000000..26c52d0
--- /dev/null
+++ b/src/api/supervision_work_contact.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--监理工作联系单列表
+export function apiSupervisionWorkContactLists(params: any) {
+    return request.get({ url: '/supervision_work.supervision_work_contact/lists', params })
+}
+
+// 添加工程监理--监理工作联系单
+export function apiSupervisionWorkContactAdd(params: any) {
+    return request.post({ url: '/supervision_work.supervision_work_contact/add', params })
+}
+
+// 编辑工程监理--监理工作联系单
+export function apiSupervisionWorkContactEdit(params: any) {
+    return request.post({ url: '/supervision_work.supervision_work_contact/edit', params })
+}
+
+// 删除工程监理--监理工作联系单
+export function apiSupervisionWorkContactDelete(params: any) {
+    return request.post({ url: '/supervision_work.supervision_work_contact/delete', params })
+}
+
+// 工程监理--监理工作联系单详情
+export function apiSupervisionWorkContactDetail(params: any) {
+    return request.get({ url: '/supervision_work.supervision_work_contact/detail', params })
+}
\ No newline at end of file
diff --git a/src/views/supervision_accept/edit.vue b/src/views/supervision_accept/edit.vue
index a747c88..4126492 100644
--- a/src/views/supervision_accept/edit.vue
+++ b/src/views/supervision_accept/edit.vue
@@ -1,203 +1,3 @@
-<!-- <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="accept_code">
-                    <el-input v-model="formData.accept_code" clearable placeholder="请输入验收编号" />
-                </el-form-item>
-                <el-form-item label="验收类型" prop="accept_type">
-                    <el-input v-model="formData.accept_type" clearable placeholder="请输入验收类型" />
-                </el-form-item>
-                <el-form-item label="单位工程" prop="check_item_id">
-                    <el-input v-model="formData.check_item_id" clearable placeholder="请输入单位工程" />
-                </el-form-item>
-                <el-form-item label="验收内容" prop="accept_content">
-                    <el-input v-model="formData.accept_content" clearable placeholder="请输入验收内容" />
-                </el-form-item>
-                <el-form-item label="验收位置" prop="accept_position">
-                    <el-input v-model="formData.accept_position" clearable placeholder="请输入验收位置" />
-                </el-form-item>
-                <el-form-item label="验收时间" prop="accept_time">
-                    <el-input v-model="formData.accept_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="accept_result">
-                    <el-input v-model="formData.accept_result" clearable placeholder="请输入验收结果 0-合格 1-不合格" />
-                </el-form-item>
-                <el-form-item label="检查项选择" prop="check_item_detail_ids">
-                    <el-input v-model="formData.check_item_detail_ids" 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="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="supervisionAcceptEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiSupervisionAcceptAdd, apiSupervisionAcceptEdit, apiSupervisionAcceptDetail } from '@/api/supervision_accept'
-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: '',
-    accept_code: '',
-    accept_type: '',
-    check_item_id: '',
-    accept_content: '',
-    accept_position: '',
-    accept_time: '',
-    company_id: '',
-    accept_result: '',
-    check_item_detail_ids: '',
-    remark: '',
-    annex: '',
-    create_user: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    project_id: [{
-        required: true,
-        message: '请选择项目',
-        trigger: ['blur']
-    }],
-    accept_code: [{
-        required: true,
-        message: '请输入验收编号',
-        trigger: ['blur']
-    }],
-    accept_type: [{
-        required: true,
-        message: '请输入验收类型',
-        trigger: ['blur']
-    }],
-    check_item_id: [{
-        required: true,
-        message: '请输入单位工程',
-        trigger: ['blur']
-    }],
-    accept_content: [{
-        required: true,
-        message: '请输入验收内容',
-        trigger: ['blur']
-    }],
-    accept_position: [{
-        required: true,
-        message: '请输入验收位置',
-        trigger: ['blur']
-    }],
-    accept_time: [{
-        required: true,
-        message: '请输入验收时间',
-        trigger: ['blur']
-    }],
-    company_id: [{
-        required: true,
-        message: '请输入施工单位',
-        trigger: ['blur']
-    }],
-    accept_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]
-        }
-    }
-
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiSupervisionAcceptDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData, }
-    mode.value == 'edit'
-        ? await apiSupervisionAcceptEdit(data)
-        : await apiSupervisionAcceptAdd(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> -->
 
 <template>
     <div class="edit-popup">
diff --git a/src/views/supervision_accept/index.vue b/src/views/supervision_accept/index.vue
index 1d81937..a551937 100644
--- a/src/views/supervision_accept/index.vue
+++ b/src/views/supervision_accept/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="accept_code">
                     <el-input class="w-[280px]" v-model="queryParams.accept_code" clearable placeholder="请输入验收编号" />
                 </el-form-item>
@@ -52,6 +49,10 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_work.supervision_accept/accept']" type="primary" link
+                                @click="dialogTableVisible = true, formData.id = row.id" v-if="row.accept_result == 1">
+                                验收
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -61,21 +62,69 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <el-dialog v-model="dialogTableVisible" title="再验收" width="800" @confirm="handleAccept">
+            <!-- <div v-html="htmlContent"></div> -->
+            <el-form ref="formRef" :model="formData" label-width="90px">
+                <el-form-item label="验收结果">
+                    <el-radio-group v-model="formData.accept_result">
+                        <el-radio label="0">
+                            合格
+                        </el-radio>
+                        <el-radio label="1">
+                            不合格
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="验收日期">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.accept_time" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择验收时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+                <el-form-item label="附件" prop="project_name">
+                    <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                        @delFile="delFileFn" />
+                </el-form-item>
+                <div class="flex mt-4 justify-end">
+                    <el-button type="primary" @click="handleAccept">确定</el-button>
+                    <el-button @click="dialogTableVisible = false">取消</el-button>
+                </div>
+            </el-form>
+        </el-dialog>
     </div>
 </template>
 
 <script lang="ts" setup name="supervisionAcceptLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete, apiSupervisionAcceptDetail } from '@/api/supervision_accept'
+import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete, apiSupervisionAcceptDetail, apisupervision_accept } from '@/api/supervision_accept'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
+const dialogTableVisible = ref(false)
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
+const formData = reactive({
+    "id": 1,
+    "accept_time": "",
+    "accept_result": 1,
+    "remark": "",
+    "annex": []
+})
+
+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 queryParams = reactive({
@@ -124,6 +173,14 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 验收
+const handleAccept = async (row: Object | any[]) => {
+    await apisupervision_accept({ ...formData })
+    dialogTableVisible.value = false
+    getLists()
+}
+
+
 getLists()
 </script>
 
diff --git a/src/views/supervision_material_parallel_testing/edit.vue b/src/views/supervision_material_parallel_testing/edit.vue
new file mode 100644
index 0000000..e9c1a2d
--- /dev/null
+++ b/src/views/supervision_material_parallel_testing/edit.vue
@@ -0,0 +1,167 @@
+<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="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="inspector">
+                    <el-input v-model="formData.inspector" clearable placeholder="请输入送检人" />
+                </el-form-item>
+                <el-form-item label="送检日期" prop="inspection_date">
+                    <el-input v-model="formData.inspection_date" 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="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="supervisionMaterialParallelTestingEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiSupervisionMaterialParallelTestingAdd, apiSupervisionMaterialParallelTestingEdit, apiSupervisionMaterialParallelTestingDetail } from '@/api/supervision_material_parallel_testing'
+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: '',
+    material_entry_id: '',
+    code: '',
+    inspector: '',
+    inspection_date: '',
+    remark: '',
+    annex: '',
+    create_user: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    material_entry_id: [{
+        required: true,
+        message: '请输入来源单据',
+        trigger: ['blur']
+    }],
+    code: [{
+        required: true,
+        message: '请输入编号',
+        trigger: ['blur']
+    }],
+    inspector: [{
+        required: true,
+        message: '请输入送检人',
+        trigger: ['blur']
+    }],
+    inspection_date: [{
+        required: true,
+        message: '请输入送检日期',
+        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]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiSupervisionMaterialParallelTestingDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiSupervisionMaterialParallelTestingEdit(data) 
+        : await apiSupervisionMaterialParallelTestingAdd(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_parallel_testing/index.vue b/src/views/supervision_material_parallel_testing/index.vue
new file mode 100644
index 0000000..b8b6840
--- /dev/null
+++ b/src/views/supervision_material_parallel_testing/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>
+                    <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_parallel_testing/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['supervision_work.supervision_material_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="项目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="inspector" show-overflow-tooltip />
+                    <el-table-column label="送检日期" prop="inspection_date" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="附件" 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_material_parallel_testing/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                v-perms="['supervision_work.supervision_material_parallel_testing/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="supervisionMaterialParallelTestingLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionMaterialParallelTestingLists, apiSupervisionMaterialParallelTestingDelete } from '@/api/supervision_material_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({
+    
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionMaterialParallelTestingLists,
+    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 apiSupervisionMaterialParallelTestingDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_notice/edit.vue b/src/views/supervision_notice/edit.vue
new file mode 100644
index 0000000..8d77a48
--- /dev/null
+++ b/src/views/supervision_notice/edit.vue
@@ -0,0 +1,198 @@
+<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>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<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 { 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: '',
+    code: '',
+    reply_date: '',
+    company_id: '',
+    notify_user: '',
+    issue_date: '',
+    annex: '',
+    rectification_reply_time: '',
+    rectification_reply_user: '',
+    rectification_reply_opinions: '',
+    rectification_reply_annex: '',
+    create_user: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    code: [{
+        required: true,
+        message: '请输入项目通知编号',
+        trigger: ['blur']
+    }],
+    reply_date: [{
+        required: true,
+        message: '请输入要求回复日期',
+        trigger: ['blur']
+    }],
+    company_id: [{
+        required: true,
+        message: '请输入施工单位',
+        trigger: ['blur']
+    }],
+    notify_user: [{
+        required: true,
+        message: '请输入通知人员',
+        trigger: ['blur']
+    }],
+    issue_date: [{
+        required: true,
+        message: '请输入下达日期',
+        trigger: ['blur']
+    }],
+    rectification_reply_time: [{
+        required: true,
+        message: '请输入整改回复时间',
+        trigger: ['blur']
+    }],
+    rectification_reply_user: [{
+        required: true,
+        message: '请输入整改回复人',
+        trigger: ['blur']
+    }],
+    rectification_reply_opinions: [{
+        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 apiSupervisionNoticeDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiSupervisionNoticeEdit(data) 
+        : await apiSupervisionNoticeAdd(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_notice/index.vue b/src/views/supervision_notice/index.vue
new file mode 100644
index 0000000..d96c69d
--- /dev/null
+++ b/src/views/supervision_notice/index.vue
@@ -0,0 +1,144 @@
+<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="code">
+                    <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入项目通知编号" />
+                </el-form-item>
+                <el-form-item label="通知人员" prop="notify_user">
+                    <el-input class="w-[280px]" v-model="queryParams.notify_user" 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_notice/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <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="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="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>
+                            <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">
+                <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="supervisionNoticeLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionNoticeLists, apiSupervisionNoticeDelete } from '@/api/supervision_notice'
+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: '',
+    code: '',
+    notify_user: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionNoticeLists,
+    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 apiSupervisionNoticeDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_test_blocks_specimens/edit.vue b/src/views/supervision_test_blocks_specimens/edit.vue
new file mode 100644
index 0000000..34c194d
--- /dev/null
+++ b/src/views/supervision_test_blocks_specimens/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="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-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionTestBlocksSpecimensEdit">
+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 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: '',
+    test_type: '',
+    code: '',
+    witness: '',
+    test_site: '',
+    company_id: '',
+    start_date: '',
+    end_date: '',
+    test_result: '',
+    remark: '',
+    annex: '',
+    create_user: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    test_type: [{
+        required: true,
+        message: '请输入试验类型',
+        trigger: ['blur']
+    }],
+    code: [{
+        required: true,
+        message: '请输入编号',
+        trigger: ['blur']
+    }],
+    witness: [{
+        required: true,
+        message: '请输入见证人',
+        trigger: ['blur']
+    }],
+    test_site: [{
+        required: true,
+        message: '请输入试验部位',
+        trigger: ['blur']
+    }],
+    company_id: [{
+        required: true,
+        message: '请输入单位名称',
+        trigger: ['blur']
+    }],
+    start_date: [{
+        required: true,
+        message: '请输入开始日期',
+        trigger: ['blur']
+    }],
+    end_date: [{
+        required: true,
+        message: '请输入结束日期',
+        trigger: ['blur']
+    }],
+    test_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]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiSupervisionTestBlocksSpecimensDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiSupervisionTestBlocksSpecimensEdit(data) 
+        : await apiSupervisionTestBlocksSpecimensAdd(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_test_blocks_specimens/index.vue b/src/views/supervision_test_blocks_specimens/index.vue
new file mode 100644
index 0000000..a7f15dd
--- /dev/null
+++ b/src/views/supervision_test_blocks_specimens/index.vue
@@ -0,0 +1,156 @@
+<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="test_type">
+                    <el-input class="w-[280px]" v-model="queryParams.test_type" 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="test_site">
+                    <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-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_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>
+            <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="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="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="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>
+                            <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">
+                <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="supervisionTestBlocksSpecimensLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete } from '@/api/supervision_test_blocks_specimens'
+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: '',
+    test_type: '',
+    code: '',
+    witness: '',
+    test_site: '',
+    test_result: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionTestBlocksSpecimensLists,
+    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 apiSupervisionTestBlocksSpecimensDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/supervision_witness_sampling/edit.vue b/src/views/supervision_witness_sampling/edit.vue
new file mode 100644
index 0000000..7eab6e6
--- /dev/null
+++ b/src/views/supervision_witness_sampling/edit.vue
@@ -0,0 +1,167 @@
+<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="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-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="supervisionWitnessSamplingEdit">
+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 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: '',
+    material_entry_id: '',
+    code: '',
+    sampling_date: '',
+    witness: '',
+    sampler: '',
+    annex: '',
+    create_user: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    material_entry_id: [{
+        required: true,
+        message: '请输入来源单据',
+        trigger: ['blur']
+    }],
+    code: [{
+        required: true,
+        message: '请输入编号',
+        trigger: ['blur']
+    }],
+    sampling_date: [{
+        required: true,
+        message: '请输入取样日期',
+        trigger: ['blur']
+    }],
+    witness: [{
+        required: true,
+        message: '请输入见证人',
+        trigger: ['blur']
+    }],
+    sampler: [{
+        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 apiSupervisionWitnessSamplingDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiSupervisionWitnessSamplingEdit(data) 
+        : await apiSupervisionWitnessSamplingAdd(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/index.vue b/src/views/supervision_witness_sampling/index.vue
new file mode 100644
index 0000000..aec5eb2
--- /dev/null
+++ b/src/views/supervision_witness_sampling/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="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="项目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="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>
+                            <el-button
+                                v-perms="['supervision_work.supervision_witness_sampling/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="supervisionWitnessSamplingLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionWitnessSamplingLists, apiSupervisionWitnessSamplingDelete } from '@/api/supervision_witness_sampling'
+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: '',
+    material_entry_id: '',
+    code: '',
+    witness: '',
+    sampler: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionWitnessSamplingLists,
+    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
new file mode 100644
index 0000000..f8a110d
--- /dev/null
+++ b/src/views/supervision_work_contact/edit.vue
@@ -0,0 +1,158 @@
+<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>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<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 { 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: '',
+    code: '',
+    initiator: '',
+    initiation_date: '',
+    theme: '',
+    copy_user: '',
+    annex: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    code: [{
+        required: true,
+        message: '请输入联系编号',
+        trigger: ['blur']
+    }],
+    initiator: [{
+        required: true,
+        message: '请输入发起人',
+        trigger: ['blur']
+    }],
+    initiation_date: [{
+        required: true,
+        message: '请输入发起日期',
+        trigger: ['blur']
+    }],
+    theme: [{
+        required: true,
+        message: '请输入主题',
+        trigger: ['blur']
+    }],
+    copy_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 apiSupervisionWorkContactDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiSupervisionWorkContactEdit(data) 
+        : await apiSupervisionWorkContactAdd(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_work_contact/index.vue b/src/views/supervision_work_contact/index.vue
new file mode 100644
index 0000000..460f7a7
--- /dev/null
+++ b/src/views/supervision_work_contact/index.vue
@@ -0,0 +1,147 @@
+<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="code">
+                    <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入联系编号" />
+                </el-form-item>
+                <el-form-item label="发起人" prop="initiator">
+                    <el-input class="w-[280px]" v-model="queryParams.initiator" 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>
+                <el-form-item label="抄送人员" prop="copy_user">
+                    <el-input class="w-[280px]" v-model="queryParams.copy_user" 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_work_contact/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <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="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>
+                            <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">
+                <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="supervisionWorkContactLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiSupervisionWorkContactLists, apiSupervisionWorkContactDelete } from '@/api/supervision_work_contact'
+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: '',
+    code: '',
+    initiator: '',
+    theme: '',
+    copy_user: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiSupervisionWorkContactLists,
+    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 apiSupervisionWorkContactDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+