From c7d91dc682ee8ebca508c38953c7e106f3bd0d4e Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Mon, 18 Mar 2024 23:28:44 +0800
Subject: [PATCH] add

---
 src/components/detailPage/index.vue           | 46 ++++++++++++++-----
 src/views/manage_company/detail.js            |  2 +-
 src/views/manage_company/index.vue            |  2 +-
 src/views/manage_project/detail.js            | 10 ++--
 src/views/manage_project/index.vue            |  2 +-
 src/views/supervision_accept/index.vue        |  3 --
 .../supervision_commencement_report/index.vue |  4 --
 .../supervision_design_disclosure/index.vue   |  3 --
 src/views/supervision_inspection/index.vue    |  3 --
 .../index.vue                                 |  4 --
 src/views/supervision_planning/detail.js      | 17 -------
 src/views/supervision_planning/index.vue      |  4 +-
 src/views/supervision_rules/index.vue         |  5 --
 .../supervision_rules_disclosure/index.vue    |  5 --
 src/views/supervision_side_station/index.vue  |  3 --
 .../detail.js                                 |  2 +-
 .../index.vue                                 |  4 +-
 .../supervision_witness_sampling/index.vue    |  3 --
 18 files changed, 47 insertions(+), 75 deletions(-)

diff --git a/src/components/detailPage/index.vue b/src/components/detailPage/index.vue
index 65d5b87..0f563ec 100644
--- a/src/components/detailPage/index.vue
+++ b/src/components/detailPage/index.vue
@@ -24,15 +24,28 @@
                     </el-descriptions-item>
                 </el-descriptions>
             </el-form>
-            <el-card class="mt-5" v-if="detailConfig?.table">
-                <template #header>
-                    {{ detailConfig.table.title }}列表
-                </template>
-                <el-table :data="tableLists">
-                    <el-table-column :label="item.label" :prop="item.value" show-overflow-tooltip
-                        v-for="(item, index) in detailConfig.table.tableConfig" :key="index" />
-                </el-table>
-            </el-card>
+            <div v-if="detailConfig?.table">
+                <el-card class="mt-5" v-if="!Array.isArray(detailConfig?.table)">
+                    <template #header>
+                        {{ detailConfig.table.title }}列表
+                    </template>
+                    <el-table :data="tableLists">
+                        <el-table-column :label="item.label" :prop="item.value" show-overflow-tooltip
+                            v-for="(item, index) in detailConfig.table.tableConfig" :key="index" />
+                    </el-table>
+                </el-card>
+                <el-card class="mt-5" v-else>
+                    <!-- <template #header>
+                        {{ detailConfig.table.title }}列表
+                    </template>
+                    <el-table :data="tableLists">
+                        <el-table-column :label="item.label" :prop="item.value" show-overflow-tooltip
+                            v-for="(item, index) in detailConfig.table.tableConfig" :key="index" />
+                    </el-table> -->
+                </el-card>
+            </div>
+
+
 
         </popup>
     </div>
@@ -42,7 +55,7 @@
 
 import Popup from '@/components/popup/index.vue'
 import { defineProps, ref, defineExpose } from "vue"
-
+import { cloneDeep } from 'lodash-es'
 const props = defineProps({
     detailConfig: {
         type: Object,
@@ -71,9 +84,17 @@ const formData = ref({})
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     formData.value = data
-
     if (props.detailConfig?.table) {
-        let res = await props.detailConfig.table.fetchFun({ [props.detailConfig.table.query]: formData.value.id })
+        let query = cloneDeep(props.detailConfig.table.query)
+        if (typeof (props.detailConfig.table.query) === 'object') {
+            for (let key in query) {
+                query[key] ||= data.id
+            }
+        } else {
+            query = { [query]: data.id }
+        }
+
+        let res = await props.detailConfig.table.fetchFun({ ...query })
         tableLists.value = res.lists
     }
 
@@ -89,6 +110,7 @@ const open = () => {
 // 关闭回调
 const handleClose = () => {
     emit('close')
+    console.log("gianni1")
 }
 
 
diff --git a/src/views/manage_company/detail.js b/src/views/manage_company/detail.js
index de9dd2a..f2a3546 100644
--- a/src/views/manage_company/detail.js
+++ b/src/views/manage_company/detail.js
@@ -14,7 +14,7 @@ const detailConfig = {
         },
         {
             label: "单位类别",
-            value: "type"
+            value: "type_text"
         },
         {
             label: "资质等级",
diff --git a/src/views/manage_company/index.vue b/src/views/manage_company/index.vue
index dfe4d87..545ffee 100644
--- a/src/views/manage_company/index.vue
+++ b/src/views/manage_company/index.vue
@@ -54,7 +54,7 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['manage_basic.manage_project/detail']" type="danger" link
+                            <el-button v-perms="['manage_basic.manage_project/detail']" link
                                 @click="handleDetail(row.id)">
                                 详情
                             </el-button>
diff --git a/src/views/manage_project/detail.js b/src/views/manage_project/detail.js
index 2aa9dee..04332cd 100644
--- a/src/views/manage_project/detail.js
+++ b/src/views/manage_project/detail.js
@@ -7,11 +7,11 @@ const detailConfig = {
         },
         {
             label: "性质",
-            value: "nature"
+            value: "nature_text"
         },
         {
             label: "行业",
-            value: "industry"
+            value: "industry_text"
         },
         {
             label: "建设单位",
@@ -19,7 +19,7 @@ const detailConfig = {
         },
         {
             label: "建设区域",
-            value: "build_area"
+            value: "build_area_text"
         },
         {
             label: "项目地址",
@@ -27,7 +27,7 @@ const detailConfig = {
         },
         {
             label: "项目级别",
-            value: "project_level"
+            value: "project_level_text"
         },
         {
             label: "总投资(万元)",
@@ -35,7 +35,7 @@ const detailConfig = {
         },
         {
             label: "工程状态",
-            value: "engineering_status"
+            value: "engineering_status_text"
         },
         {
             label: "合同服务内容",
diff --git a/src/views/manage_project/index.vue b/src/views/manage_project/index.vue
index 9441a11..67920c2 100644
--- a/src/views/manage_project/index.vue
+++ b/src/views/manage_project/index.vue
@@ -101,7 +101,7 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['manage_basic.manage_project/detail']" type="danger" link
+                            <el-button v-perms="['manage_basic.manage_project/detail']" link
                                 @click="handleDetail(row.id)">
                                 详情
                             </el-button>
diff --git a/src/views/supervision_accept/index.vue b/src/views/supervision_accept/index.vue
index 6c5afda..2d4556f 100644
--- a/src/views/supervision_accept/index.vue
+++ b/src/views/supervision_accept/index.vue
@@ -112,10 +112,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete, apiSupervisionAcceptDetail, apisupervision_accept } from '@/api/supervision_accept'
-<<<<<<< HEAD
-=======
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
diff --git a/src/views/supervision_commencement_report/index.vue b/src/views/supervision_commencement_report/index.vue
index 12d627d..bdc7734 100644
--- a/src/views/supervision_commencement_report/index.vue
+++ b/src/views/supervision_commencement_report/index.vue
@@ -64,12 +64,8 @@
 <script lang="ts" setup name="supervisionCommencementReportLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-<<<<<<< HEAD
-import { apiSupervisionCommencementReportLists, apiSupervisionCommencementReportDelete, apiSupervisionCommencementReportDetail } from '@/api/supervision_commencement_report'
-=======
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionCommencementReportLists, apiSupervisionCommencementReportDelete } from '@/api/supervision_commencement_report'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'
diff --git a/src/views/supervision_design_disclosure/index.vue b/src/views/supervision_design_disclosure/index.vue
index b9fc7c8..23fba7d 100644
--- a/src/views/supervision_design_disclosure/index.vue
+++ b/src/views/supervision_design_disclosure/index.vue
@@ -66,10 +66,7 @@ import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionDesignDisclosureLists, apiSupervisionDesignDisclosureDelete, apiSupervisionDesignDisclosureDetail } from '@/api/supervision_design_disclosure'
-<<<<<<< HEAD
 import detailConfig from './detail'
-=======
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
diff --git a/src/views/supervision_inspection/index.vue b/src/views/supervision_inspection/index.vue
index d4608a1..c0b3817 100644
--- a/src/views/supervision_inspection/index.vue
+++ b/src/views/supervision_inspection/index.vue
@@ -81,10 +81,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionInspectionLists, apiSupervisionInspectionDelete, apiSupervisionInspectionDetail } from '@/api/supervision_inspection'
-<<<<<<< HEAD
-=======
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
diff --git a/src/views/supervision_material_equipment_info/index.vue b/src/views/supervision_material_equipment_info/index.vue
index 53407ae..c2dbc5c 100644
--- a/src/views/supervision_material_equipment_info/index.vue
+++ b/src/views/supervision_material_equipment_info/index.vue
@@ -105,12 +105,8 @@
 <script lang="ts" setup name="supervisionMaterialEquipmentInfoLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-<<<<<<< HEAD
-import { apiSupervisionMaterialEquipmentInfoLists, apiSupervisionMaterialEquipmentInfoDelete, apiSupervisionMaterialEquipmentInfoDetail } from '@/api/supervision_material_equipment_info'
-=======
 import { apiSupervisionMaterialEquipmentInfoLists, apiSupervisionMaterialEquipmentInfoDelete } from '@/api/supervision_material_equipment_info'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'
diff --git a/src/views/supervision_planning/detail.js b/src/views/supervision_planning/detail.js
index e322865..4763b3b 100644
--- a/src/views/supervision_planning/detail.js
+++ b/src/views/supervision_planning/detail.js
@@ -44,23 +44,6 @@ const detailConfig = {
             column: 1
         },
     ],
-    table: {
-        title: "设备",
-        tableConfig: [
-            {
-                label: "设备名称",
-                value: 'name',
-
-            },
-            {
-                label: "是否显示",
-                value: 'is_show_text'
-            },
-
-        ],
-        query: 'device_id',
-        fetchFun: apiSupervisionMonitoringEquipmentDetailLists,
-    }
 
 }
 export default detailConfig;
\ No newline at end of file
diff --git a/src/views/supervision_planning/index.vue b/src/views/supervision_planning/index.vue
index 1213fba..3e1e54b 100644
--- a/src/views/supervision_planning/index.vue
+++ b/src/views/supervision_planning/index.vue
@@ -87,8 +87,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" :column="2"
-            width="60vw" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig"
+            :column="2" width="60vw" />
     </div>
 </template>
 
diff --git a/src/views/supervision_rules/index.vue b/src/views/supervision_rules/index.vue
index 49bd412..72e2119 100644
--- a/src/views/supervision_rules/index.vue
+++ b/src/views/supervision_rules/index.vue
@@ -63,13 +63,8 @@
 <script lang="ts" setup name="supervisionRulesLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-<<<<<<< HEAD
-import { apiSupervisionRulesLists, apiSupervisionRulesDelete, apiSupervisionRulesDetail } from '@/api/supervision_rules'
-import { timeFormat } from '@/utils/util'
-=======
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionRulesLists, apiSupervisionRulesDelete } from '@/api/supervision_rules'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'
diff --git a/src/views/supervision_rules_disclosure/index.vue b/src/views/supervision_rules_disclosure/index.vue
index efca834..f685049 100644
--- a/src/views/supervision_rules_disclosure/index.vue
+++ b/src/views/supervision_rules_disclosure/index.vue
@@ -64,13 +64,8 @@
 <script lang="ts" setup name="supervisionRulesDisclosureLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-<<<<<<< HEAD
-import { apiSupervisionRulesDisclosureLists, apiSupervisionRulesDisclosureDelete, apiSupervisionRulesDisclosureDetail } from '@/api/supervision_rules_disclosure'
-import { timeFormat } from '@/utils/util'
-=======
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionRulesDisclosureLists, apiSupervisionRulesDisclosureDelete } from '@/api/supervision_rules_disclosure'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import detailConfig from './detail'
diff --git a/src/views/supervision_side_station/index.vue b/src/views/supervision_side_station/index.vue
index a5aa1bc..79d7eba 100644
--- a/src/views/supervision_side_station/index.vue
+++ b/src/views/supervision_side_station/index.vue
@@ -80,10 +80,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionSideStationLists, apiSupervisionSideStationDelete, apiSupervisionSideStationDetail } from '@/api/supervision_side_station'
-<<<<<<< HEAD
-=======
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
diff --git a/src/views/supervision_test_blocks_specimens/detail.js b/src/views/supervision_test_blocks_specimens/detail.js
index 0c5d4f8..8056a00 100644
--- a/src/views/supervision_test_blocks_specimens/detail.js
+++ b/src/views/supervision_test_blocks_specimens/detail.js
@@ -79,7 +79,7 @@ const detailConfig = {
 
         ],
         fetchFun: apisupervision_problem,
-        query: 'data_id'
+        query: { 'data_id': '', data_type: 6 }
     }
 
 
diff --git a/src/views/supervision_test_blocks_specimens/index.vue b/src/views/supervision_test_blocks_specimens/index.vue
index 2f70693..7965df7 100644
--- a/src/views/supervision_test_blocks_specimens/index.vue
+++ b/src/views/supervision_test_blocks_specimens/index.vue
@@ -95,14 +95,14 @@
             </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>
 
 <script lang="ts" setup name="supervisionTestBlocksSpecimensLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete } from '@/api/supervision_test_blocks_specimens'
+import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete, apiSupervisionTestBlocksSpecimensDetail } from '@/api/supervision_test_blocks_specimens'
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
diff --git a/src/views/supervision_witness_sampling/index.vue b/src/views/supervision_witness_sampling/index.vue
index a597f90..3ea2903 100644
--- a/src/views/supervision_witness_sampling/index.vue
+++ b/src/views/supervision_witness_sampling/index.vue
@@ -97,11 +97,8 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiSupervisionWitnessSamplingLists, apiSupervisionWitnessSamplingDelete, apiSupervisionWitnessSamplingDetail } from '@/api/supervision_witness_sampling'
-<<<<<<< HEAD
-=======
 import { apiSupervisionProjectSearch } from '@/api/supervision_project'
 import { apiSupervisionMaterialEntrySearch } from '@/api/supervision_material_entry'
->>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import { useRouter } from 'vue-router'