add

src/views/supervision_company_check/detail.js

@@ -0,0 +1,42 @@
+const detailConfig = {
+    title: "工程监理--公司检查",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "检查名称",
+            value: "name"
+        },
+        {
+            label: "检查日期",
+            value: "date"
+        },
+        {
+            label: "检查人",
+            value: "user"
+        },
+        {
+            label: "问题名称",
+            value: "problem_name",
+        },
+        {
+            label: "问题类型",
+            value: "problem_type"
+        },
+        {
+            label: "问题说明",
+            value: "problem_desc"
+        },
+
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+
+    ]
+
+}
+export default detailConfig;

src/views/supervision_company_check/index.vue

@@ -47,7 +47,7 @@
                     <el-table-column label="整改回复说明" prop="reply_content" show-overflow-tooltip />
                     <el-table-column label="复核意见" prop="review_opinions" show-overflow-tooltip />
                     <el-table-column label="附件" prop="annex" show-overflow-tooltip /> -->
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="150" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_connect.supervision_company_check/edit']" type="primary"
@@ -58,6 +58,10 @@
                                 link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_connect.supervision_company_check/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -67,6 +71,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+            width="30vw" :column="1" />
     </div>
 </template>
 
@@ -77,11 +83,13 @@ import { apiSupervisionCompanyCheckLists, apiSupervisionCompanyCheckDelete, apiS
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
-
+const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
@@ -130,6 +138,14 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionCompanyCheckDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionCompanyCheckDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
 
 getLists()
 </script>

src/views/supervision_dangerous_engineering_case/detail.js

@@ -0,0 +1,44 @@
+const detailConfig = {
+    title: "工程监理--危大方案提交列表",
+    config: [
+        {
+            label: "危大工程监控",
+            value: "dangerous_engineering_monitoring_title"
+        },
+        {
+            label: "方案名称",
+            value: "case_name"
+        },
+        {
+            label: "评审人员",
+            value: "assessor"
+        },
+        {
+            label: "评审内容",
+            value: "review_content"
+        },
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+
+
+    ],
+
+
+}
+export default detailConfig;

src/views/supervision_dangerous_engineering_case/edit.vue

@@ -1,59 +1,22 @@
 <template>
   <div class="edit-popup">
-    <popup
+    <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-      ref="popupRef"
+      <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-      :title="popupTitle"
+        <el-form-item label="危大工程监控" prop="dangerous_engineering_monitoring_title">
-      :async="true"
+          <el-input v-model="formData.dangerous_engineering_monitoring_title" clearable readonly
-      width="550px"
+            @click="showDialog = true" placeholder="请选择危大工程监控" />
-      @confirm="handleSubmit"
-      @close="handleClose"
-    >
-      <el-form
-        ref="formRef"
-        :model="formData"
-        label-width="120px"
-        :rules="formRules"
-      >
-        <el-form-item
-          label="危大工程监控"
-          prop="dangerous_engineering_monitoring_title"
-        >
-          <el-input
-            v-model="formData.dangerous_engineering_monitoring_title"
-            clearable
-            readonly
-            @click="showDialog = true"
-            placeholder="请选择危大工程监控"
-          />
         </el-form-item>
         <el-form-item label="方案名称" prop="case_name">
-          <el-input
+          <el-input v-model="formData.case_name" clearable placeholder="请输入方案名称" />
-            v-model="formData.case_name"
-            clearable
-            placeholder="请输入方案名称"
-          />
         </el-form-item>
         <el-form-item label="评审人员" prop="assessor">
-          <el-input
+          <el-input v-model="formData.assessor" clearable placeholder="请输入评审人员" />
-            v-model="formData.assessor"
-            clearable
-            placeholder="请输入评审人员"
-          />
         </el-form-item>
         <el-form-item label="评审内容" prop="review_content">
-          <el-input
+          <el-input v-model="formData.review_content" clearable placeholder="请输入评审内容" />
-            v-model="formData.review_content"
-            clearable
-            placeholder="请输入评审内容"
-          />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input
+          <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
-            v-model="formData.remark"
-            clearable
-            placeholder="请输入备注"
-            type="textarea"
-          />
         </el-form-item>
         <createUserLable :formData="formData"></createUserLable>
 
@@ -62,10 +25,7 @@
         </el-form-item>
       </el-form>
       <el-dialog v-model="showDialog" title="选择危大工程监控" width="70%">
-        <dialogTable
+        <dialogTable :config="supervision_dangerous_engineering_monitoring" @customEvent="customEvent">
-          :config="supervision_dangerous_engineering_monitoring"
-          @customEvent="customEvent"
-        >
         </dialogTable>
       </el-dialog>
     </popup>

src/views/supervision_dangerous_engineering_case/index.vue

@@ -34,7 +34,7 @@
                     <el-table-column label="方案名称" prop="case_name" show-overflow-tooltip />
                     <el-table-column label="评审人员" prop="assessor" show-overflow-tooltip />
                     <el-table-column label="分部分项工程" prop="partial_project" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="150" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_dangerous.supervision_dangerous_engineering_case/edit']"
@@ -45,6 +45,10 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_dangerous.supervision_dangerous_engineering_case/detail']"
+                                link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -54,6 +58,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+            width="30vw" :column="1" />
     </div>
 </template>
 
@@ -67,10 +73,14 @@ import EditPopup from './edit.vue'
 import { useRoute } from "vue-router"
 import { onMounted } from 'vue'
 const route = useRoute()
+import detailConfig from './detail'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
+
 
 
 // 查询条件
@@ -119,6 +129,17 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionDangerousEngineeringCaseDelete({ id })
     getLists()
 }
+
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionDangerousEngineeringCaseDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
 getLists()
 
 onMounted(async () => {

src/views/supervision_dangerous_engineering_construction/detail.js

@@ -0,0 +1,25 @@
+const detailConfig = {
+    title: "工程监理--危大工程施工列表",
+    config: [
+        {
+            label: "危大工程监控",
+            value: "project_name"
+        },
+        {
+            label: "实际施工日期",
+            value: "actual_construction_date"
+        },
+        {
+            label: "是否告知",
+            value: "is_notice_text"
+        },
+
+        {
+            label: "告知人员",
+            value: "notice_user",
+        },
+    ],
+
+
+}
+export default detailConfig;

src/views/supervision_dangerous_engineering_construction/index.vue

@@ -39,7 +39,7 @@
                     <el-table-column label="告知人员" prop="notice_user" show-overflow-tooltip />
                     <el-table-column label="危大工程类型" prop="type" show-overflow-tooltip />
                     <el-table-column label="施工部位" prop="position" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="150" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button
@@ -52,6 +52,11 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button
+                                v-perms="['supervision_dangerous.supervision_dangerous_engineering_construction/detail']"
+                                link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -61,22 +66,28 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+            width="30vw" :column="1" />
     </div>
 </template>
 
 <script lang="ts" setup name="supervisionDangerousEngineeringConstructionLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionDangerousEngineeringConstructionLists, apiSupervisionDangerousEngineeringConstructionDelete } from '@/api/supervision_dangerous_engineering_construction'
+import { apiSupervisionDangerousEngineeringConstructionLists, apiSupervisionDangerousEngineeringConstructionDelete, apiSupervisionDangerousEngineeringConstructionDetail } from '@/api/supervision_dangerous_engineering_construction'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import { useRoute } from "vue-router"
 import { onMounted } from 'vue'
 const route = useRoute()
+import detailConfig from './detail'
+
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -124,6 +135,14 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionDangerousEngineeringConstructionDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionDangerousEngineeringConstructionDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
 
 onMounted(async () => {
     if (route.query?.id) {

src/views/supervision_dangerous_engineering_eliminate/detail.js

@@ -0,0 +1,28 @@
+const detailConfig = {
+    title: "工程监理--危大工程消除列表",
+    config: [
+        {
+            label: "危大工程监控",
+            value: "project_name"
+        },
+        {
+            label: "危险消除日期",
+            value: "eliminate_date"
+        },
+        {
+            label: "消除人",
+            value: "eliminate_user"
+        },
+        {
+            label: "是否告知",
+            value: "is_notice_text"
+        },
+        {
+            label: "告知人员",
+            value: "notice_user",
+        },
+    ],
+
+
+}
+export default detailConfig;

src/views/supervision_dangerous_engineering_eliminate/edit.vue

@@ -4,8 +4,8 @@
             @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-form-item label="危大工程监控" prop="dangerous_engineering_monitoring_title">
-                    <el-input v-model="formData.dangerous_engineering_monitoring_title" clearable readonly
+                    <el-input v-model="formData.project_name" clearable readonly @click="showDialog = true"
-                        @click="showDialog = true" placeholder="请选择危大工程监控" />
+                        placeholder="请选择危大工程监控" />
                 </el-form-item>
                 <el-form-item label="危险消除日期" prop="eliminate_date">
                     <el-date-picker class="flex-1 !flex" v-model="formData.eliminate_date" clearable
@@ -61,7 +61,7 @@ const popupTitle = computed(() => {
 const formData = reactive({
     id: '',
     dangerous_engineering_monitoring_id: '',
-    dangerous_engineering_monitoring_title: "",
+    project_name: "",
     eliminate_date: '',
     eliminate_user: '',
     is_notice: '',
@@ -70,7 +70,7 @@ const formData = reactive({
 
 const customEvent = (e: any) => {
     formData.dangerous_engineering_monitoring_id = e.id
-    formData.dangerous_engineering_monitoring_title = e.project_name
+    formData.project_name = e.project_name
     showDialog.value = false
 
 }

src/views/supervision_dangerous_engineering_eliminate/index.vue

@@ -35,7 +35,7 @@
                     <el-table-column label="消除人" prop="eliminate_user" show-overflow-tooltip />
                     <el-table-column label="是否告知" prop="is_notice_text" show-overflow-tooltip />
                     <el-table-column label="施工部位" prop="position" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="150" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button
@@ -48,6 +48,11 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button
+                                v-perms="['supervision_dangerous.supervision_dangerous_engineering_eliminate/detail']"
+                                link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -57,6 +62,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+            width="30vw" :column="1" />
     </div>
 </template>
 
@@ -70,9 +77,13 @@ import EditPopup from './edit.vue'
 import { useRoute } from "vue-router"
 import { onMounted } from 'vue'
 const route = useRoute()
+import detailConfig from './detail'
+
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -122,6 +133,16 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionDangerousEngineeringEliminateDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
 getLists()
 onMounted(async () => {
     if (route.query?.id) {

src/views/supervision_dangerous_engineering_monitoring/detail.js

@@ -0,0 +1,45 @@
+const detailConfig = {
+    title: "工程监理--第一次工地会议",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "危大工程类型",
+            value: "type_text"
+        },
+        {
+            label: "分部分项工程",
+            value: "partial_project_text"
+        },
+        {
+            label: "计划施工时间",
+            value: "planned_construction_time"
+        },
+        {
+            label: "单位工程",
+            value: "node_name"
+        },
+        {
+            label: "施工部位",
+            value: "position"
+        },
+        {
+            label: "本项目特征",
+            value: "project_characteristics"
+        },
+        {
+            label: "上级监管人员",
+            value: "supervisor"
+        },
+        {
+            label: "负责人",
+            value: "responsible_person"
+        },
+
+    ],
+
+
+}
+export default detailConfig;

src/views/supervision_dangerous_engineering_monitoring/index.vue

@@ -59,6 +59,11 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button
+                                v-perms="['supervision_dangerous.supervision_dangerous_engineering_monitoring/detail']"
+                                link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                             <router-link
                                 v-perms="['supervision_dangerous.supervision_dangerous_engineering_monitoring/submit']"
                                 :to="{
@@ -98,6 +103,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+            width="30vw" :column="1" />
     </div>
 </template>
 
@@ -108,10 +115,13 @@ import { apiSupervisionDangerousEngineeringMonitoringLists, apiSupervisionDanger
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -162,5 +172,15 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionDangerousEngineeringMonitoringDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
 getLists()
 </script>

src/views/supervision_design_disclosure/index.vue

@@ -66,9 +66,9 @@ import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionDesignDisclosureLists, apiSupervisionDesignDisclosureDelete, apiSupervisionDesignDisclosureDetail } from '@/api/supervision_design_disclosure'
-import detailConfig from './detail'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const detailRef = ref('')

src/views/supervision_device_entry/index.vue

@@ -41,7 +41,7 @@
                     <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="操作" width="120" fixed="right">
+                    <el-table-column label="操作" align="center" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_device_entry/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -64,7 +64,7 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
 
     </div>
 </template>

src/views/supervision_diary/detail.js

@@ -0,0 +1,62 @@
+import { apisupervision_work_contact_problem, } from '@/api/supervision_work_contact'
+
+const detailConfig = {
+    title: "工程监理--监理日记",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "日期",
+            value: "date"
+        },
+        {
+            label: "星期",
+            value: "week"
+        },
+        {
+            label: "气温",
+            value: "air_temperature"
+        },
+        {
+            label: "监理人员",
+            value: "user"
+        },
+
+        {
+            label: "监理总监",
+            value: "director"
+        },
+
+        {
+            label: "工程动态",
+            value: "engineering_dynamics"
+        },
+
+        {
+            label: "监理工作",
+            value: "supervision_work"
+        },
+
+        {
+            label: "安全文明施工情况",
+            value: "construction_situation"
+        },
+        {
+            label: "其他事项",
+            value: "other_matters"
+        },
+
+
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+
+}
+export default detailConfig;

src/views/supervision_diary/index.vue

@@ -42,7 +42,7 @@
                     <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="操作" width="120" fixed="right">
+                    <el-table-column label="操作" align="center" width="150" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_diary/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -52,6 +52,10 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_work.supervision_diary/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -61,6 +65,9 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig"
+            :column="2" width="50vw" />
+
     </div>
 </template>
 
@@ -71,10 +78,14 @@ import { apiSupervisionDiaryLists, apiSupervisionDiaryDelete, apiSupervisionDiar
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -124,6 +135,15 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionDiaryDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionDiaryDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 
 getLists()
 </script>

src/views/supervision_entity_parallel_testing/detail.js

@@ -0,0 +1,87 @@
+import { apisupervision_problem, } from '@/api/supervision_inspection'
+
+const detailConfig = {
+    title: "工程监理--材料平行检验",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "检验主题",
+            value: "theme"
+        },
+        {
+            label: "编号",
+            value: "code"
+        },
+        {
+            label: "工程单位",
+            value: "check_item_name"
+        },
+        {
+            label: "检验部位",
+            value: "position",
+        },
+
+        {
+            label: "开始时间",
+            value: "start_time",
+        },
+        {
+            label: "结束时间",
+            value: "end_time",
+        },
+        {
+            label: "检验结果",
+            value: "result_text",
+        },
+        {
+            label: "检验结果",
+            value: "start_time",
+        },
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+    table: {
+        title: "材料信息",
+        tableConfig: [
+            {
+                label: "问题分类",
+                value: 'problem_cate_text',
+
+            },
+            {
+                label: "问题说明",
+                value: 'problem_description'
+            },
+            {
+                label: "问题名称",
+                value: 'problem_name',
+            },
+        ],
+        fetchFun: apisupervision_problem,
+        query: { 'data_id': '', data_type: 8 }
+    }
+
+
+}
+export default detailConfig;

src/views/supervision_entity_parallel_testing/index.vue

@@ -50,7 +50,7 @@
                     <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">
+                    <el-table-column label="操作" align="center" width="150" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_entity_parallel_testing/edit']"
                                 type="primary" link @click="handleEdit(row)">
@@ -60,6 +60,10 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_work.supervision_entity_parallel_testing/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -69,20 +73,25 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
     </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 { apiSupervisionEntityParallelTestingLists, apiSupervisionEntityParallelTestingDelete, apiSupervisionEntityParallelTestingDetail } from '@/api/supervision_entity_parallel_testing'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -132,6 +141,15 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionEntityParallelTestingDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionEntityParallelTestingDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 
 getLists()
 </script>

src/views/supervision_excess_risk_security_monitoring/detail.js

@@ -0,0 +1,89 @@
+const detailConfig = {
+    title: "工程监理--超规模危险性较大工程安全监控",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "分部分项工程",
+            value: "partial_project_text"
+        },
+        {
+            label: "归属年月",
+            value: "attribution_date"
+        },
+        {
+            label: "本项目特征",
+            value: "project_characteristics"
+        },
+        {
+            label: "计划施工时间",
+            value: "planned_construction_time"
+        },
+        {
+            label: "实际施工时间",
+            value: "actual_construction_time"
+        },
+        {
+            label: "是否已经专家组论证",
+            value: "is_discuss_text"
+        },
+        {
+            label: "是否已按专家意见修改",
+            value: "is_modify_text"
+        },
+        {
+            label: "监理审批是否同意",
+            value: "is_agree_text"
+        },
+        {
+            label: "是否实施验收",
+            value: "is_accept_text"
+        },
+
+        {
+            label: "是否按方案实施验收",
+            value: "is_accept_to_plan_text"
+        },
+
+        {
+            label: "检查人",
+            value: "check_user"
+        },
+
+        {
+            label: "检查时间",
+            value: "check_time"
+        },
+        {
+            label: "存在问题和整改情况",
+            value: "problems_rectification"
+        },
+        {
+            label: "监控责任人",
+            value: "responsible_person"
+        },
+        {
+            label: "是否超控制值",
+            value: "exceed_the_control_value_text"
+        },
+        {
+            label: "控制措施",
+            value: "control_measures"
+        },
+
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+
+    ],
+
+
+}
+export default detailConfig;

src/views/supervision_excess_risk_security_monitoring/index.vue

@@ -43,7 +43,7 @@
                     <el-table-column label="计划施工时间" prop="planned_construction_time" show-overflow-tooltip />
                     <el-table-column label="实际施工时间" prop="actual_construction_time" show-overflow-tooltip />
 
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="150" fixed="right" align="center">
 
                         <template #default="{ row }">
                             <el-button
@@ -56,6 +56,11 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button
+                                v-perms="['supervision_dangerous.supervision_excess_risk_security_monitoring/detail']"
+                                link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -65,6 +70,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+            width="50vw" :column="2" />
     </div>
 </template>
 
@@ -75,10 +82,15 @@ import { apiSupervisionExcessRiskSecurityMonitoringLists, apiSupervisionExcessRi
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
+
 
 
 // 查询条件
@@ -127,6 +139,15 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionExcessRiskSecurityMonitoringDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionExcessRiskSecurityMonitoringDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 
 getLists()
 </script>

src/views/supervision_high_risk_security_monitoring/detail.js

@@ -0,0 +1,85 @@
+const detailConfig = {
+    title: "工程监理--危险性较大的工程安全监控",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "分部分项工程",
+            value: "partial_project_text"
+        },
+        {
+            label: "归属年月",
+            value: "attribution_date"
+        },
+        {
+            label: "本项目特征",
+            value: "project_characteristics"
+        },
+        {
+            label: "计划施工时间",
+            value: "planned_construction_time"
+        },
+        {
+            label: "实际施工时间",
+            value: "actual_construction_time"
+        },
+        {
+            label: "施工方案是否上报监理",
+            value: "is_report_text"
+        },
+        {
+            label: "监理审批是否同意",
+            value: "is_agree_text"
+        },
+        {
+            label: "是否实施验收",
+            value: "is_accept_text"
+        },
+        {
+            label: "是否按方案实施验收",
+            value: "is_accept_to_plan_text"
+        },
+        {
+            label: "检查人",
+            value: "check_user"
+        },
+        {
+            label: "检查时间",
+            value: "check_time"
+        },
+        {
+            label: "存在问题和整改情况",
+            value: "problems_rectification"
+        }, {
+            label: "项目部监控责任人",
+            value: "responsible_person"
+        },
+        {
+            label: "是否超控制值",
+            value: "exceed_the_control_value_text"
+        },
+        {
+            label: "是否超预警值",
+            value: "exceed_the_warning_value_text"
+        },
+        {
+            label: "控制措施",
+            value: "control_measures"
+        },
+
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+
+    ],
+
+
+}
+export default detailConfig;

src/views/supervision_high_risk_security_monitoring/index.vue

@@ -41,7 +41,7 @@
                     <el-table-column label="归属年月" prop="attribution_date" show-overflow-tooltip />
                     <el-table-column label="本项目特征" prop="project_characteristics" show-overflow-tooltip />
                     <el-table-column label="计划施工时间" prop="planned_construction_time" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button
@@ -54,6 +54,11 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button
+                                v-perms="['supervision_dangerous.supervision_high_risk_security_monitoring/detail']"
+                                link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -63,6 +68,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+            width="50vw" :column="2" />
     </div>
 </template>
 
@@ -73,11 +80,14 @@ import { apiSupervisionHighRiskSecurityMonitoringLists, apiSupervisionHighRiskSe
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
-
+const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
@@ -125,6 +135,15 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionHighRiskSecurityMonitoringDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionHighRiskSecurityMonitoringDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 
 getLists()
 </script>

src/views/supervision_large_equipment/index.vue

@@ -77,7 +77,7 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
     </div>
 </template>
 

src/views/supervision_large_mechanical_equipment/detail.js

@@ -0,0 +1,115 @@
+import { apisupervision_large_mechanical_equipment_maintenance_record } from '@/api/supervision_large_mechanical_equipment'
+
+
+const detailConfig = {
+    title: "工程监理--监理工作联系单",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "序号",
+            value: "sn"
+        },
+        {
+            label: "大型机械设备及仪器具",
+            value: "name"
+        },
+        {
+            label: "使用部位",
+            value: "use_site"
+        },
+        {
+            label: "进场时间",
+            value: "entry_time",
+        },
+
+        {
+            label: "报审单位名称",
+            value: "company_name",
+        },
+        {
+            label: "报审日期",
+            value: "approval_date",
+        },
+        {
+            label: "报审结果",
+            value: "approval_result",
+        },
+        {
+            label: "报审表编号",
+            value: "approval_form_code",
+        },
+        {
+            label: "报审类型",
+            value: "approval_type_text",
+        },
+        {
+            label: "报审类型",
+            value: "approval_type_text",
+        },
+        {
+            label: "专监初审意见",
+            value: "first_audit_opinion_text",
+        },
+        {
+            label: "初审人",
+            value: "first_auditor",
+        },
+        {
+            label: "初审时间",
+            value: "first_audit_time",
+        },
+        {
+            label: "总监审定结论",
+            value: "final_audit_opinion_text",
+        },
+        {
+            label: "审定时间",
+            value: "final_audit_time",
+        },
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+    table: {
+        title: "机械维修保养记录",
+        tableConfig: [
+            {
+                label: "登记日期",
+                value: 'reg_date',
+            },
+            {
+                label: "机械每月维修保养附件",
+                value: 'month_warranty_file'
+            },
+            {
+                label: "设备维保有效期",
+                value: 'maintenance_period',
+            },
+            {
+                label: "附配件1有效期",
+                value: 'accessory_one_validity',
+            },
+            {
+                label: "附配件2有效期",
+                value: 'accessory_two_validity',
+            },
+        ],
+        fetchFun: apisupervision_large_mechanical_equipment_maintenance_record,
+        query: 'large_mechanical_equipment_id'
+    }
+
+
+}
+export default detailConfig;

src/views/supervision_large_mechanical_equipment/index.vue

@@ -76,7 +76,7 @@
                     <el-table-column label="总监审定结论" prop="final_audit_opinion_text" show-overflow-tooltip />
                     <el-table-column label="审定时间" prop="final_audit_time" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="150" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_dangerous.supervision_large_mechanical_equipment/edit']"
@@ -87,6 +87,10 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_dangerous.supervision_large_mechanical_equipment/detail']"
+                                link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -96,20 +100,27 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
+
     </div>
 </template>
 
 <script lang="ts" setup name="supervisionLargeMechanicalEquipmentLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionLargeMechanicalEquipmentLists, apiSupervisionLargeMechanicalEquipmentDelete } from '@/api/supervision_large_mechanical_equipment'
+import { apiSupervisionLargeMechanicalEquipmentLists, apiSupervisionLargeMechanicalEquipmentDelete, apiSupervisionLargeMechanicalEquipmentDetail } from '@/api/supervision_large_mechanical_equipment'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
+
 
 
 // 查询条件
@@ -161,6 +172,15 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionLargeMechanicalEquipmentDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionLargeMechanicalEquipmentDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 
 getLists()
 </script>

src/views/supervision_material_equipment_info/index.vue

@@ -97,7 +97,7 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig"
             width="30vw" :column="1" />
     </div>
 </template>
@@ -105,7 +105,7 @@
 <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 { apiSupervisionMaterialEquipmentInfoLists, apiSupervisionMaterialEquipmentInfoDelete, apiSupervisionMaterialEquipmentInfoDetail } from '@/api/supervision_material_equipment_info'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'

src/views/supervision_material_parallel_testing/detail.js

@@ -0,0 +1,98 @@
+import { apisupervision_material_entry_detail } from '@/api/supervision_material_entry'
+
+const detailConfig = {
+    title: "工程监理--材料平行检验",
+    config: [
+        {
+            label: "来源单据",
+            value: "material_entry_name"
+        },
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "送检日期",
+            value: "inspection_date"
+        },
+        {
+            label: "送检人",
+            value: "inspector"
+        },
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+    table: {
+        title: "材料信息",
+        tableConfig: [
+            {
+                label: "材料名称",
+                value: 'name',
+
+            },
+            {
+                label: "材料品牌",
+                value: 'brand'
+            },
+            {
+                label: "单位",
+                value: 'unit',
+            },
+            {
+                label: "是否合同约定品牌",
+                value: 'contract_brand',
+                select: [
+                    {
+                        name: "否",
+                        value: 0
+                    },
+                    {
+                        name: "是",
+                        value: 1
+                    }
+                ]
+            },
+            {
+                label: "型号",
+                value: 'model',
+            },
+            {
+                label: "进场数量",
+                value: 'entry_number',
+            },
+            {
+                label: "检验数量",
+                value: 'num',
+            },
+        ],
+        fetchFun: apisupervision_material_entry_detail,
+        query: { 'data_id': '', data_type: 6 }
+    }
+
+
+}
+export default detailConfig;

src/views/supervision_material_parallel_testing/edit.vue

@@ -34,13 +34,10 @@
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                         </el-form-item>
                     </el-col>
-
                     <createUserLable :formData="formData" flag></createUserLable>
-
                     <el-col :span="8">
                         <el-form-item label="附件" prop="annex">
                             <uploadAnnex :formData="formData"></uploadAnnex>
-
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -76,7 +73,7 @@ const showDialog2 = ref(false)
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑工程监理--见证取样' : '新增工程监理--见证取样'
+    return mode.value == 'edit' ? '编辑工程监理--材料平行检验' : '新增工程监理--材料平行检验'
 })
 
 // 表单数据

src/views/supervision_material_parallel_testing/index.vue

@@ -43,7 +43,7 @@
                     <el-table-column label="送检人" prop="inspector" show-overflow-tooltip />
                     <el-table-column label="送检日期" prop="inspection_date" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" align="center" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_material_parallel_testing/edit']"
                                 type="primary" link @click="handleEdit(row)">
@@ -53,6 +53,11 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_work.supervision_material_parallel_testing/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
+
                             <router-link :to="{
                 path: '/supervision/supervision_work/supervision_material_parallel_testing_detail',
                 query: { id: row.id }
@@ -70,6 +75,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
+
     </div>
 </template>
 
@@ -81,10 +88,15 @@ import { apiSupervisionMaterialEntrySearch } from '@/api/supervision_material_en
 import { apiSupervisionMaterialParallelTestingLists, apiSupervisionMaterialParallelTestingDelete, apiSupervisionMaterialParallelTestingDetail } from '@/api/supervision_material_parallel_testing'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
+
 
 
 // 查询条件
@@ -134,6 +146,14 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionMaterialParallelTestingDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionMaterialParallelTestingDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
 
 getLists()
 </script>

src/views/supervision_meeting_minutes/detail.js

@@ -0,0 +1,64 @@
+import { apisupervision_work_contact_problem, } from '@/api/supervision_work_contact'
+
+const detailConfig = {
+    title: "工程监理--会议纪要",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "会议主题",
+            value: "theme"
+        },
+        {
+            label: "会议类型",
+            value: "type"
+        },
+        {
+            label: "会议时间",
+            value: "time"
+        },
+        {
+            label: "主持人",
+            value: "emcee"
+        },
+
+        {
+            label: "记录人",
+            value: "recorder"
+        },
+
+        {
+            label: "会议地点",
+            value: "location"
+        },
+
+        {
+            label: "与会人员",
+            value: "attendees"
+        },
+
+        {
+            label: "会议内容",
+            value: "content"
+        },
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+
+}
+export default detailConfig;

src/views/supervision_meeting_minutes/index.vue

@@ -46,7 +46,7 @@
                     <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="操作" width="120" fixed="right">
+                    <el-table-column label="操作" align="center" width="150" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_meeting_minutes/edit']" type="primary"
                                 link @click="handleEdit(row)">
@@ -56,6 +56,10 @@
                                 link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_work.supervision_meeting_minutes/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -65,20 +69,26 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig"
+            :column="2" width="50vw" />
     </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 { apiSupervisionMeetingMinutesLists, apiSupervisionMeetingMinutesDelete, apiSupervisionMeetingMinutesDetail } from '@/api/supervision_meeting_minutes'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -128,6 +138,14 @@ const handleDelete = async (id: number | any[]) => {
     await apiSupervisionMeetingMinutesDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionMeetingMinutesDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
 
 getLists()
 </script>

src/views/supervision_notice/detail.js

@@ -0,0 +1,71 @@
+import { apisupervision_notice_problem, } from '@/api/supervision_notice'
+const detailConfig = {
+    title: "工程监理--监理通知单",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "项目通知编号",
+            value: "code"
+        },
+        {
+            label: "要求回复日期",
+            value: "reply_date"
+        },
+        {
+            label: "施工单位",
+            value: "company_name"
+        },
+        {
+            label: "通知人员",
+            value: "notify_user",
+        },
+
+        {
+            label: "下达日期",
+            value: "issue_date",
+        },
+
+
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+    table: {
+        title: "材料信息",
+        tableConfig: [
+            {
+                label: "事由描述",
+                value: 'problem_description',
+
+            },
+            {
+                label: "内容描述",
+                value: 'content_description'
+            },
+            {
+                label: "要求描述",
+                value: 'demand_description',
+            },
+        ],
+        fetchFun: apisupervision_notice_problem,
+        query: 'notice_id'
+    }
+
+
+}
+export default detailConfig;

src/views/supervision_notice/index.vue

@@ -48,6 +48,10 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_work.supervision_notice/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                             <el-button v-perms="['supervision_work.supervision_notice/reply']" type="primary" link
                                 @click="handleReply(row)">
                                 回复
@@ -62,18 +66,25 @@
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
         <replyForm v-if="showEdit1" ref="replyRef" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" />
+
     </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 { apiSupervisionNoticeLists, apiSupervisionNoticeDelete, apiSupervisionNoticeDetail } from '@/api/supervision_notice'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import replyForm from './replyForm.vue'
+import detailConfig from './detail'
 
+
+const detailRef = ref('')
+// 是否显示编辑框
+const showDetail = ref(false)
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const replyRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
@@ -134,6 +145,15 @@ const handleReply = async (data: any) => {
     replyRef.value?.open('edit')
     replyRef.value?.setFormData(data)
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionNoticeDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 
 getLists()
 </script>

src/views/supervision_problem/detail.js

@@ -0,0 +1,32 @@
+
+const detailConfig = {
+    title: "工程监理--监理工作联系单",
+    config: [
+        {
+            label: "整改回复时间",
+            value: "rectification_time"
+        },
+        {
+            label: "整改回复人",
+            value: "rectification_user"
+        },
+        {
+            label: "检查结果",
+            value: "rectification_result_text"
+        },
+        {
+            label: "整改回复意见",
+            value: "rectification_opinion"
+        },
+
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+
+}
+export default detailConfig;

src/views/supervision_problem/index.vue

@@ -1,166 +1,104 @@
 <template>
-  <div>
+    <div>
-    <el-card class="!border-none mb-4" shadow="never">
+        <el-card class="!border-none mb-4" shadow="never">
-      <el-form class="mb-[-16px]" :model="queryParams" inline>
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
-        <el-form-item label="问题分类" prop="problem_cate">
+                <el-form-item label="问题分类" prop="problem_cate">
-          
+
-          <el-select
+                    <el-select class="w-[280px]" v-model="queryParams.problem_cate" clearable placeholder="请选择问题分类">
-            class="w-[280px]"
+                        <el-option v-for="(item, index) in dictData.problem_cate" :key="index" :label="item.name"
-            v-model="queryParams.problem_cate"
+                            :value="item.value" />
-            clearable
+                    </el-select>
-            placeholder="请选择问题分类"
+                </el-form-item>
-          >
+                <el-form-item label="问题说明" prop="problem_description">
-            <el-option
+                    <el-input class="w-[280px]" v-model="queryParams.problem_description" clearable
-              v-for="(item, index) in dictData.problem_cate"
+                        placeholder="请输入问题说明" />
-              :key="index"
+                </el-form-item>
-              :label="item.name"
+                <el-form-item label="问题名称" prop="problem_name">
-              :value="item.value"
+                    <el-input class="w-[280px]" v-model="queryParams.problem_name" clearable placeholder="请输入问题名称" />
-            />
+                </el-form-item>
-          </el-select>
+                <el-form-item>
-        </el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
-        <el-form-item label="问题说明" prop="problem_description">
+                    <el-button @click="resetParams">重置</el-button>
-          <el-input
+                </el-form-item>
-            class="w-[280px]"
+            </el-form>
-            v-model="queryParams.problem_description"
+        </el-card>
-            clearable
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            placeholder="请输入问题说明"
+            <!-- <el-button v-perms="['supervision_work.supervision_problem/add']" type="primary" @click="handleAdd">
-          />
-        </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
+            <el-button v-perms="['supervision_work.supervision_problem/delete']" :disabled="!selectData.length"
-        v-perms="['supervision_work.supervision_problem/delete']"
+                @click="handleDelete(selectData)">
-        :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="200"
-            fixed="right"
-            align="center"
-          >
-            <template #default="{ row }">
-              <el-button
-                v-perms="['supervision_work.supervision_problem/edit']"
-                type="primary"
-                link
-                @click="handleEdit(row)"
-                v-if="row.is_rectification == 0"
-              >
-                检查验收
-              </el-button>
-              <el-button
-                v-perms="['supervision_work.supervision_problem/delete']"
-                type="danger"
-                link
-                @click="handleDelete(row.id)"
-              >
                 删除
-              </el-button>
+                <!-- 1-巡视 2-旁站 3-验收 4-设备进场 5-见证取样 6-材料平行检验 7-实体平行检验 -->
-            </template>
+            </el-button>
-          </el-table-column>
+            <div class="mt-4">
-        </el-table>
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-      </div>
+                    <el-table-column type="selection" width="55" />
-      <div class="flex justify-end mt-4">
+                    <el-table-column label="问题分类" prop="problem_cate_text" show-overflow-tooltip />
-        <pagination v-model="pager" @change="getLists" />
+                    <el-table-column label="问题说明" prop="problem_description" show-overflow-tooltip />
-      </div>
+                    <el-table-column label="问题名称" prop="problem_name" show-overflow-tooltip />
-    </el-card>
+                    <el-table-column label="整改时间" prop="rectification_time" show-overflow-tooltip />
-    <edit-popup
+                    <el-table-column label="整改人" prop="rectification_user" show-overflow-tooltip />
-      v-if="showEdit"
+                    <el-table-column label="整改结果" prop="rectification_result_text" show-overflow-tooltip />
-      ref="editRef"
+                    <el-table-column label="整改意见" prop="rectification_opinion" show-overflow-tooltip />
-      :dict-data="dictData"
+                    <el-table-column label="是否整改" prop="is_rectification_text" show-overflow-tooltip />
-      @success="getLists"
+                    <el-table-column label="操作" width="200" fixed="right" align="center">
-      @close="showEdit = false"
+                        <template #default="{ row }">
-    />
+                            <el-button v-perms="['supervision_work.supervision_problem/edit']" type="primary" link
-  </div>
+                                @click="handleEdit(row)" v-if="row.is_rectification == 0">
+                                检查验收
+                            </el-button>
+                            <el-button v-perms="['supervision_work.supervision_problem/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button v-perms="['supervision_work.supervision_problem/detail']" link
+                                @click="handleDetail(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" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig"
+            :column="1" width="550px" />
+    </div>
 </template>
 
 <script lang="ts" setup name="supervisionProblemLists">
 import { usePaging } from "@/hooks/usePaging";
 import { useDictData } from "@/hooks/useDictOptions";
 import {
-  apiSupervisionProblemLists,
+    apiSupervisionProblemLists,
-  apiSupervisionProblemDelete,
+    apiSupervisionProblemDelete,
+    apiSupervisionProblemDetail
 } from "@/api/supervision_problem";
 import feedback from "@/utils/feedback";
 import EditPopup from "./edit.vue";
+import detailConfig from './detail'
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
-const showEdit = ref(false);
+const showEdit = ref(false)
+const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-  data_id: "",
+    data_id: "",
-  data_type: "",
+    data_type: "",
-  problem_cate: "",
+    problem_cate: "",
-  problem_description: "",
+    problem_description: "",
-  problem_name: "",
+    problem_name: "",
 });
 
 // 选中数据
@@ -168,7 +106,7 @@ const selectData = ref<any[]>([]);
 
 // 表格选择后回调事件
 const handleSelectionChange = (val: any[]) => {
-  selectData.value = val.map(({ id }) => id);
+    selectData.value = val.map(({ id }) => id);
 };
 
 // 获取字典数据
@@ -176,31 +114,42 @@ const { dictData } = useDictData("problem_cate");
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-  fetchFun: apiSupervisionProblemLists,
+    fetchFun: apiSupervisionProblemLists,
-  params: queryParams,
+    params: queryParams,
 });
 
 // 添加
 const handleAdd = async () => {
-  showEdit.value = true;
+    showEdit.value = true;
-  await nextTick();
+    await nextTick();
-  editRef.value?.open("add");
+    editRef.value?.open("add");
 };
 
 // 编辑
 const handleEdit = async (data: any) => {
-  showEdit.value = true;
+    let res = await apiSupervisionProblemDetail({ id: data.id })
-  await nextTick();
+    showEdit.value = true;
-  editRef.value?.open("edit");
+    await nextTick();
-  editRef.value?.setFormData(data);
+    editRef.value?.open("edit");
+    editRef.value?.setFormData(res);
 };
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-  await feedback.confirm("确定要删除？");
+    await feedback.confirm("确定要删除？");
-  await apiSupervisionProblemDelete({ id });
+    await apiSupervisionProblemDelete({ id });
-  getLists();
+    getLists();
 };
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionProblemDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
 getLists();
 </script>

src/views/supervision_project_case_review/detail.js

@@ -0,0 +1,46 @@
+
+const detailConfig = {
+    title: "工程监理--监理工作联系单",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "专项审批类型",
+            value: "supervision_planning_approval_type_text"
+        },
+        {
+            label: "方案名称",
+            value: "case_name"
+        },
+        {
+            label: "评审内容",
+            value: "review_content"
+        },
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+
+        },
+
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+
+}
+export default detailConfig;

src/views/supervision_project_case_review/index.vue

@@ -40,7 +40,7 @@
                     <el-table-column label="方案名称" prop="case_name" show-overflow-tooltip />
                     <el-table-column label="评审内容" prop="review_content" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_connect.supervision_project_case_review/edit']"
@@ -51,6 +51,10 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_connect.supervision_project_case_review/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -60,6 +64,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig"
+            :column="1" width="550px" />
     </div>
 </template>
 
@@ -70,10 +76,15 @@ import { apiSupervisionProjectCaseReviewLists, apiSupervisionProjectCaseReviewDe
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
+
 
 
 // 查询条件
@@ -123,5 +134,13 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionProjectCaseReviewDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
 getLists()
 </script>

src/views/supervision_project_info_report/detail.js

@@ -0,0 +1,54 @@
+const detailConfig = {
+    title: "工程监理--项目重大信息上报",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "信息摘要",
+            value: "abstract"
+        },
+        {
+            label: "发生日期",
+            value: "happen_date"
+        },
+        {
+            label: "严重程度",
+            value: "severity_text"
+        },
+        {
+            label: "信息类别",
+            value: "info_cate_text",
+        },
+        {
+            label: "信息内容",
+            value: "info_content"
+        },
+        {
+            label: "项目部意见",
+            value: "giver"
+        },
+        {
+            label: "主送人",
+            value: "happen_date"
+        },
+
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+
+    ]
+
+}
+export default detailConfig;

src/views/supervision_project_info_report/edit.vue

@@ -1,94 +1,40 @@
 <template>
   <div class="edit-popup">
-    <popup
+    <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-      ref="popupRef"
+      <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
-      :title="popupTitle"
-      :async="true"
-      width="550px"
-      @confirm="handleSubmit"
-      @close="handleClose"
-    >
-      <el-form
-        ref="formRef"
-        :model="formData"
-        label-width="110px"
-        :rules="formRules"
-      >
         <el-form-item label="项目名称" prop="project_name">
-          <el-input
+          <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
-            v-model="formData.project_name"
+            @click="showDialog = true" />
-            clearable
-            placeholder="点击选择项目"
-            readonly
-            @click="showDialog = true"
-          />
         </el-form-item>
         <el-form-item label="信息摘要" prop="abstract">
-          <el-input
+          <el-input v-model="formData.abstract" clearable placeholder="请输入信息摘要" />
-            v-model="formData.abstract"
-            clearable
-            placeholder="请输入信息摘要"
-          />
         </el-form-item>
         <el-form-item label="发生日期" prop="happen_date">
-          <el-date-picker
+          <el-date-picker class="flex-1 !flex" v-model="formData.happen_date" clearable value-format="YYYY-MM-DD"
-            class="flex-1 !flex"
+            placeholder="选择发生日期">
-            v-model="formData.happen_date"
-            clearable
-            value-format="YYYY-MM-DD"
-            placeholder="选择发生日期"
-          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="严重程度" prop="severity">
-          <el-select
+          <el-select class="flex-1" v-model="formData.severity" clearable placeholder="请选择严重程度">
-            class="flex-1"
+            <el-option v-for="(item, index) in dictData.severity" :key="index" :label="item.name"
-            v-model="formData.severity"
+              :value="parseInt(item.value)" />
-            clearable
-            placeholder="请选择严重程度"
-          >
-            <el-option
-              v-for="(item, index) in dictData.severity"
-              :key="index"
-              :label="item.name"
-              :value="parseInt(item.value)"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="信息类别">
-          <el-checkbox-group
+          <el-checkbox-group v-model="formData.info_cate" placeholder="请选择信息类别">
-            v-model="formData.info_cate"
+            <el-checkbox v-for="(item, index) in dictData.info_cate" :key="index" :label="item.value">
-            placeholder="请选择信息类别"
-          >
-            <el-checkbox
-              v-for="(item, index) in dictData.info_cate"
-              :key="index"
-              :label="item.value"
-            >
               {{ item.name }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="信息内容">
-          <el-input
+          <el-input v-model="formData.info_content" clearable placeholder="请输入信息内容" />
-            v-model="formData.info_content"
-            clearable
-            placeholder="请输入信息内容"
-          />
         </el-form-item>
         <el-form-item label="项目部意见">
-          <el-input
+          <el-input v-model="formData.opinions" clearable placeholder="请输入项目部意见" />
-            v-model="formData.opinions"
-            clearable
-            placeholder="请输入项目部意见"
-          />
         </el-form-item>
         <el-form-item label="主送人">
-          <el-input
+          <el-input v-model="formData.giver" clearable placeholder="请输入主送人" />
-            v-model="formData.giver"
-            clearable
-            placeholder="请输入主送人"
-          />
         </el-form-item>
         <createUserLable :formData="formData"></createUserLable>
 

src/views/supervision_project_info_report/index.vue

@@ -46,7 +46,7 @@
                     <el-table-column label="信息内容" prop="info_content" show-overflow-tooltip />
                     <el-table-column label="项目部意见" prop="opinions" show-overflow-tooltip />
                     <el-table-column label="主送人" prop="giver" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="150" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_connect.supervision_project_info_report/edit']"
@@ -57,6 +57,10 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_connect.supervision_project_info_report/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -66,6 +70,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig"
+            :column="1" width="550px" />
     </div>
 </template>
 
@@ -76,11 +82,14 @@ import { apiSupervisionProjectInfoReportLists, apiSupervisionProjectInfoReportDe
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
-
+const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
@@ -130,5 +139,14 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionProjectInfoReportDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 getLists()
 </script>

src/views/supervision_project_milestones/detail.js

@@ -0,0 +1,37 @@
+const detailConfig = {
+    title: "工程监理--施工管理人员",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "标题",
+            value: "title"
+        },
+        {
+            label: "正文内容",
+            value: "content"
+        },
+        {
+            label: "备注",
+            value: "remark"
+        },
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+
+    ]
+
+}
+export default detailConfig;

src/views/supervision_project_milestones/index.vue

@@ -33,7 +33,7 @@
                     <el-table-column label="标题" prop="title" show-overflow-tooltip />
                     <el-table-column label="正文内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_connect.supervision_project_milestones/edit']"
@@ -44,6 +44,10 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_connect.supervision_project_milestones/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -53,21 +57,27 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
+            width="550px" :column="1" />
+
     </div>
 </template>
 
 <script lang="ts" setup name="supervisionProjectMilestonesLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionProjectMilestonesLists, apiSupervisionProjectMilestonesDelete } from '@/api/supervision_project_milestones'
+import { apiSupervisionProjectMilestonesLists, apiSupervisionProjectMilestonesDelete, apiSupervisionProjectMilestonesDetail } from '@/api/supervision_project_milestones'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
-
+const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
@@ -114,5 +124,14 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionProjectMilestonesDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 getLists()
 </script>

src/views/supervision_project_monthly_report/detail.js

@@ -0,0 +1,103 @@
+
+const detailConfig = {
+    title: "工程监理--项目月报",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "年月",
+            value: "date"
+        },
+        {
+            label: "上月计划工程进度（%）",
+            value: "last_month_planned_progress"
+        },
+        {
+            label: "下月计划工程进度(%)",
+            value: "next_month_planned_progress"
+        },
+        {
+            label: "本月累计工程进度（(%)",
+            value: "this_month_progress"
+        },
+        {
+            label: "工程状态",
+            value: "engineering_status_text"
+        }, {
+            label: "进度描述",
+            value: "progress_description"
+        }, {
+            label: "存在的问题及解决措施",
+            value: "problems_and_measure"
+        }, {
+            label: "本月完成",
+            value: "this_month_amount"
+        },
+        {
+            label: "累计完成",
+            value: "total_amount"
+        },
+        {
+            label: "本月支付",
+            value: "this_month_pay"
+        },
+        {
+            label: "累计支付",
+            value: "total_pay"
+        },
+        {
+            label: "建设各方责任",
+            value: "quality_behavior"
+        },
+        {
+            label: "施工现场质量情况",
+            value: "quality_situation"
+        },
+        {
+            label: "质量缺陷或质量隐患的处理情况",
+            value: "quality_hazards"
+        },
+        {
+            label: "检查及抽检情况",
+            value: "sampling_situation"
+        },
+        {
+            label: "其他质量情况",
+            value: "other_quality_conditions"
+        },
+        {
+            label: "本月安全情况",
+            value: "safety_situation"
+        },
+
+        {
+            label: "备注",
+            value: "remark"
+        },
+
+        {
+            label: "创建人",
+            value: "create_user"
+        },
+        {
+            label: "创建时间",
+            value: "create_time"
+        },
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+
+}
+export default detailConfig;

src/views/supervision_project_monthly_report/index.vue

@@ -56,7 +56,7 @@
                     <el-table-column label="其他质量情况" prop="other_quality_conditions" show-overflow-tooltip />
                     <el-table-column label="本月安全情况" prop="safety_situation" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="150" align="center" fixed="right">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_connect.supervision_project_monthly_report/edit']"
@@ -67,6 +67,10 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_connect.supervision_project_monthly_report/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -76,6 +80,7 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
     </div>
 </template>
 
@@ -86,10 +91,14 @@ import { apiSupervisionProjectMonthlyReportLists, apiSupervisionProjectMonthlyRe
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -139,5 +148,15 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionProjectMonthlyReportDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 getLists()
 </script>

src/views/supervision_safety_management_personnel/index.vue

@@ -70,7 +70,7 @@
                                 删除
                             </el-button>
                             <el-button
-                                v-perms="['supervision_qualification_review.supervision_safety_management_personnel/edit']"
+                                v-perms="['supervision_qualification_review.supervision_safety_management_personnel/detail']"
                                 link @click="handleDetail(row.id)">
                                 详情
                             </el-button>

src/views/supervision_safety_warning_sign/detail.js

@@ -0,0 +1,32 @@
+const detailConfig = {
+    title: "工程监理--现场安全警示标志",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "检查人",
+            value: "check_user"
+        },
+        {
+            label: "检查日期",
+            value: "check_date"
+        },
+        {
+            label: "检查地点",
+            value: "check_area"
+        },
+        {
+            label: "问题描述",
+            value: "problem_desc"
+        },
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+    ]
+
+}
+export default detailConfig;

src/views/supervision_safety_warning_sign/index.vue

@@ -38,7 +38,7 @@
                     <el-table-column label="检查地点" prop="check_area" show-overflow-tooltip />
                     <el-table-column label="问题描述" prop="problem_desc" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" fixed="right" align="center">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_dangerous.supervision_safety_warning_sign/edit']"
@@ -49,6 +49,10 @@
                                 type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_dangerous.supervision_safety_warning_sign/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -58,21 +62,27 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" :column="2"
+            width="50vw" />
+
     </div>
 </template>
 
 <script lang="ts" setup name="supervisionSafetyWarningSignLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionSafetyWarningSignLists, apiSupervisionSafetyWarningSignDelete } from '@/api/supervision_safety_warning_sign'
+import { apiSupervisionSafetyWarningSignLists, apiSupervisionSafetyWarningSignDelete, apiSupervisionSafetyWarningSignDetail } from '@/api/supervision_safety_warning_sign'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
-
+const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
@@ -120,5 +130,15 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionSafetyWarningSignDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
 getLists()
 </script>

src/views/supervision_test_blocks_specimens/index.vue

@@ -71,7 +71,7 @@
                     <el-table-column label="结束日期" prop="end_date" 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="操作" width="120" fixed="right">
+                    <el-table-column label="操作" fixed="right" align="center">
 
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_test_blocks_specimens/edit']"

src/views/supervision_work_contact/detail.js

@@ -0,0 +1,59 @@
+import { apisupervision_work_contact_problem, } from '@/api/supervision_work_contact'
+
+const detailConfig = {
+    title: "工程监理--监理工作联系单",
+    config: [
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "联系编号",
+            value: "code"
+        },
+        {
+            label: "发起人",
+            value: "initiator"
+        },
+        {
+            label: "发起日期",
+            value: "initiation_date"
+        },
+        {
+            label: "主题",
+            value: "theme",
+        },
+
+        {
+            label: "抄送人员",
+            value: "copy_user",
+        },
+
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+
+        },
+
+    ],
+    table: {
+        title: "材料信息",
+        tableConfig: [
+            {
+                label: "问题名称",
+                value: 'problem_name',
+
+            },
+            {
+                label: "问题说明",
+                value: 'problem_description'
+            },
+        ],
+        fetchFun: apisupervision_work_contact_problem,
+        query: 'work_contact_id'
+    }
+
+
+}
+export default detailConfig;

src/views/supervision_work_contact/index.vue

@@ -43,7 +43,7 @@
                     <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="操作" width="120" fixed="right">
+                    <el-table-column label="操作" align='center' fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_work_contact/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -53,6 +53,10 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['supervision_work.supervision_work_contact/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -62,6 +66,8 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" />
+
     </div>
 </template>
 
@@ -72,11 +78,14 @@ import { apiSupervisionWorkContactLists, apiSupervisionWorkContactDelete, apiSup
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
-
+const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
@@ -127,5 +136,15 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiSupervisionWorkContactDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
 getLists()
 </script>