From 1c8479b198b07e32e7898aad81d18c34ffb176db Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 8 Jan 2024 18:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project_total_budget.ts               |   26 +
 .../AssetManagement/Asset Account/detail.vue  |    6 +-
 .../AssetManagement/Asset Repair/detail.vue   |    6 +-
 .../Asset acquisition/detail.vue              |    6 +-
 .../Asset depreciation/detail.vue             |    6 +-
 .../AssetManagement/Asset disposal/detail.vue |    6 +-
 .../AssetPurchasing/detail.vue                |    6 +-
 .../AssetManagement/Assetreturn/detail.vue    |    6 +-
 .../AssetManagement/retirements/detail.vue    |    6 +-
 src/views/InvoicingRequests/detail.vue        |    6 +-
 .../Materialmanagement/Inquiry/detail.vue     |    6 +-
 .../Inventorygapanalysis/detail.vue           |    6 +-
 .../Inventoryquery/detail.vue                 |    6 +-
 .../MaterialPriceLibrary/detail.vue           |    6 +-
 .../Monthlyinventory/detail.vue               |    6 +-
 .../Monthlyinventory_detail/detail.vue        |    6 +-
 .../Selfpurchasereceipt/detail.vue            |    6 +-
 .../Selfpurchasereceipt_detail/detail.vue     |    6 +-
 .../Serialnumberoutbound/detail.vue           |    6 +-
 .../Serialnumberstorage/detail.vue            |    6 +-
 .../TransferOrder/detail.vue                  |    6 +-
 .../TransferOrder_detail/detail.vue           |    6 +-
 .../materialHandlingForm/detail.vue           |    6 +-
 .../materialHandlingForm_detail/detail.vue    |    6 +-
 .../materialgapanalysis/detail.vue            |    6 +-
 .../outbounddetails/detail.vue                |    6 +-
 .../outboundflow/detail.vue                   |    6 +-
 .../outboundorder/detail.vue                  |    6 +-
 .../purchaserequest/detail.vue                |    6 +-
 .../purchaserequest_detail/detail.vue         |    6 +-
 .../receiptstatement/detail.vue               |    6 +-
 .../returndetails/detail.vue                  |    6 +-
 .../Materialmanagement/returnorder/detail.vue |    6 +-
 src/views/acceptance_bill/detail.vue          |    6 +-
 src/views/administrativeContracts/detail.vue  |    6 +-
 src/views/administrative_payments/detail.vue  |    6 +-
 .../detail.vue                                |    6 +-
 src/views/bid_document_examination/detail.vue |    6 +-
 src/views/bidbbond/detail.vue                 |    6 +-
 src/views/build/build_division/detail.vue     |    6 +-
 src/views/build/build_plan/detail.vue         |    6 +-
 .../build/build_process_settings/detail.vue   |    6 +-
 src/views/build/build_report/detail.vue       |    6 +-
 src/views/competitor/detail.vue               |  137 +--
 src/views/contract/detail.vue                 |  449 +++++--
 src/views/contract/edit.vue                   |   56 +-
 src/views/contract/index.vue                  |    7 +-
 src/views/contract_negotiation/detail.vue     |    6 +-
 src/views/cost_budget_adjust/edit.vue         |    6 +-
 src/views/cost_budget_adjust_detail/edit.vue  |    6 +-
 src/views/costbudget/edit.vue                 |    6 +-
 src/views/custom/detail.vue                   |    6 +-
 src/views/custom/edit.vue                     |    6 +-
 src/views/custom_contacts/detail.vue          |    3 +-
 src/views/custom_follow/detail.vue            |    3 +-
 src/views/custom_service/detail.vue           |   10 +-
 src/views/custom_service/handle.vue           |    2 +-
 src/views/customer_demand/detail.vue          |  122 +-
 src/views/customer_demand_solution/detail.vue |  127 +-
 src/views/expense_reimbursement/detail.vue    |    6 +-
 src/views/finance_payment_apply/detail.vue    |    6 +-
 src/views/finance_payment_plan/detail.vue     |    6 +-
 src/views/finance_receipt_record/detail.vue   |    6 +-
 src/views/finance_refund_record/detail.vue    |    6 +-
 .../Management/editadjust.vue                 |    6 +-
 .../Management/editcost.vue                   |    6 +-
 .../bankAccount/bankAccount/detail.vue        |    6 +-
 .../bankAccount/interestRate/detail.vue       |    6 +-
 .../bankAccount/revenueWater/detail.vue       |    6 +-
 .../expense_reimbursement/detail.vue          |    6 +-
 src/views/material_classify/detail.vue        |    6 +-
 src/views/material_list/detail.vue            |    6 +-
 src/views/material_warehouse/detail.vue       |    6 +-
 .../ordermanagement/saleorder/detail.vue      |    6 +-
 src/views/procurement_contract/detail.vue     |    6 +-
 .../procurement_contract_change/detail.vue    |    6 +-
 .../procurement_contract_detail/detail.vue    |    6 +-
 src/views/project/detail.vue                  |    5 +-
 .../outputvalue/details/detail.vue            |    6 +-
 .../outputvalue/report/detail.vue             |    6 +-
 .../project_alarm/warningrecords/detail.vue   |    6 +-
 src/views/project_alarm_set/detail.vue        |    6 +-
 .../project_attendance_detail/detail.vue      |    6 +-
 .../project_attendance_record/detail.vue      |    6 +-
 src/views/project_attendance_record/index.vue |    2 +-
 src/views/project_budget/detail.vue           |    6 +-
 src/views/project_cost_temp_set/detail.vue    |    6 +-
 src/views/project_document/detail.vue         |    6 +-
 src/views/project_document_set/detail.vue     |    6 +-
 src/views/project_estimate/detail.vue         |  150 +--
 .../business_trip_application/detail.vue      |    6 +-
 .../cost_adjustment/detail.vue                |    6 +-
 .../expense_reimbursement/detail.vue          |    6 +-
 .../loanapplication/detail.vue                |    6 +-
 .../travel_reimbursement/detail.vue           |    6 +-
 src/views/project_follow_up/detail.vue        |  161 +--
 .../project_insurance_management/detail.vue   |    6 +-
 src/views/project_job_type/detail.vue         |    6 +-
 src/views/project_labor_contract/detail.vue   |    6 +-
 src/views/project_list/detail.vue             | 1078 +++++++++++++++++
 src/views/project_list/index.vue              |  393 ++++++
 src/views/project_logs/detail.vue             |    6 +-
 .../project_manager_appointment/detail.vue    |    6 +-
 src/views/project_member/detail.vue           |    6 +-
 src/views/project_milestones/detail.vue       |    6 +-
 src/views/project_personnel/detail.vue        |    6 +-
 src/views/project_plan/detail.vue             |    6 +-
 .../project_pre_sales_members/detail.vue      |   59 +-
 src/views/project_profit_set/detail.vue       |    6 +-
 src/views/project_role_set/detail.vue         |    6 +-
 src/views/project_salary_payment/detail.vue   |    6 +-
 src/views/project_settlement/detail.vue       |    6 +-
 .../partsettlement/detail.vue                 |    6 +-
 .../projectclosure/detail.vue                 |    6 +-
 src/views/project_stakeholder/detail.vue      |    6 +-
 .../project_subcontract_settlement/detail.vue |    6 +-
 src/views/project_total_budget/detail.vue     |  190 +++
 src/views/project_total_budget/edit.vue       |  492 ++++++++
 src/views/project_total_budget/index.vue      |  166 +++
 src/views/project_type_set/detail.vue         |    6 +-
 src/views/project_wbs_set/detail.vue          |    6 +-
 src/views/quality_accept/detail.vue           |    6 +-
 src/views/quality_accident/detail.vue         |    6 +-
 src/views/quality_check/detail.vue            |    6 +-
 src/views/quality_check_nature/detail.vue     |    6 +-
 src/views/quality_detection/detail.vue        |    6 +-
 src/views/quality_detection_temp/detail.vue   |    6 +-
 src/views/quality_event/detail.vue            |    6 +-
 src/views/quality_mbo/detail.vue              |    6 +-
 src/views/quality_modify/detail.vue           |    6 +-
 .../quality_professional_category/detail.vue  |    6 +-
 src/views/quality_specification/detail.vue    |   22 +-
 src/views/quality_supervise/detail.vue        |    6 +-
 src/views/quotation/detail.vue                |  127 +-
 src/views/quotation/index.vue                 |   12 +-
 src/views/recordsPayment/detail.vue           |    6 +-
 src/views/redemption_bill/detail.vue          |    6 +-
 src/views/refund/detail.vue                   |    6 +-
 src/views/refundbidDeposit/detail.vue         |    6 +-
 src/views/remittance/detail.vue               |    6 +-
 src/views/safety_accident/detail.vue          |    6 +-
 src/views/safety_check/detail.vue             |    6 +-
 src/views/safety_emergency_plan/detail.vue    |    6 +-
 src/views/safety_evaluate/detail.vue          |    6 +-
 src/views/safety_event/detail.vue             |    6 +-
 src/views/safety_hazard/detail.vue            |    6 +-
 src/views/safety_modify/detail.vue            |    6 +-
 src/views/safety_product_month/detail.vue     |    6 +-
 src/views/safety_rehearsal/detail.vue         |    6 +-
 src/views/safety_standard/detail.vue          |    6 +-
 src/views/safety_supervise/detail.vue         |    6 +-
 src/views/safety_target/detail.vue            |    6 +-
 src/views/subcontracting_contract/detail.vue  |    6 +-
 .../detail.vue                                |    6 +-
 src/views/supplier/detail.vue                 |  576 ++++++---
 src/views/supplier/edit.vue                   |   28 +-
 src/views/supplier/index.vue                  |   56 +-
 src/views/supplier_contacts/detail.vue        |  148 +--
 src/views/supplier_contacts/edit.vue          |    4 +-
 src/views/supplier_contacts/index.vue         |    6 +-
 src/views/transfer_bill/detail.vue            |    6 +-
 161 files changed, 4285 insertions(+), 1118 deletions(-)
 create mode 100644 src/api/project_total_budget.ts
 create mode 100644 src/views/project_list/detail.vue
 create mode 100644 src/views/project_list/index.vue
 create mode 100644 src/views/project_total_budget/detail.vue
 create mode 100644 src/views/project_total_budget/edit.vue
 create mode 100644 src/views/project_total_budget/index.vue

diff --git a/src/api/project_total_budget.ts b/src/api/project_total_budget.ts
new file mode 100644
index 0000000..cb6a4e5
--- /dev/null
+++ b/src/api/project_total_budget.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 项目WBS表列表
+export function apiProjectbudgetLists(params: any) {
+    return request.get({ url: '/project.project_total_budget/lists', params })
+}
+
+// 添加项目WBS
+export function apiProjectbudgetAdd(params: any) {
+    return request.post({ url: '/project.project_total_budget/add', params })
+}
+
+// 编辑项目WBS
+export function apiProjectbudgetEdit(params: any) {
+    return request.post({ url: '/project.project_total_budget/edit', params })
+}
+
+// 删除项目WBS
+export function apiProjectbudgetDelete(params: any) {
+    return request.post({ url: '/project.project_total_budget/delete', params })
+}
+
+// 项目WBS详情
+export function apiProjectbudgetDetail(params: any) {
+    return request.get({ url: '/project.project_total_budget/detail', params })
+}
diff --git a/src/views/AssetManagement/Asset Account/detail.vue b/src/views/AssetManagement/Asset Account/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/AssetManagement/Asset Account/detail.vue	
+++ b/src/views/AssetManagement/Asset Account/detail.vue	
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/AssetManagement/Asset Repair/detail.vue b/src/views/AssetManagement/Asset Repair/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/AssetManagement/Asset Repair/detail.vue	
+++ b/src/views/AssetManagement/Asset Repair/detail.vue	
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/AssetManagement/Asset acquisition/detail.vue b/src/views/AssetManagement/Asset acquisition/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/AssetManagement/Asset acquisition/detail.vue	
+++ b/src/views/AssetManagement/Asset acquisition/detail.vue	
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/AssetManagement/Asset depreciation/detail.vue b/src/views/AssetManagement/Asset depreciation/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/AssetManagement/Asset depreciation/detail.vue	
+++ b/src/views/AssetManagement/Asset depreciation/detail.vue	
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/AssetManagement/Asset disposal/detail.vue b/src/views/AssetManagement/Asset disposal/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/AssetManagement/Asset disposal/detail.vue	
+++ b/src/views/AssetManagement/Asset disposal/detail.vue	
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/AssetManagement/AssetPurchasing/detail.vue b/src/views/AssetManagement/AssetPurchasing/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/AssetManagement/AssetPurchasing/detail.vue
+++ b/src/views/AssetManagement/AssetPurchasing/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/AssetManagement/Assetreturn/detail.vue b/src/views/AssetManagement/Assetreturn/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/AssetManagement/Assetreturn/detail.vue
+++ b/src/views/AssetManagement/Assetreturn/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/AssetManagement/retirements/detail.vue b/src/views/AssetManagement/retirements/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/AssetManagement/retirements/detail.vue
+++ b/src/views/AssetManagement/retirements/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/InvoicingRequests/detail.vue b/src/views/InvoicingRequests/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/InvoicingRequests/detail.vue
+++ b/src/views/InvoicingRequests/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Inquiry/detail.vue b/src/views/Materialmanagement/Inquiry/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Inquiry/detail.vue
+++ b/src/views/Materialmanagement/Inquiry/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Inventorygapanalysis/detail.vue b/src/views/Materialmanagement/Inventorygapanalysis/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Inventorygapanalysis/detail.vue
+++ b/src/views/Materialmanagement/Inventorygapanalysis/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Inventoryquery/detail.vue b/src/views/Materialmanagement/Inventoryquery/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Inventoryquery/detail.vue
+++ b/src/views/Materialmanagement/Inventoryquery/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/MaterialPriceLibrary/detail.vue b/src/views/Materialmanagement/MaterialPriceLibrary/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/MaterialPriceLibrary/detail.vue
+++ b/src/views/Materialmanagement/MaterialPriceLibrary/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Monthlyinventory/detail.vue b/src/views/Materialmanagement/Monthlyinventory/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Monthlyinventory/detail.vue
+++ b/src/views/Materialmanagement/Monthlyinventory/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Monthlyinventory_detail/detail.vue b/src/views/Materialmanagement/Monthlyinventory_detail/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Monthlyinventory_detail/detail.vue
+++ b/src/views/Materialmanagement/Monthlyinventory_detail/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Selfpurchasereceipt/detail.vue b/src/views/Materialmanagement/Selfpurchasereceipt/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Selfpurchasereceipt/detail.vue
+++ b/src/views/Materialmanagement/Selfpurchasereceipt/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Selfpurchasereceipt_detail/detail.vue b/src/views/Materialmanagement/Selfpurchasereceipt_detail/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Selfpurchasereceipt_detail/detail.vue
+++ b/src/views/Materialmanagement/Selfpurchasereceipt_detail/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Serialnumberoutbound/detail.vue b/src/views/Materialmanagement/Serialnumberoutbound/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Serialnumberoutbound/detail.vue
+++ b/src/views/Materialmanagement/Serialnumberoutbound/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/Serialnumberstorage/detail.vue b/src/views/Materialmanagement/Serialnumberstorage/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/Serialnumberstorage/detail.vue
+++ b/src/views/Materialmanagement/Serialnumberstorage/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/TransferOrder/detail.vue b/src/views/Materialmanagement/TransferOrder/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/TransferOrder/detail.vue
+++ b/src/views/Materialmanagement/TransferOrder/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/TransferOrder_detail/detail.vue b/src/views/Materialmanagement/TransferOrder_detail/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/TransferOrder_detail/detail.vue
+++ b/src/views/Materialmanagement/TransferOrder_detail/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/materialHandlingForm/detail.vue b/src/views/Materialmanagement/materialHandlingForm/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/materialHandlingForm/detail.vue
+++ b/src/views/Materialmanagement/materialHandlingForm/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/materialHandlingForm_detail/detail.vue b/src/views/Materialmanagement/materialHandlingForm_detail/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/materialHandlingForm_detail/detail.vue
+++ b/src/views/Materialmanagement/materialHandlingForm_detail/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/materialgapanalysis/detail.vue b/src/views/Materialmanagement/materialgapanalysis/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/materialgapanalysis/detail.vue
+++ b/src/views/Materialmanagement/materialgapanalysis/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/outbounddetails/detail.vue b/src/views/Materialmanagement/outbounddetails/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/outbounddetails/detail.vue
+++ b/src/views/Materialmanagement/outbounddetails/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/outboundflow/detail.vue b/src/views/Materialmanagement/outboundflow/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/outboundflow/detail.vue
+++ b/src/views/Materialmanagement/outboundflow/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/outboundorder/detail.vue b/src/views/Materialmanagement/outboundorder/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/outboundorder/detail.vue
+++ b/src/views/Materialmanagement/outboundorder/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/purchaserequest/detail.vue b/src/views/Materialmanagement/purchaserequest/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/purchaserequest/detail.vue
+++ b/src/views/Materialmanagement/purchaserequest/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/purchaserequest_detail/detail.vue b/src/views/Materialmanagement/purchaserequest_detail/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/purchaserequest_detail/detail.vue
+++ b/src/views/Materialmanagement/purchaserequest_detail/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/receiptstatement/detail.vue b/src/views/Materialmanagement/receiptstatement/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/receiptstatement/detail.vue
+++ b/src/views/Materialmanagement/receiptstatement/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/returndetails/detail.vue b/src/views/Materialmanagement/returndetails/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/returndetails/detail.vue
+++ b/src/views/Materialmanagement/returndetails/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/Materialmanagement/returnorder/detail.vue b/src/views/Materialmanagement/returnorder/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/Materialmanagement/returnorder/detail.vue
+++ b/src/views/Materialmanagement/returnorder/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/acceptance_bill/detail.vue b/src/views/acceptance_bill/detail.vue
index 193edf9..9cf4cbe 100644
--- a/src/views/acceptance_bill/detail.vue
+++ b/src/views/acceptance_bill/detail.vue
@@ -202,9 +202,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/administrativeContracts/detail.vue b/src/views/administrativeContracts/detail.vue
index ba3c498..9bf0137 100644
--- a/src/views/administrativeContracts/detail.vue
+++ b/src/views/administrativeContracts/detail.vue
@@ -177,9 +177,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/administrative_payments/detail.vue b/src/views/administrative_payments/detail.vue
index 01a9fd0..d9c37b5 100644
--- a/src/views/administrative_payments/detail.vue
+++ b/src/views/administrative_payments/detail.vue
@@ -176,9 +176,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/administrative_ticket_collection/detail.vue b/src/views/administrative_ticket_collection/detail.vue
index eb7709d..f44ef57 100644
--- a/src/views/administrative_ticket_collection/detail.vue
+++ b/src/views/administrative_ticket_collection/detail.vue
@@ -189,9 +189,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/bid_document_examination/detail.vue b/src/views/bid_document_examination/detail.vue
index 1151689..be26fad 100644
--- a/src/views/bid_document_examination/detail.vue
+++ b/src/views/bid_document_examination/detail.vue
@@ -26,7 +26,7 @@
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.annex && formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
                     </div>
@@ -42,7 +42,7 @@
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.technical_review_annex && formData.technical_review_annex.length > 0">
                         <div v-for="(item, index) in formData.technical_review_annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
                     </div>
@@ -61,7 +61,7 @@
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.business_contract_deviation_annex && formData.business_contract_deviation_annex.length > 0">
                         <div v-for="(item, index) in formData.business_contract_deviation_annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
                     </div>
diff --git a/src/views/bidbbond/detail.vue b/src/views/bidbbond/detail.vue
index 95194d4..b02d3d8 100644
--- a/src/views/bidbbond/detail.vue
+++ b/src/views/bidbbond/detail.vue
@@ -153,9 +153,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/build/build_division/detail.vue b/src/views/build/build_division/detail.vue
index fff71b4..23f4370 100644
--- a/src/views/build/build_division/detail.vue
+++ b/src/views/build/build_division/detail.vue
@@ -128,9 +128,13 @@ defineExpose({
 
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/build/build_plan/detail.vue b/src/views/build/build_plan/detail.vue
index 808d1a6..207ead8 100644
--- a/src/views/build/build_plan/detail.vue
+++ b/src/views/build/build_plan/detail.vue
@@ -295,9 +295,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/build/build_process_settings/detail.vue b/src/views/build/build_process_settings/detail.vue
index 8a93294..258a9a3 100644
--- a/src/views/build/build_process_settings/detail.vue
+++ b/src/views/build/build_process_settings/detail.vue
@@ -142,9 +142,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/build/build_report/detail.vue b/src/views/build/build_report/detail.vue
index 44a3eb2..7196f5e 100644
--- a/src/views/build/build_report/detail.vue
+++ b/src/views/build/build_report/detail.vue
@@ -143,9 +143,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/competitor/detail.vue b/src/views/competitor/detail.vue
index 21232e5..e8d6f1e 100644
--- a/src/views/competitor/detail.vue
+++ b/src/views/competitor/detail.vue
@@ -3,95 +3,68 @@
     <div class="detail-popup">
         <popup ref="popupRef" title="竞争对手详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="组织">
 
-                                {{ formData.org_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="部门">
-                                {{ formData.dept_name }}
+                <el-descriptions :column="2" border>
+                    <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
+                    <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{ formData.dept_name }}</el-descriptions-item>
+                    <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
+                    <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project_name }}
+                    <el-descriptions-item label="需求名称" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.customer_demand_name }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="竞争对手名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor_name
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="竞争对手联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor_contacts
 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="联系人电话" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor_contacts_phone
 
-                                {{ formData.project_code }}
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="竞争能力" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitive_power
 
-                            </el-form-item>
-                        </el-col>
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="竞争对手优势" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor_advantages
 
-                        <el-col :span="12">
-                            <el-form-item label="需求名称">
-                                {{ formData.customer_demand_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="竞争对手名称">
-                                {{ formData.competitor_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="竞争对手联系人">
-                                {{ formData.competitor_contacts }}
-                            </el-form-item>
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="竞争对手劣势" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor_disadvantages
 
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="联系人电话">
-                                {{ formData.competitor_contacts_phone }}
-                            </el-form-item>
-                        </el-col>
+                    }}</el-descriptions-item>
+
+                    <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{ formData.remark
+
+                    }}</el-descriptions-item>
 
 
-                        <el-col :span="12">
-                            <el-form-item label="竞争能力">
-                                {{ formData.competitive_power }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="竞争对手优势">
-                                {{ formData.competitor_advantages }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="竞争对手劣势">
-                                {{ formData.competitor_disadvantages }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="附件">
-                                <div v-if="formData.annex && formData.annex.length > 0">
-                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
+                    <el-descriptions-item label="添加人" label-align="left" align="left" label-class-name="my-label"> {{ formData.add_user_name
 
-                                    </div>
-                                </div>
-                                <div v-else>暂无附件</div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="创建日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.create_time
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="更新人" label-align="left" align="left" label-class-name="my-label"> {{ formData.update_user_name
+
+
+                    }}</el-descriptions-item>
+                    <el-descriptions-item label="更新日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.update_time
+
+
+
+                    }}</el-descriptions-item>
+
+
+                    <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                        <div v-if="formData.annex.length > 0">
+                            <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
+                            </div>
+                        </div>
+                        <div v-else>
+                            暂无附件
+                        </div>
+                    </el-descriptions-item>
+                </el-descriptions>
             </el-form>
         </popup>
     </div>
@@ -174,9 +147,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/contract/detail.vue b/src/views/contract/detail.vue
index 7035323..26ee3a3 100644
--- a/src/views/contract/detail.vue
+++ b/src/views/contract/detail.vue
@@ -3,119 +3,240 @@
     <div class="detail-popup">
         <popup ref="popupRef" title="项目合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同名称">
-                                {{ formData.contract_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract_code }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="合同类型">
-                                <dict-value :options="dictData.contract_type" :value="formData.contract_type" />
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="合同计价方式">
-                                <dict-value :options="dictData.contract_pricing_method" :value="formData.contract_pricing_method" />
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="甲方">
-                                {{ formData.party_a }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="甲方主要负责人">
-                                {{ formData.party_a_diretor }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="甲方电话">
-                                {{ formData.party_a_phone }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="甲方手机">
-                                {{ formData.party_a_mobile }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="甲方邮箱">
-                                {{ formData.party_a_email }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="合同名称">
-                                {{ formData.contract_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="乙方">
-                                {{ formData.party_b }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="乙方主要负责人">
-                                {{ formData.party_b_diretor }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="乙方电话">
-                                {{ formData.party_a_phone }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="乙方手机">
-                                {{ formData.party_b_mobile }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="乙方邮箱">
-                                {{ formData.party_b_email }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
+                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                    <el-tab-pane label="合同信息" name="demo-tabs-1">
+                        <el-descriptions :column="2" border>
 
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="业务负责人">
-                                {{ formData.business_director }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="合同有效期">
-                                {{ formData.expire }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="签约日期">
-                                {{ formData.contract_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="主要条款">
-                                {{ formData.main_content }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="附件" prop="field127">
+                            <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                            <el-descriptions-item label="投标编号" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_document_no }}</el-descriptions-item>
+                            <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
+                            <el-descriptions-item label="合同名称" label-align="left" align="left" label-class-name="my-label">{{ formData.contract_code }}</el-descriptions-item>
+                            <el-descriptions-item label="合同编号" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                            <el-descriptions-item label="合同类型" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.contract_type_text }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="合同计价方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.contract_pricing_method_text
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="甲方" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_a
+
+                            }}</el-descriptions-item>
+
+                            <el-descriptions-item label="乙方" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_b }}</el-descriptions-item>
+
+                            <el-descriptions-item label="通讯地址" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_a_contact_address
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="通讯地址" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_b_contact_address
+
+                            }}</el-descriptions-item>
+
+                            <el-descriptions-item label="主要负责人" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_a_diretor
+
+                            }}</el-descriptions-item>
+
+                            <el-descriptions-item label="主要负责人" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_b_diretor
+
+                            }}</el-descriptions-item>
+
+
+
+
+                            <el-descriptions-item label="电话" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_a_phone
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="电话" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_b_phone
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="手机" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_a_mobile
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="手机" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_b_mobile
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="邮箱" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_a_email
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="邮箱" label-align="left" align="left" label-class-name="my-label"> {{ formData.party_b_email
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="金额" label-align="left" align="left" label-class-name="my-label"> {{ formData.amount
+
+                            }}</el-descriptions-item>
+                            <!-- <el-descriptions-item label="金额大写" label-align="left" align="left" label-class-name="my-label"> {{ formData.amount
+
+                            }}</el-descriptions-item> -->
+                            <el-descriptions-item label="业务负责人" label-align="left" align="left" label-class-name="my-label"> {{ formData.business_director_name
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="状态" label-align="left" align="left" label-class-name="my-label"> {{ formData.contract_status_text
+
+                            }}</el-descriptions-item>
+
+                            <el-descriptions-item label="合同有效期" label-align="left" align="left" label-class-name="my-label"> {{ formData.expire
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="签约日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.contract_date
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="主要条款" label-align="left" align="left" label-class-name="my-label"> {{ formData.main_content
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{ formData.remark
+
+                            }}</el-descriptions-item>
+
+
+                            <el-descriptions-item label="合同附件" label-align="left" align="left" label-class-name="my-label">
+                                <div v-if="formData.annex.length > 0">
+                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                        <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
 
-                                <div v-if="formDataannex.length > 0">
-                                    <div v-for="(item, index) in formDataannex" :key="index" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-                                        <!-- <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span> -->
                                     </div>
                                 </div>
-                                <div v-else>暂无文件</div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
+                                <div v-else>
+                                    暂无附件
+                                </div>
+                            </el-descriptions-item>
+                        </el-descriptions>
+                    </el-tab-pane>
+                    <el-tab-pane label="洽商" name="demo-tabs-2">
+                        <div>
+                            <el-table :data="tableData" stripe style="width: 100%">
+                                <el-table-column label="解决方案主题" prop='customer_demand_name' width="180" />
+                                <el-table-column label="提交时间" prop='submission_time' width="180" />
+                                <el-table-column label="方案内容" prop='solution_content' />
+                                <el-table-column label="客户反馈" prop='customer_feedback' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="发票" name="demo-tabs-3">
+                        <div>
+                            <el-table :data="tableData1" stripe style="width: 100%">
+                                <el-table-column label="概算来源" prop='estimate_source_text' width="180" />
+                                <el-table-column label="制单人" prop='create_user' width="180" />
+                                <el-table-column label="报价日期" prop='quotation_date' />
+                                <el-table-column label="技术人员" prop='technician_name' width="180" />
+                                <el-table-column label="概算金额(万元)" prop='estimate_amount' width="180" />
+                                <el-table-column label="要求" prop='ask' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="回款" name="demo-tabs-4">
+                        <div>
+                            <el-table :data="tableData2" stripe style="width: 100%">
+                                <el-table-column label="竞争对手名称" prop='competitor_name' width="180" />
+                                <el-table-column label="竞争对手联系人" prop='competitor_contacts' width="180" />
+                                <el-table-column label="联系人电话" prop='competitor_contacts_phone' />
+                                <el-table-column label="竞争能力" prop='competitive_power' />
+                                <el-table-column label="竞争对手优势" prop='competitor_advantages' />
+                                <el-table-column label="竞争对手劣势" prop='competitor_disadvantages' />
+                                <el-table-column label="备注" prop='remark' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="退款" name="demo-tabs-5">
+                        <div>
+                            <el-table :data="tableData2" stripe style="width: 100%">
+                                <el-table-column label="竞争对手名称" prop='competitor_name' width="180" />
+                                <el-table-column label="竞争对手联系人" prop='competitor_contacts' width="180" />
+                                <el-table-column label="联系人电话" prop='competitor_contacts_phone' />
+                                <el-table-column label="竞争能力" prop='competitive_power' />
+                                <el-table-column label="竞争对手优势" prop='competitor_advantages' />
+                                <el-table-column label="竞争对手劣势" prop='competitor_disadvantages' />
+                                <el-table-column label="备注" prop='remark' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="结算" name="demo-tabs-6">
+                        <div>
+                            <el-table :data="tableData2" stripe style="width: 100%">
+                                <el-table-column label="竞争对手名称" prop='competitor_name' width="180" />
+                                <el-table-column label="竞争对手联系人" prop='competitor_contacts' width="180" />
+                                <el-table-column label="联系人电话" prop='competitor_contacts_phone' />
+                                <el-table-column label="竞争能力" prop='competitive_power' />
+                                <el-table-column label="竞争对手优势" prop='competitor_advantages' />
+                                <el-table-column label="竞争对手劣势" prop='competitor_disadvantages' />
+                                <el-table-column label="备注" prop='remark' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
+                        </div>
+                    </el-tab-pane>
+                </el-tabs>
             </el-form>
         </popup>
     </div>
@@ -126,7 +247,14 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiCustomDetail } from '@/api/custom'
+import { apiCustomerDemandSolutionLists } from '@/api/customer_demand_solution'
+import { apiProjectEstimateLists } from '@/api/project_estimate'
+import { apiCompetitorLists } from '@/api/competitor'
 import { timeFormat } from '@/utils/util'
+import type { TabsPaneContext } from 'element-plus'
+
+const activeName = ref('demo-tabs-1')
+
 import type { PropType } from 'vue'
 defineProps({
     dictData: {
@@ -134,6 +262,26 @@ defineProps({
         default: () => ({})
     }
 })
+
+const pager1 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+const pager2 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+const pager3 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+
+const total = ref(0)
+const total1 = ref(0)
+const total2 = ref(0)
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
@@ -143,19 +291,85 @@ const datas = reactive({
     cityOptions: [],
     areaOptions: [],
 });
-
-
+const tableData = ref([])
+const tableData1 = ref([])
+const tableData2 = ref([])
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+    console.log(tab, event)
+}
 // 表单数据
 const formData = reactive({
 
 })
 
 
+//条数
+const handleSizeChange1 = (val: number) => {
+
+    pager1.page_size = val
+    solutionLists()
+}
+const handleSizeChange2 = (val: number) => {
+
+    pager2.page_size = val
+    estimateLists()
+}
+const handleSizeChange3 = (val: number) => {
+
+    pager3.page_size = val
+    competitorLists()
+}
+//分页
+const handleCurrentChange1 = (val: number) => {
+    console.log(`current page: ${val}`)
+    pager1.page_no = val
+    solutionLists()
+}
+const handleCurrentChange2 = (val: number) => {
+    console.log(`current page: ${val}`)
+    pager2.page_no = val
+    estimateLists()
+}
+const handleCurrentChange3 = (val: number) => {
+    pager3.page_no = val
+    console.log(`current page: ${val}`)
+    competitorLists()
+}
+// 解决方案列表
+const solutionLists = () => {
+    apiCustomerDemandSolutionLists(pager1).then((res) => {
+        tableData.value = res.lists
+
+        total.value = res.count
+
+    })
+}
+
+// 获取项目概算列表
+const estimateLists = () => {
+    apiProjectEstimateLists(pager2).then((res) => {
+        tableData1.value = res.lists
+        total1.value = res.count
+    })
+}
+
+// 获取竞争对手列表
+const competitorLists = () => {
+    apiCompetitorLists(pager3).then((res) => {
+        tableData2.value = res.lists
+        total2.value = res.count
+    })
+}
+
+
+
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
+    pager1.customer_demand_id = data.id
+    pager2.customer_demand_id = data.id
+    pager3.customer_demand_id = data.id
     if (data.annex && data.annex.length > 0) {
         const arry1 = data.annex.map((item: any, index: any) => {
             return {
@@ -165,8 +379,9 @@ const setFormData = async (data: Record<any, any>) => {
         });
         Object.assign(formDataannex, arry1)
     }
-
-
+    competitorLists()
+    solutionLists()
+    estimateLists()
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -207,9 +422,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue
index 262be07..517cf96 100644
--- a/src/views/contract/edit.vue
+++ b/src/views/contract/edit.vue
@@ -22,11 +22,11 @@
                         </el-form-item></el-col>
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="buy_bidding_document_id" @click="tanchuan" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="document_name" readonly clearable placeholder="请选择项目" />
+                            <el-input v-model="project_name" readonly clearable placeholder="请选择项目" />
                         </el-form-item></el-col>
                     <el-col :span="8">
                         <el-form-item label="项目编码" prop="buy_bidding_document_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="document_code" clearable disabled placeholder="系统自动填写" />
+                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
                         </el-form-item></el-col>
                     <el-col :span="8">
                         <el-form-item label="合同名称" prop="contract_name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
@@ -87,10 +87,10 @@
                             <el-input v-model="formData.amount" clearable placeholder="请输入金额" @input="amountinput" />
                         </el-form-item></el-col><el-col :span="8">
                         <el-form-item label="金额大写" prop="amount_daxie">
-                            <el-input v-model="formData.amount_daxie" readonly clearable placeholder="请输入金额大写" />
+                            <el-input v-model="amount_daxie" readonly clearable placeholder="请输入金额大写" />
                         </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="业务负责人" prop="business_director">
-                            <el-input v-model="formData.business_director" clearable placeholder="请输入业务负责人" />
+                        <el-form-item label="业务负责人" prop="business_director" @click="userclick">
+                            <el-input v-model="business_director_name" readonly clearable placeholder="请输入业务负责人" />
                         </el-form-item></el-col>
                     <el-col :span="24">
 
@@ -149,6 +149,7 @@
         <el-dialog v-model="showDialog2" title="选择项目" width="70%">
             <projectTable @customEvent="customEvent2" :customer_id="formData.customer_id"></projectTable>
         </el-dialog>
+        <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
     </div>
 </template>
 
@@ -158,6 +159,7 @@ import Popup from '@/components/popup/index.vue'
 import biddocumentTable from "@/components/biddocument/index.vue"
 import reviewprocess from '@/components/reviewprocess/index.vue'
 import projectTable from "@/components/project/index.vue"
+import personnelselector from '@/components/personnelselector/index.vue'
 import { apiContractAdd, apiContractEdit, apiContractDetail } from '@/api/contract'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
@@ -180,11 +182,14 @@ const showDialog = ref(false)
 const showDialog1 = ref(false)
 const showDialog2 = ref(false)
 const custom_name = ref('')
-const document_name = ref('')
-const document_code = ref('')
+const project_name = ref('')
+const project_code = ref('')
 const bidding_code = ref('')
+const amount_daxie = ref('')
+const business_director_name = ref('')
 const list1 = reactive([])
 const list2 = reactive([])
+const personnel = ref<any>()
 import { deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
 import feedback from '@/utils/feedback'
@@ -232,7 +237,18 @@ const handleAvatarSuccess_four = (
 const delFileFn = (index: number) => {
     formDataannex.splice(index, 1)
 }
+//打开弹窗
 
+const userclick = () => {
+    // console.log(personnel.value, '1111111')
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData.business_director = e.id;
+    business_director_name.value = e.name;
+}
 //获取值打开弹窗
 const tanchuan = () => {
     if (formData.customer_id) {
@@ -251,14 +267,14 @@ const customEvent = (e: any) => {
 };
 const customEvent1 = (e: any) => {
     formData.buy_bidding_document_id = e.id;
-    document_name.value = e.project_name;
-    document_code.value = e.project_code
+    project_name.value = e.project_name;
+    project_code.value = e.project_code
     bidding_code.value = e.bid_document_no
     showDialog1.value = false;
 };
 const customEvent2 = (e: any) => {
-    document_name.value = e.name;
-    document_code.value = e.project_code
+    project_name.value = e.name;
+    project_code.value = e.project_code
     showDialog2.value = false;
 };
 
@@ -266,7 +282,7 @@ const customEvent2 = (e: any) => {
 const amountinput = (e) => {
     // console.log(e)
     if (e && e > 0) {
-        formData.amount_daxie = toChinesNum(e)
+        amount_daxie.value = toChinesNum(e)
     }
 }
 //获取所有组织
@@ -327,7 +343,7 @@ const formData = reactive({
     party_b_mobile: '',
     party_b_email: '',
     amount: '',
-    amount_daxie: '',
+
     business_director: '',
     contract_status: '',
     expire: '',
@@ -362,17 +378,21 @@ const setFormData = async (data: Record<any, any>) => {
     if (data.dept_id) {
         getlist1(data.org_id)
     }
+
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
             formData[key] = data[key]
         }
     }
-    custom_name.value = data.custom.name
-    document_name.value = data.document.bid_company_name
-    document_code.value = data.document.bid_document_no
-    bidding_code.value = data.document.bid_document_no
-
+    if (data.amount) {
+        amountinput(data.amount)
+    }
+    custom_name.value = data.custom_name
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    bidding_code.value = data.bid_document_no
+    business_director_name.value = data.business_director_name
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index 1fee9a1..fed87ea 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -31,11 +31,12 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="客户名称" prop="customer_name" show-overflow-tooltip />
-                    <el-table-column label="审批id" prop="approve_id" show-overflow-tooltip />
+                    <el-table-column label="流程编号" prop="code" show-overflow-tooltip />
+                    <el-table-column label="合同编号" prop="bid_document_no" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
-                    <el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip />
+
                     <el-table-column label="合同类型" prop="contract_type">
                         <template #default="{ row }">
                             <dict-value :options="dictData.contract_type" :value="row.contract_type" />
diff --git a/src/views/contract_negotiation/detail.vue b/src/views/contract_negotiation/detail.vue
index caa07c4..6cbeb33 100644
--- a/src/views/contract_negotiation/detail.vue
+++ b/src/views/contract_negotiation/detail.vue
@@ -163,9 +163,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/cost_budget_adjust/edit.vue b/src/views/cost_budget_adjust/edit.vue
index 4023070..0af5971 100644
--- a/src/views/cost_budget_adjust/edit.vue
+++ b/src/views/cost_budget_adjust/edit.vue
@@ -471,11 +471,15 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
 
 
diff --git a/src/views/cost_budget_adjust_detail/edit.vue b/src/views/cost_budget_adjust_detail/edit.vue
index 8a039cb..083b547 100644
--- a/src/views/cost_budget_adjust_detail/edit.vue
+++ b/src/views/cost_budget_adjust_detail/edit.vue
@@ -476,11 +476,15 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
 
 
diff --git a/src/views/costbudget/edit.vue b/src/views/costbudget/edit.vue
index 8a039cb..083b547 100644
--- a/src/views/costbudget/edit.vue
+++ b/src/views/costbudget/edit.vue
@@ -476,11 +476,15 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
 
 
diff --git a/src/views/custom/detail.vue b/src/views/custom/detail.vue
index 90e7f32..7ef535d 100644
--- a/src/views/custom/detail.vue
+++ b/src/views/custom/detail.vue
@@ -343,9 +343,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/custom/edit.vue b/src/views/custom/edit.vue
index 63c8ed3..7c12bec 100644
--- a/src/views/custom/edit.vue
+++ b/src/views/custom/edit.vue
@@ -568,9 +568,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/custom_contacts/detail.vue b/src/views/custom_contacts/detail.vue
index d2892e7..6a86cf0 100644
--- a/src/views/custom_contacts/detail.vue
+++ b/src/views/custom_contacts/detail.vue
@@ -17,7 +17,8 @@
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.annex && formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }} 查看</a>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
                         </div>
                     </div>
                     <div v-else>
diff --git a/src/views/custom_follow/detail.vue b/src/views/custom_follow/detail.vue
index 368157b..65c47e7 100644
--- a/src/views/custom_follow/detail.vue
+++ b/src/views/custom_follow/detail.vue
@@ -19,7 +19,8 @@
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.annex && formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }} 查看</a>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
                         </div>
                     </div>
                     <div v-else>
diff --git a/src/views/custom_service/detail.vue b/src/views/custom_service/detail.vue
index 8995de3..5062d79 100644
--- a/src/views/custom_service/detail.vue
+++ b/src/views/custom_service/detail.vue
@@ -34,12 +34,12 @@
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.annex && formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }} 查看</a>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
+                        </div>
+                        <div v-else>
+                            暂无文件
                         </div>
-                    </div>
-                    <div v-else>
-                        暂无文件
-                    </div>
                 </el-descriptions-item>
 
 
diff --git a/src/views/custom_service/handle.vue b/src/views/custom_service/handle.vue
index 2c32ce9..48965b8 100644
--- a/src/views/custom_service/handle.vue
+++ b/src/views/custom_service/handle.vue
@@ -120,7 +120,7 @@
                         <el-form-item label="附件" prop="field87">
                             <div v-if="formData.annex && formData.annex.length > 0">
                                 <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
+                                    <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
 
                                 </div>
                             </div>
diff --git a/src/views/customer_demand/detail.vue b/src/views/customer_demand/detail.vue
index 7b87977..f0b3012 100644
--- a/src/views/customer_demand/detail.vue
+++ b/src/views/customer_demand/detail.vue
@@ -5,84 +5,58 @@
             <el-form ref="formRef" :model="formData" label-width="120px">
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="需求详情" name="first">
-                        <el-card class="mb-2">
-                            <el-row>
-                                <el-col :span="12">
-                                    <el-form-item label="组织">
+                        <el-descriptions :column="2" border>
+                            <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
+                            <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{ formData.dept_name }}</el-descriptions-item>
+                            <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
+                            <el-descriptions-item label="需求主题" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.theme }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="客户需求提供人" label-align="left" align="left" label-class-name="my-label"> {{ formData.supplier
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="提供人联系方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.supplier_contacts
 
-                                        {{ formData.org_name }}
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="部门">
-                                        {{ formData.dept_name }}
+                            }}</el-descriptions-item>
 
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="项目名称">
-                                        {{ formData.project_name }}
+                            <el-descriptions-item label="重要程度" label-align="left" align="left" label-class-name="my-label"> {{ formData.importance_text }}</el-descriptions-item>
 
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="客户名称">
-                                        {{ formData.custom_name }}
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="项目编码">
+                            <el-descriptions-item label="记录时间" label-align="left" align="left" label-class-name="my-label"> {{ formData.recording_time
 
-                                        {{ formData.project_code }}
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="需求内容" label-align="left" align="left" label-class-name="my-label"> {{ formData.demand_content
 
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="需求主题">
-                                        {{ formData.theme }}
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="需求提供人">
-                                        {{ formData.supplier }}
-                                    </el-form-item>
+                            }}</el-descriptions-item>
 
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="提供人联系方式">
-                                        {{ formData.supplier_contacts }}
-                                    </el-form-item>
-                                </el-col>
+                            <el-descriptions-item label="添加人" label-align="left" align="left" label-class-name="my-label"> {{ formData.add_user_name
 
-                                <el-col :span="24">
-                                    <el-form-item label="重要程度">
-                                        <dict-value :options="dictData.importance" :value="formData.importance" />
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="记录时间">
-                                        {{ formData.recording_time }}
-                                    </el-form-item>
-                                </el-col> <el-col :span="12">
-                                    <el-form-item label="需求内容">
-                                        {{ formData.demand_content }}
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="附件">
-                                        <div v-if="formDataannex.length > 0">
-                                            <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                                <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-                                                <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                            </div>
-                                        </div>
-                                        <div v-else>
-                                            暂无附件
-                                        </div>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                        </el-card>
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="创建日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.create_time
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="更新人" label-align="left" align="left" label-class-name="my-label"> {{ formData.update_user_name
+
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="更新日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.update_time
+
+
+
+                            }}</el-descriptions-item>
+
+
+                            <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                                <div v-if="formDataannex.length > 0">
+                                    <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
+                                        <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</el-link>
+
+                                    </div>
+                                </div>
+                                <div v-else>
+                                    暂无附件
+                                </div>
+                            </el-descriptions-item>
+                        </el-descriptions>
                     </el-tab-pane>
                     <el-tab-pane label="解决方案" name="second">
                         <div>
@@ -350,9 +324,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/customer_demand_solution/detail.vue b/src/views/customer_demand_solution/detail.vue
index 7c30fe2..c053c78 100644
--- a/src/views/customer_demand_solution/detail.vue
+++ b/src/views/customer_demand_solution/detail.vue
@@ -2,82 +2,57 @@
 <template>
     <div class="detail-popup">
         <popup ref="popupRef" title="解决方案详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="组织">
-
-                                {{ formData.org_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="部门">
-                                {{ formData.dept_name }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project_name }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-
-                                {{ formData.project_code }}
-
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="需求名称">
-                                {{ formData.customer_demand_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="解决方案主题">
-                                {{ formData.theme }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="方案内容">
-                                {{ formData.solution_content }}
-                            </el-form-item>
-
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="客户反馈">
-                                {{ formData.customer_feedback }}
-                            </el-form-item>
-                        </el-col>
 
 
-                        <el-col :span="12">
-                            <el-form-item label="提交时间">
-                                {{ formData.submission_time }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="附件">
-                                <div v-if="formData.annex && formData.annex.length > 0">
-                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{ formData.dept_name }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
+                <el-descriptions-item label="需求名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.customer_demand_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="解决方案主题" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.theme }}
+                </el-descriptions-item>
+                <el-descriptions-item label="提交时间" label-align="left" align="left" label-class-name="my-label"> {{ formData.submission_time
+                }}</el-descriptions-item>
+                <el-descriptions-item label="方案内容" label-align="left" align="left" label-class-name="my-label"> {{ formData.solution_content
+
+                }}</el-descriptions-item>
+
+
+
+                <el-descriptions-item label="添加人" label-align="left" align="left" label-class-name="my-label"> {{ formData.add_user_name
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="创建日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.create_time
+                }}</el-descriptions-item>
+                <el-descriptions-item label="更新人" label-align="left" align="left" label-class-name="my-label"> {{ formData.update_user_name
+
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="更新日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.update_time
+
+
+
+                }}</el-descriptions-item>
+
+
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <div v-if="formData.annex.length > 0">
+                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
+                        </div>
+                    </div>
+                    <div v-else>
+                        暂无附件
+                    </div>
+                </el-descriptions-item>
+            </el-descriptions>
 
-                                    </div>
-                                </div>
-                                <div v-else>暂无附件</div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
-            </el-form>
         </popup>
     </div>
 </template>
@@ -159,9 +134,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/expense_reimbursement/detail.vue b/src/views/expense_reimbursement/detail.vue
index 01a9fd0..d9c37b5 100644
--- a/src/views/expense_reimbursement/detail.vue
+++ b/src/views/expense_reimbursement/detail.vue
@@ -176,9 +176,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/finance_payment_apply/detail.vue b/src/views/finance_payment_apply/detail.vue
index fa89ec8..6aad2a9 100644
--- a/src/views/finance_payment_apply/detail.vue
+++ b/src/views/finance_payment_apply/detail.vue
@@ -186,9 +186,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/finance_payment_plan/detail.vue b/src/views/finance_payment_plan/detail.vue
index e5cc02e..ff97e86 100644
--- a/src/views/finance_payment_plan/detail.vue
+++ b/src/views/finance_payment_plan/detail.vue
@@ -168,9 +168,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/finance_receipt_record/detail.vue b/src/views/finance_receipt_record/detail.vue
index 6563e99..1e4409e 100644
--- a/src/views/finance_receipt_record/detail.vue
+++ b/src/views/finance_receipt_record/detail.vue
@@ -183,9 +183,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/finance_refund_record/detail.vue b/src/views/finance_refund_record/detail.vue
index d9060ed..ec70627 100644
--- a/src/views/finance_refund_record/detail.vue
+++ b/src/views/finance_refund_record/detail.vue
@@ -167,9 +167,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/financialManagement/Management/editadjust.vue b/src/views/financialManagement/Management/editadjust.vue
index 4023070..0af5971 100644
--- a/src/views/financialManagement/Management/editadjust.vue
+++ b/src/views/financialManagement/Management/editadjust.vue
@@ -471,11 +471,15 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
 
 
diff --git a/src/views/financialManagement/Management/editcost.vue b/src/views/financialManagement/Management/editcost.vue
index 8a039cb..083b547 100644
--- a/src/views/financialManagement/Management/editcost.vue
+++ b/src/views/financialManagement/Management/editcost.vue
@@ -476,11 +476,15 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
 
 
diff --git a/src/views/financialManagement/bankAccount/bankAccount/detail.vue b/src/views/financialManagement/bankAccount/bankAccount/detail.vue
index ba3c498..9bf0137 100644
--- a/src/views/financialManagement/bankAccount/bankAccount/detail.vue
+++ b/src/views/financialManagement/bankAccount/bankAccount/detail.vue
@@ -177,9 +177,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/financialManagement/bankAccount/interestRate/detail.vue b/src/views/financialManagement/bankAccount/interestRate/detail.vue
index 9c7a010..14e6302 100644
--- a/src/views/financialManagement/bankAccount/interestRate/detail.vue
+++ b/src/views/financialManagement/bankAccount/interestRate/detail.vue
@@ -177,9 +177,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/financialManagement/bankAccount/revenueWater/detail.vue b/src/views/financialManagement/bankAccount/revenueWater/detail.vue
index c2a2870..6ac5d9d 100644
--- a/src/views/financialManagement/bankAccount/revenueWater/detail.vue
+++ b/src/views/financialManagement/bankAccount/revenueWater/detail.vue
@@ -177,9 +177,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/financialManagement/expense_reimbursement/detail.vue b/src/views/financialManagement/expense_reimbursement/detail.vue
index 01a9fd0..d9c37b5 100644
--- a/src/views/financialManagement/expense_reimbursement/detail.vue
+++ b/src/views/financialManagement/expense_reimbursement/detail.vue
@@ -176,9 +176,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/material_classify/detail.vue b/src/views/material_classify/detail.vue
index 9e544b2..0dd9a36 100644
--- a/src/views/material_classify/detail.vue
+++ b/src/views/material_classify/detail.vue
@@ -172,9 +172,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/material_list/detail.vue b/src/views/material_list/detail.vue
index 7ce5a90..9cd75b6 100644
--- a/src/views/material_list/detail.vue
+++ b/src/views/material_list/detail.vue
@@ -174,9 +174,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/material_warehouse/detail.vue b/src/views/material_warehouse/detail.vue
index e71b241..cef54a5 100644
--- a/src/views/material_warehouse/detail.vue
+++ b/src/views/material_warehouse/detail.vue
@@ -186,9 +186,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/ordermanagement/saleorder/detail.vue b/src/views/ordermanagement/saleorder/detail.vue
index 2d9d7e8..5901820 100644
--- a/src/views/ordermanagement/saleorder/detail.vue
+++ b/src/views/ordermanagement/saleorder/detail.vue
@@ -275,9 +275,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/procurement_contract/detail.vue b/src/views/procurement_contract/detail.vue
index 38b2352..4045fdc 100644
--- a/src/views/procurement_contract/detail.vue
+++ b/src/views/procurement_contract/detail.vue
@@ -197,9 +197,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/procurement_contract_change/detail.vue b/src/views/procurement_contract_change/detail.vue
index b769cf1..bec3971 100644
--- a/src/views/procurement_contract_change/detail.vue
+++ b/src/views/procurement_contract_change/detail.vue
@@ -181,9 +181,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/procurement_contract_detail/detail.vue b/src/views/procurement_contract_detail/detail.vue
index 9a95f04..e796171 100644
--- a/src/views/procurement_contract_detail/detail.vue
+++ b/src/views/procurement_contract_detail/detail.vue
@@ -153,9 +153,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project/detail.vue b/src/views/project/detail.vue
index a9c1f6f..b981260 100644
--- a/src/views/project/detail.vue
+++ b/src/views/project/detail.vue
@@ -51,7 +51,8 @@
                             <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                                 <div v-if="formData.annex && formData.annex.length > 0">
                                     <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }} 查看</a>
+                                        <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
                                     </div>
                                 </div>
                                 <div v-else>
@@ -73,7 +74,7 @@
                     <el-tab-pane label="分包" name="demo-9">Config</el-tab-pane>
                     <el-tab-pane label="进度" name="demo-10">Role</el-tab-pane>
                     <el-tab-pane label="任务" name="demo-11">Task</el-tab-pane>
-                    <el-tab-pane label="人力" name="demo-8">Task</el-tab-pane>
+                    <el-tab-pane label="人力" name="demo-12">Task</el-tab-pane>
                     <el-tab-pane label="机具" name="demo-13">Task</el-tab-pane>
                     <el-tab-pane label="收款" name="demo-14">Task</el-tab-pane>
                     <el-tab-pane label="付款" name="demo-15">Task</el-tab-pane>
diff --git a/src/views/project_alarm/outputvalue/details/detail.vue b/src/views/project_alarm/outputvalue/details/detail.vue
index 35e19a5..2bc5809 100644
--- a/src/views/project_alarm/outputvalue/details/detail.vue
+++ b/src/views/project_alarm/outputvalue/details/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_alarm/outputvalue/report/detail.vue b/src/views/project_alarm/outputvalue/report/detail.vue
index 35e19a5..2bc5809 100644
--- a/src/views/project_alarm/outputvalue/report/detail.vue
+++ b/src/views/project_alarm/outputvalue/report/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_alarm/warningrecords/detail.vue b/src/views/project_alarm/warningrecords/detail.vue
index 35e19a5..2bc5809 100644
--- a/src/views/project_alarm/warningrecords/detail.vue
+++ b/src/views/project_alarm/warningrecords/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_alarm_set/detail.vue b/src/views/project_alarm_set/detail.vue
index 52769e3..58c3616 100644
--- a/src/views/project_alarm_set/detail.vue
+++ b/src/views/project_alarm_set/detail.vue
@@ -126,9 +126,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_attendance_detail/detail.vue b/src/views/project_attendance_detail/detail.vue
index c13161c..032879d 100644
--- a/src/views/project_attendance_detail/detail.vue
+++ b/src/views/project_attendance_detail/detail.vue
@@ -191,9 +191,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_attendance_record/detail.vue b/src/views/project_attendance_record/detail.vue
index c975a3c..e65be44 100644
--- a/src/views/project_attendance_record/detail.vue
+++ b/src/views/project_attendance_record/detail.vue
@@ -118,9 +118,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_attendance_record/index.vue b/src/views/project_attendance_record/index.vue
index 75e62c2..6b04a77 100644
--- a/src/views/project_attendance_record/index.vue
+++ b/src/views/project_attendance_record/index.vue
@@ -33,7 +33,7 @@
                     <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="日期" prop="attendance_date" show-overflow-tooltip />
-                    <el-table-column label="出勤人数" prop="due_date" show-overflow-tooltip />
+                    <el-table-column label="出勤人数" prop=" " show-overflow-tooltip />
                     <el-table-column label="记工数量" prop="work_record_num_total" show-overflow-tooltip />
                     <el-table-column label="日工资合计" prop="daily_salary_total" show-overflow-tooltip />
                     <el-table-column label="日生活费合计" prop="daily_living_total" show-overflow-tooltip />
diff --git a/src/views/project_budget/detail.vue b/src/views/project_budget/detail.vue
index f307ebb..95209b8 100644
--- a/src/views/project_budget/detail.vue
+++ b/src/views/project_budget/detail.vue
@@ -130,9 +130,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_cost_temp_set/detail.vue b/src/views/project_cost_temp_set/detail.vue
index f307ebb..95209b8 100644
--- a/src/views/project_cost_temp_set/detail.vue
+++ b/src/views/project_cost_temp_set/detail.vue
@@ -130,9 +130,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_document/detail.vue b/src/views/project_document/detail.vue
index f2ce474..50017b2 100644
--- a/src/views/project_document/detail.vue
+++ b/src/views/project_document/detail.vue
@@ -150,9 +150,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_document_set/detail.vue b/src/views/project_document_set/detail.vue
index 08a40a6..ea8713e 100644
--- a/src/views/project_document_set/detail.vue
+++ b/src/views/project_document_set/detail.vue
@@ -132,9 +132,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_estimate/detail.vue b/src/views/project_estimate/detail.vue
index e6767e9..99fc528 100644
--- a/src/views/project_estimate/detail.vue
+++ b/src/views/project_estimate/detail.vue
@@ -2,91 +2,75 @@
 <template>
     <div class="detail-popup">
         <popup ref="popupRef" title="项目概算详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="组织">
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{ formData.dept_name }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
+                <el-descriptions-item label="概算来源" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.estimate_source_text
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="需求名称" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.customer_demand_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contact_name
+                }}</el-descriptions-item>
+                <el-descriptions-item label="联系电话" label-align="left" align="left" label-class-name="my-label"> {{ formData.contact_phone
 
-                                {{ formData.org_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="部门">
-                                {{ formData.dept_name }}
+                }}</el-descriptions-item>
+                <el-descriptions-item label="制单人" label-align="left" align="left" label-class-name="my-label"> {{ formData.create_user
 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project_name }}
+                }}</el-descriptions-item>
 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="需求名称">
+                <el-descriptions-item label="报价日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.quotation_date
 
-                                {{ formData.customer_demand_name }}
+                }}</el-descriptions-item>
 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="概算来源">
-                                <dict-value :options="dictData.estimate_source" :value="formData.estimate_source" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="制单人">
-                                {{ formData.create_user }}
-                            </el-form-item>
+                <el-descriptions-item label="发票类型" label-align="left" align="left" label-class-name="my-label"> {{ formData.invoice_type_text
 
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="技术人员">
-                                {{ formData.technician_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="报价日期">
-                                {{ formData.quotation_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="发票类型">
-                                <dict-value :options="dictData.invoice_type" :value="formData.invoice_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="概算金额">
-                                {{ formData.estimate_amount }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="要求">
-                                {{ formData.ask }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="附件" prop="field127">
+                }}</el-descriptions-item>
 
-                                <div v-if="formDataannex.length > 0">
-                                    <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-                                        <!-- <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span> -->
-                                    </div>
-                                </div>
-                                <div v-else>暂无附件</div>
+                <el-descriptions-item label="概算金额(万元)" label-align="left" align="left" label-class-name="my-label"> {{ formData.estimate_amount
+
+                }}</el-descriptions-item>
+
+                <el-descriptions-item label="要求" label-align="left" align="left" label-class-name="my-label"> {{ formData.ask
+
+                }}</el-descriptions-item>
 
 
 
-                            </el-form-item></el-col>
-                    </el-row>
-                </el-card>
-            </el-form>
+
+                <el-descriptions-item label="添加人" label-align="left" align="left" label-class-name="my-label"> {{ formData.add_user_name
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="创建日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.create_time
+                }}</el-descriptions-item>
+                <el-descriptions-item label="更新人" label-align="left" align="left" label-class-name="my-label"> {{ formData.update_user_name
+
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="更新日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.update_time
+
+
+
+                }}</el-descriptions-item>
+
+
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <div v-if="formData.annex.length > 0">
+                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
+                        </div>
+                    </div>
+                    <div v-else>
+                        暂无附件
+                    </div>
+                </el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -125,15 +109,7 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-    if (data.annex && data.annex.length > 0) {
-        const arry1 = data.annex.map((item: any, index: any) => {
-            return {
-                name: `文件${index + 1}`,
-                uri: item
-            };
-        });
-        Object.assign(formDataannex, arry1)
-    }
+
 
 
 
@@ -177,9 +153,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_finance/business_trip_application/detail.vue b/src/views/project_finance/business_trip_application/detail.vue
index 902608d..7733149 100644
--- a/src/views/project_finance/business_trip_application/detail.vue
+++ b/src/views/project_finance/business_trip_application/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_finance/cost_adjustment/detail.vue b/src/views/project_finance/cost_adjustment/detail.vue
index 35e19a5..2bc5809 100644
--- a/src/views/project_finance/cost_adjustment/detail.vue
+++ b/src/views/project_finance/cost_adjustment/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_finance/expense_reimbursement/detail.vue b/src/views/project_finance/expense_reimbursement/detail.vue
index 35e19a5..2bc5809 100644
--- a/src/views/project_finance/expense_reimbursement/detail.vue
+++ b/src/views/project_finance/expense_reimbursement/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_finance/loanapplication/detail.vue b/src/views/project_finance/loanapplication/detail.vue
index 35e19a5..2bc5809 100644
--- a/src/views/project_finance/loanapplication/detail.vue
+++ b/src/views/project_finance/loanapplication/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_finance/travel_reimbursement/detail.vue b/src/views/project_finance/travel_reimbursement/detail.vue
index 0e02887..af590ba 100644
--- a/src/views/project_finance/travel_reimbursement/detail.vue
+++ b/src/views/project_finance/travel_reimbursement/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_follow_up/detail.vue b/src/views/project_follow_up/detail.vue
index d6cb781..28a2f5c 100644
--- a/src/views/project_follow_up/detail.vue
+++ b/src/views/project_follow_up/detail.vue
@@ -2,108 +2,69 @@
 <template>
     <div class="detail-popup">
         <popup ref="popupRef" title="项目更近记录详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project_code }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom_name
-                                }}
 
-                            </el-form-item>
-                        </el-col>
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
+                <el-descriptions-item label="执行人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.executor }}
+                </el-descriptions-item>
+                <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts
+                }}</el-descriptions-item>
+                <el-descriptions-item label="联系方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.contact_information
 
-                        <el-col :span="12">
-                            <el-form-item label="执行人">
-                                {{ formData.executor
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="联系人">
-                                {{ formData.contacts }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="联系方式">
-                                {{ formData.contact_information }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目角色">
-                                {{ formData.project_role }}
-                            </el-form-item>
-                        </el-col>
+                }}</el-descriptions-item>
 
-                        <el-col :span="12">
-                            <el-form-item label="跟进类型">
-                                <dict-value :options="dictData.follow_type" :value="formData.follow_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="跟进日期">
-                                {{ formData.follow_date }}
-                            </el-form-item>
+                <el-descriptions-item label="项目角色" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_role
 
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="主题">
-                                {{ formData.theme }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="行动描述">
-                                {{ formData.action_description }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目把握度">
-                                <dict-value :options="dictData.project_assurance" :value="formData.project_assurance" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="跟进状态">
-                                <dict-value :options="dictData.follow_status" :value="formData.follow_status" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="跟进阶段">
-                                <dict-value :options="dictData.follow_stage" :value="formData.follow_stage" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.notes }}
-                            </el-form-item>
-                        </el-col> <el-col :span="12">
-                            <el-form-item label="下次回访日期">
-                                {{ formData.next_follow_up_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="附件">
-                                <div v-if="formData.annex && formData.annex.length > 0">
-                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
 
-                                    </div>
-                                </div>
-                                <div v-else>暂无附件</div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
-            </el-form>
+                }}</el-descriptions-item>
+
+                <el-descriptions-item label="职位" label-align="left" align="left" label-class-name="my-label"> {{ formData.position
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.follow_date
+
+                }}</el-descriptions-item>
+
+                <el-descriptions-item label="主题" label-align="left" align="left" label-class-name="my-label"> {{ formData.theme
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="行动描述" label-align="left" align="left" label-class-name="my-label"> {{ formData.action_description
+
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="项目把握度" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_assurance_text
+
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="状态" label-align="left" align="left" label-class-name="my-label"> {{ formData.follow_status_text
+
+
+                }}</el-descriptions-item>
+
+                <el-descriptions-item label="阶段" label-align="left" align="left" label-class-name="my-label"> {{ formData.follow_stage_text
+
+
+                }}</el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{ formData.notes
+
+                }}</el-descriptions-item><el-descriptions-item label="下次回访日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.next_follow_up_date
+
+}}</el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <div v-if="formData.annex && formData.annex.length > 0">
+                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
+
+                        </div>
+                    </div>
+                    <div v-else>暂无附件</div>
+                </el-descriptions-item>
+            </el-descriptions>
+
         </popup>
     </div>
 </template>
@@ -185,9 +146,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_insurance_management/detail.vue b/src/views/project_insurance_management/detail.vue
index e948a59..1f7867e 100644
--- a/src/views/project_insurance_management/detail.vue
+++ b/src/views/project_insurance_management/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_job_type/detail.vue b/src/views/project_job_type/detail.vue
index 2da20d0..89b7800 100644
--- a/src/views/project_job_type/detail.vue
+++ b/src/views/project_job_type/detail.vue
@@ -136,9 +136,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_labor_contract/detail.vue b/src/views/project_labor_contract/detail.vue
index eea822e..4edd658 100644
--- a/src/views/project_labor_contract/detail.vue
+++ b/src/views/project_labor_contract/detail.vue
@@ -185,9 +185,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_list/detail.vue b/src/views/project_list/detail.vue
new file mode 100644
index 0000000..a5752e2
--- /dev/null
+++ b/src/views/project_list/detail.vue
@@ -0,0 +1,1078 @@
+
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="项目立项详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="auto">
+                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                    <el-tab-pane label="概况" name="demo-1">
+
+
+                        <el-descriptions :column="3" title="基本信息" border>
+                            <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
+                            <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.dept_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.project_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
+                            <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.custom_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目状态" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.contract_code }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="项目类型" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_type_name }}</el-descriptions-item>
+                            <el-descriptions-item label="立项日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.create_time }}</el-descriptions-item>
+                            <el-descriptions-item label="项目所在地" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_address }}</el-descriptions-item>
+                            <el-descriptions-item label="战略意义" label-align="left" align="left" label-class-name="my-label"> {{ formData.strategic_significance_text }}</el-descriptions-item>
+                            <el-descriptions-item label="所属行业" label-align="left" align="left" label-class-name="my-label"> {{ formData.industry_text }}</el-descriptions-item>
+                            <el-descriptions-item label="单位性质" label-align="left" align="left" label-class-name="my-label"> {{ formData.unit_nature_text }}</el-descriptions-item>
+                            <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.bidding_method_text }}</el-descriptions-item>
+                            <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label"> {{ formData.bidding_time }}</el-descriptions-item>
+                            <el-descriptions-item label="预计工期" label-align="left" align="left" label-class-name="my-label"> {{ formData.estimated_construction }}</el-descriptions-item>
+                            <el-descriptions-item label="项目估算(万元)" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_estimation }}</el-descriptions-item>
+                            <el-descriptions-item label="项目估算(外币)" label-align="left" align="left" label-class-name="my-label"> {{ formData.name }}</el-descriptions-item>
+                            <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts }}</el-descriptions-item>
+                            <el-descriptions-item label="联系人部门" label-align="left" align="left" label-class-name="my-label"> {{ formData.department }}</el-descriptions-item>
+                            <el-descriptions-item label="联系人职位" label-align="left" align="left" label-class-name="my-label"> {{ formData.position }}</el-descriptions-item>
+                            <el-descriptions-item label="关系度" label-align="left" align="left" label-class-name="my-label"> {{ formData.telephone }}</el-descriptions-item>
+                            <el-descriptions-item label="发现时间" label-align="left" align="left" label-class-name="my-label"> {{ formData.discovery_time }}</el-descriptions-item>
+                            <el-descriptions-item label="信息来源" label-align="left" align="left" label-class-name="my-label"> {{ formData.information_sources_text }}</el-descriptions-item>
+                            <el-descriptions-item label="负责人" label-align="left" align="left" label-class-name="my-label"> {{ formData.person }}</el-descriptions-item>
+                            <el-descriptions-item label="项目内容" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_content }}</el-descriptions-item>
+                            <el-descriptions-item label="竞争对手" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor }}</el-descriptions-item>
+                            <el-descriptions-item label="项目建设资金来源" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_funds_sources_text }}</el-descriptions-item>
+                            <el-descriptions-item label="建设单位付款方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_payment_method }}</el-descriptions-item>
+                            <el-descriptions-item label="建设单位财务状况" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_financial_status_text }}</el-descriptions-item>
+                            <el-descriptions-item label="建设单位对我方认可度" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_recognition_text }}</el-descriptions-item>
+                            <el-descriptions-item label="我方对建设单位认可度" label-align="left" align="left" label-class-name="my-label"> {{ formData.my_construction_recognition_text }}</el-descriptions-item>
+                            <!-- <el-descriptions-item label="项目开始日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.notes }}</el-descriptions-item>
+                            <el-descriptions-item label="项目交付日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.notes }}</el-descriptions-item> -->
+
+
+
+
+
+                            <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                                <div v-if="formData.annex && formData.annex.length > 0">
+                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }} 查看</a>
+                                    </div>
+                                </div>
+                                <div v-else>
+                                    暂无文件
+                                </div>
+                            </el-descriptions-item>
+
+
+                        </el-descriptions>
+
+                    </el-tab-pane>
+                    <el-tab-pane label="商机" name="demo-2">
+                        <div class="tit">项目跟进</div>
+                        <div>
+                            <el-table :data="tableData1" stripe style="width: 100%">
+                                <el-table-column label="主题" prop='theme' width="180" />
+                                <el-table-column label="日期" prop='follow_date' width="180" />
+                                <el-table-column label="方案内容" prop='solution_content' />
+                                <el-table-column label="类型" prop='follow_type_text' />
+                                <el-table-column label="执行人" prop='executor' />
+                                <el-table-column label="阶段" prop='follow_stage_text' />
+                                <el-table-column label="状态" prop='follow_status_text' />
+                                <el-table-column label="项目把握度" prop='project_assurance_text' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
+                        </div>
+
+                        <div class="tit">客户需求</div>
+                        <div>
+                            <el-table :data="tableData2" stripe style="width: 100%">
+                                <el-table-column label="需求主题" prop='theme' width="180" />
+                                <el-table-column label="重要程度" prop='importance_text' width="180" />
+                                <el-table-column label="记录时间" prop='recording_time' />
+                                <el-table-column label="需求内容" prop='demand_content' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
+                        </div>
+
+                        <div class="tit">解决方案</div>
+                        <div>
+                            <el-table :data="tableData3" stripe style="width: 100%">
+                                <el-table-column label="解决方案主题" prop='customer_demand_name' width="180" />
+                                <el-table-column label="提交时间" prop='submission_time' width="180" />
+                                <el-table-column label="方案内容" prop='solution_content' />
+                                <el-table-column label="客户反馈" prop='customer_feedback' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
+                        </div>
+
+                        <div class="tit">项目概算</div>
+                        <div>
+                            <el-table :data="tableData4" stripe style="width: 100%">
+                                <el-table-column label="概算来源" prop='estimate_source_text' width="180" />
+                                <el-table-column label="制单人" prop='create_user' width="180" />
+                                <el-table-column label="报价日期" prop='quotation_date' />
+                                <el-table-column label="技术人员" prop='technician_name' width="180" />
+                                <el-table-column label="概算金额(万元)" prop='estimate_amount' width="180" />
+                                <el-table-column label="要求" prop='ask' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager4.page_no" v-model:page-size="pager4.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total3" @size-change="handleSizeChange4" @current-change="handleCurrentChange4" />
+                        </div>
+
+                        <div class="tit">竞争对手</div>
+                        <div>
+                            <el-table :data="tableData5" stripe style="width: 100%">
+                                <el-table-column label="竞争对手名称" prop='competitor_name' width="180" />
+                                <el-table-column label="竞争对手联系人" prop='competitor_contacts' width="180" />
+                                <el-table-column label="联系人电话" prop='competitor_contacts_phone' />
+                                <el-table-column label="竞争能力" prop='competitive_power' />
+                                <el-table-column label="竞争对手优势" prop='competitor_advantages' />
+                                <el-table-column label="竞争对手劣势" prop='competitor_disadvantages' />
+                                <el-table-column label="备注" prop='remark' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager5.page_no" v-model:page-size="pager5.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total4" @size-change="handleSizeChange5" @current-change="handleCurrentChange5" />
+                        </div>
+
+                    </el-tab-pane>
+                    <el-tab-pane label="投标" name="demo-3">
+                        <div class="tit">投标决策</div>
+                        <div>
+                            <el-table :data="tableData6" stripe style="width: 100%">
+                                <el-table-column label="流程编号" prop='code' width="180" />
+                                <el-table-column label="项目估算(万元)" prop='project_estimation' width="180" />
+                                <el-table-column label="资金来源" prop='bidding_project_fund_source' />
+                                <el-table-column label="投标时间" prop='bidding_time' />
+                                <el-table-column label="招标方式" prop='bid_type' />
+                                <el-table-column label="有无保证金" prop='is_margin' />
+                                <el-table-column label="保证金金额" prop='margin_amount' />
+                                <el-table-column label="开标日期" prop='bid_opening_date' />
+                                <el-table-column label="项目把握度" prop='project_assurance' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager6.page_no" v-model:page-size="pager6.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total5" @size-change="handleSizeChange6" @current-change="handleCurrentChange6" />
+                        </div>
+
+                        <div class="tit">购买标书</div>
+                        <div>
+                            <el-table :data="tableData7" stripe style="width: 100%">
+                                <el-table-column label="流程编号" prop='code' width="180" />
+                                <el-table-column label="投标公司名称" prop='bid_company_name' width="180" />
+                                <el-table-column label="招标公司名称" prop='invite_tenders_company_name' />
+                                <el-table-column label="标书编号" prop='bid_document_no' />
+                                <el-table-column label="购买人员" prop='buyer' />
+                                <el-table-column label="购买标书金额" prop='amount' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager7.page_no" v-model:page-size="pager7.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total6" @size-change="handleSizeChange7" @current-change="handleCurrentChange7" />
+                        </div>
+
+                        <div class="tit">标书审查</div>
+                        <div>
+                            <el-table :data="tableData8" stripe style="width: 100%">
+                                <el-table-column label="流程编号" prop='code' width="180" />
+                                <el-table-column label="标书编号" prop='bid_document_no' width="180" />
+                                <el-table-column label="购买人员" prop='buyer' />
+                                <el-table-column label="投标公司名称" prop='bid_company_name' />
+                                <el-table-column label="投标时间" prop='bidding_time' />
+                                <el-table-column label="开标日期" prop='bid_opening_date' />
+                                <el-table-column label="总金额" prop='total_amount' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager8.page_no" v-model:page-size="pager8.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total7" @size-change="handleSizeChange8" @current-change="handleCurrentChange8" />
+                        </div>
+
+                        <div class="tit">投标结果</div>
+                        <div>
+                            <el-table :data="tableData9" stripe style="width: 100%">
+                                <el-table-column label="投标编号" prop='bid_document_examination_code' width="180" />
+                                <el-table-column label="投标时间" prop='bidding_time' width="180" />
+                                <el-table-column label="开标日期" prop='bid_opening_date' />
+                                <el-table-column label="是否中标" prop='is_successful_text' width="180" />
+                                <el-table-column label="中标单位" prop='bidder_company' width="180" />
+                                <el-table-column label="中标金额" prop='bidder_amount' />
+
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager9.page_no" v-model:page-size="pager9.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total8" @size-change="handleSizeChang9" @current-change="handleCurrentChange9" />
+                        </div>
+
+                        <div class="tit">投标保证金</div>
+                        <div>
+                            <el-table :data="tableData10" stripe style="width: 100%">
+                                <el-table-column label="流程编号" prop='code' width="180" />
+                                <el-table-column label="投标时间" prop='bidding_time' width="180" />
+                                <el-table-column label="预计退还时间" prop='refund_date' />
+                                <el-table-column label="申请人" prop='competitive_power' />
+                                <el-table-column label="保证金金额	" prop='margin_amount' />
+                                <el-table-column label="已退金额" prop='remark' />
+                                <el-table-column label="未退金额" prop='remark' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager10.page_no" v-model:page-size="pager10.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total9" @size-change="handleSizeChange10" @current-change="handleCurrentChange10" />
+                        </div>
+                        <div class="tit">退投标保证金</div>
+                        <div>
+                            <el-table :data="tableData11" stripe style="width: 100%">
+                                <el-table-column label="投标时间" prop='competitor_name' width="180" />
+                                <el-table-column label="退款日期" prop='refund_date' width="180" />
+                                <el-table-column label="账户编码" prop='competitor_contacts_phone' />
+                                <el-table-column label="申请人" prop='competitive_power' />
+                                <el-table-column label="开户银行" prop='competitor_advantages' />
+                                <el-table-column label="退款金额" prop='refund_amount' />
+                                <el-table-column label="添加人" prop='remark' />
+                                <el-table-column label="创建日期" prop='remark' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 20px 0;">
+                            <el-pagination v-model:current-page="pager11.page_no" v-model:page-size="pager11.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total10" @size-change="handleSizeChange11" @current-change="handleCurrentChange11" />
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="合同" name="demo-4">Task</el-tab-pane>
+                    <el-tab-pane label="预算" name="demo-5">User</el-tab-pane>
+                    <el-tab-pane label="计划" name="demo-6">Config</el-tab-pane>
+                    <el-tab-pane label="材料" name="demo-7">Role</el-tab-pane>
+                    <el-tab-pane label="采购" name="demo-8">Task</el-tab-pane>
+                    <el-tab-pane label="分包" name="demo-9">Config</el-tab-pane>
+                    <el-tab-pane label="进度" name="demo-10">Role</el-tab-pane>
+                    <el-tab-pane label="任务" name="demo-11">Task</el-tab-pane>
+                    <el-tab-pane label="人力" name="demo-12">
+
+                        <el-tabs v-model="active" class="demo-tabs">
+                            <el-tab-pane label="项目人员" name="first-1">
+                                <div>
+                                    <el-table :data="tableData12" stripe style="width: 100%">
+                                        <el-table-column label="姓名" prop='name' width="180" />
+                                        <el-table-column label="身份证号" prop='idcard' width="180" />
+                                        <el-table-column label="手机号" prop='mobile' />
+                                        <el-table-column label="工种" prop='work_type_text' />
+                                        <el-table-column label="人工单价" prop='unit_price' />
+                                        <el-table-column label="每日生活费" prop=' ' />
+                                        <el-table-column label="期初收入" prop='opening_income' />
+                                        <el-table-column label="日结收入" prop='daily_income' />
+                                        <el-table-column label="完工量收入" prop='work_income' />
+                                        <el-table-column label="总收入" prop='total_income' />
+                                        <el-table-column label="总支出" prop='pay_out' />
+                                        <el-table-column label="余额" prop='balance' />
+                                    </el-table>
+                                </div>
+                                <div style="margin: 20px 0;">
+                                    <el-pagination v-model:current-page="pager12.page_no" v-model:page-size="pager12.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total11" @size-change="handleSizeChange12" @current-change="handleCurrentChange12" />
+                                </div>
+
+                            </el-tab-pane>
+                            <el-tab-pane label="劳动合同" name="first-2">
+                                <div>
+                                    <el-table :data="tableData13" stripe style="width: 100%">
+                                        <el-table-column label="姓名" prop='project_name' width="180" />
+                                        <el-table-column label="身份证号" prop='person_idcard' width="180" />
+                                        <el-table-column label="合同状态" prop='contract_status_text' />
+                                        <el-table-column label="合同类别" prop='contract_type_text' />
+                                        <el-table-column label="合同名称" prop='contract_title_text' />
+                                        <el-table-column label="合同签定日期" prop='signing_date' />
+                                        <el-table-column label="起始时间" prop='start_date' />
+                                        <el-table-column label="终止时间" prop='end_date' />
+
+                                        <el-table-column label="备注" prop='remark' />
+                                        <el-table-column label="合同附件" prop="annex" show-overflow-tooltip>
+                                            <template #default="{ row }">
+                                                <div v-if="row.annex && row.annex.length > 0">
+                                                    <div v-for="(item, i) in row.annex " :key='i'>
+                                                        <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                                    </div>
+                                                </div>
+                                                <div v-else>
+                                                    暂无文件
+                                                </div>
+                                            </template>
+                                        </el-table-column>
+
+                                    </el-table>
+                                </div>
+                                <div style="margin: 20px 0;">
+                                    <el-pagination v-model:current-page="pager13.page_no" v-model:page-size="pager13.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total12" @size-change="handleSizeChange13" @current-change="handleCurrentChange13" />
+                                </div>
+                            </el-tab-pane>
+                            <el-tab-pane label="保险记录" name="first-3">
+                                <div>
+                                    <el-table :data="tableData14" stripe style="width: 100%">
+                                        <el-table-column label="姓名" prop='project_name' width="180" />
+                                        <el-table-column label="身份证号" prop='person_idcard' width="180" />
+                                        <el-table-column label="投保日期" prop='insurance_date' />
+                                        <el-table-column label="到期日期" prop='due_date' />
+                                        <el-table-column label="保险种类" prop='type_text' />
+                                        <el-table-column label="保单号" prop='insurance_no' />
+                                        <el-table-column label="投保金额（万元）" prop='insured_amount' />
+                                        <el-table-column label="保险公司" prop='insurance_company' />
+
+
+                                    </el-table>
+                                </div>
+                                <div style="margin: 20px 0;">
+                                    <el-pagination v-model:current-page="pager14.page_no" v-model:page-size="pager14.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total13" @size-change="handleSizeChange14" @current-change="handleCurrentChange14" />
+                                </div>
+                            </el-tab-pane>
+                            <el-tab-pane label="项目考勤" name="first-4">
+
+                                <div>
+                                    <el-table :data="tableData15" stripe style="width: 100%">
+                                        <el-table-column label="日记工单号" prop='attendance_code' width="180" />
+                                        <el-table-column label="日期" prop='attendance_date' width="180" />
+
+                                        <el-table-column label="出勤人数" prop='competitor_contacts_phone' />
+                                        <el-table-column label="记工数量	" prop='work_record_num_total' />
+                                        <el-table-column label="日工资合计" prop="daily_salary_total" show-overflow-tooltip />
+                                        <el-table-column label="日生活费合计" prop="daily_living_total" show-overflow-tooltip />
+                                        <el-table-column label="日补贴合计" prop="daily_subsidy_total" show-overflow-tooltip />
+                                        <el-table-column label="日其它合计" prop="daily_other_total" show-overflow-tooltip />
+                                        <el-table-column label="日收入合计" prop="daily_income_total" show-overflow-tooltip />
+
+                                        <el-table-column label="备注" prop='remark' />
+
+                                    </el-table>
+                                </div>
+                                <div style="margin: 20px 0;">
+                                    <el-pagination v-model:current-page="pager15.page_no" v-model:page-size="pager15.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total14" @size-change="handleSizeChange15" @current-change="handleCurrentChange15" />
+                                </div>
+                            </el-tab-pane>
+                            <el-tab-pane label="考勤明细" name="first-5">
+                                <div>
+                                    <el-table :data="tableData16" stripe style="width: 100%">
+                                        <el-table-column label="日记工单号" prop='attendance_code' width="180" />
+                                        <el-table-column label="日期" prop='attendance_date' width="180" />
+                                        <el-table-column label="姓名" prop="person_name" show-overflow-tooltip />
+                                        <el-table-column label="身份证号" prop="person_idcard" show-overflow-tooltip />
+                                        <el-table-column label="工种" prop="work_type_text" show-overflow-tooltip />
+                                        <el-table-column label="上班时间" prop="work_start_time" show-overflow-tooltip />
+                                        <el-table-column label="下班时间" prop="work_end_time" show-overflow-tooltip />
+                                        <el-table-column label="记工数量" prop="work_record_num" show-overflow-tooltip />
+                                        <el-table-column label="日工资" prop="daily_salary" show-overflow-tooltip />
+                                        <el-table-column label="日生活费" prop="daily_living" show-overflow-tooltip />
+                                        <el-table-column label="日补贴" prop="daily_subsidy" show-overflow-tooltip />
+                                        <el-table-column label="日其它" prop="daily_other" show-overflow-tooltip />
+                                        <el-table-column label="日收入" prop="daily_income" show-overflow-tooltip />
+                                        <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+
+                                    </el-table>
+                                </div>
+                                <div style="margin: 20px 0;">
+                                    <el-pagination v-model:current-page="pager16.page_no" v-model:page-size="pager16.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total15" @size-change="handleSizeChange16" @current-change="handleCurrentChange16" />
+                                </div>
+                            </el-tab-pane>
+                            <el-tab-pane label="工资付款" name="first-6">
+                                <div>
+                                    <el-table :data="tableData17" stripe style="width: 100%">
+                                        <el-table-column label="工资付款单号" prop='payment_code' width="180" />
+                                        <el-table-column label="日期" prop='apply_date' width="180" />
+                                        <el-table-column label="姓名" prop='person_name' />
+                                        <el-table-column label="身份证号" prop='person_idcard' />
+                                        <el-table-column label="工种" prop='person_work_type_text' />
+                                        <el-table-column label="总收入" prop='total_income' />
+                                        <el-table-column label="总支出" prop='total_pay_out' />
+                                        <el-table-column label="未发放" prop='balance' />
+                                        <el-table-column label="本次付款金额" prop='apply_amount' />
+                                        <el-table-column label="备注" prop='remark' />
+                                    </el-table>
+                                </div>
+                                <div style="margin: 20px 0;">
+                                    <el-pagination v-model:current-page="pager17.page_no" v-model:page-size="pager17.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total16" @size-change="handleSizeChange17" @current-change="handleCurrentChange17" />
+                                </div>
+                            </el-tab-pane>
+                        </el-tabs>
+
+
+
+                    </el-tab-pane>
+                    <el-tab-pane label="机具" name="demo-13">Task</el-tab-pane>
+                    <el-tab-pane label="收款" name="demo-14">Task</el-tab-pane>
+                    <el-tab-pane label="付款" name="demo-15">Task</el-tab-pane>
+                    <el-tab-pane label="费用" name="demo-16">Task</el-tab-pane>
+                    <el-tab-pane label="文档" name="demo-17">Task</el-tab-pane>
+                    <el-tab-pane label="统计" name="demo-18">Task</el-tab-pane>
+                </el-tabs>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCustomDetail } from '@/api/custom'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+import type { TabsPaneContext } from 'element-plus'
+import { apiCustomerDemandLists } from '@/api/customer_demand'
+import { apiProjectFollowUpLists } from '@/api/project_follow_up'
+import { apiCustomerDemandSolutionLists } from '@/api/customer_demand_solution'
+import { apiProjectEstimateLists } from '@/api/project_estimate'
+import { apiCompetitorLists } from '@/api/competitor'
+import { apiBidBiddingDecisionLists } from '@/api/bid_bidding_decision'
+import { apiBidBuyBiddingDocumentLists } from '@/api/bid_buy_bidding_document'
+import { apiBidResultLists } from '@/api/bid_result'
+import { apiBidDocumentExaminationLists } from '@/api/bid_document_examination'
+import { bidapplyLists } from '@/api/bidbbond'
+import { bidrefundLists } from '@/api/refundbidDeposit'
+import { projectpersonnelLists } from '@/api/project_personnel'
+import { projectlaborcontractLists } from '@/api/project_labor_contract'
+import { insurancemanagementLists } from '@/api/project_insurance_management'
+import { attendanceRecordLists } from '@/api/project_attendance_record'
+import { attendancedetailLists } from '@/api/project_attendance_detail'
+import { projectsalaryDetailLists } from '@/api/project_salary_detail'
+
+const active = ref('first-1')
+const activeName = ref('demo-1')
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+    console.log(tab, event)
+}
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const formDataannex = reactive([])
+const datas = reactive({
+    provinceOptions: [],
+    cityOptions: [],
+    areaOptions: [],
+});
+
+const pager1 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager2 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager3 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager4 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager5 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager6 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager7 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager8 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager9 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager10 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager11 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager12 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager13 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager14 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+
+const pager15 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+const pager16 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+
+const pager17 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
+
+const total = ref(0)
+const total1 = ref(0)
+const total2 = ref(0)
+const total3 = ref(0)
+const total4 = ref(0)
+const total5 = ref(0)
+const total6 = ref(0)
+const total7 = ref(0)
+const total8 = ref(0)
+const total9 = ref(0)
+const total10 = ref(0)
+const total11 = ref(0)
+const total12 = ref(0)
+const total13 = ref(0)
+const total14 = ref(0)
+const total15 = ref(0)
+const total16 = ref(0)
+const total17 = ref(0)
+
+const tableData1 = ref([])
+const tableData2 = ref([])
+const tableData3 = ref([])
+const tableData4 = ref([])
+const tableData5 = ref([])
+const tableData6 = ref([])
+const tableData7 = ref([])
+const tableData8 = ref([])
+const tableData9 = ref([])
+const tableData10 = ref([])
+const tableData11 = ref([])
+const tableData12 = ref([])
+const tableData13 = ref([])
+const tableData14 = ref([])
+const tableData15 = ref([])
+const tableData16 = ref([])
+
+const tableData17 = ref([])
+
+// 表单数据
+const formData = reactive({
+
+})
+
+//条数
+const handleSizeChange1 = (val: number) => {
+    pager1.page_size = val
+    followUpLists()
+}
+const handleSizeChange2 = (val: number) => {
+
+    pager2.page_size = val
+    demandList()
+}
+const handleSizeChange3 = (val: number) => {
+
+    pager3.page_size = val
+    solutionLists()
+}
+const handleSizeChange4 = (val: number) => {
+
+    pager4.page_size = val
+    estimateLists()
+}
+const handleSizeChange5 = (val: number) => {
+
+    pager5.page_size = val
+    competitorLists()
+}
+const handleSizeChange6 = (val: number) => {
+    pager6.page_size = val
+    decisionLists()
+}
+const handleSizeChange7 = (val: number) => {
+
+    pager7.page_size = val
+    buydocumentLists()
+}
+const handleSizeChange8 = (val: number) => {
+
+    pager8.page_size = val
+    examinationLists()
+}
+const handleSizeChange9 = (val: number) => {
+
+    pager9.page_size = val
+    bidResultLists()
+}
+const handleSizeChange10 = (val: number) => {
+
+    pager10.page_size = val
+    applyLists()
+}
+
+const handleSizeChange11 = (val: number) => {
+
+    pager11.page_size = val
+
+    refundLists()
+}
+
+const handleSizeChange12 = (val: number) => {
+
+    pager12.page_size = val
+
+    personnelLists()
+}
+
+const handleSizeChange13 = (val: number) => {
+
+    pager13.page_size = val
+
+    laborcontractLists()
+}
+
+const handleSizeChange14 = (val: number) => {
+
+    pager11.page_size = val
+
+    refundLists()
+}
+
+
+const handleSizeChange15 = (val: number) => {
+
+    pager11.page_size = val
+
+    refundLists()
+}
+
+const handleSizeChange16 = (val: number) => {
+
+    pager11.page_size = val
+
+    refundLists()
+}
+
+
+const handleSizeChange17 = (val: number) => {
+
+    pager11.page_size = val
+
+    refundLists()
+}
+
+
+
+//分页
+const handleCurrentChange1 = (val: number) => {
+    console.log(`current page: ${val}`)
+    pager1.page_no = val
+    followUpLists()
+}
+const handleCurrentChange2 = (val: number) => {
+    console.log(`current page: ${val}`)
+    pager2.page_no = val
+    demandList()
+}
+const handleCurrentChange3 = (val: number) => {
+    console.log(`current page: ${val}`)
+    pager3.page_no = val
+    solutionLists()
+}
+const handleCurrentChange4 = (val: number) => {
+    console.log(`current page: ${val}`)
+    pager4.page_no = val
+    estimateLists()
+}
+const handleCurrentChange5 = (val: number) => {
+    pager5.page_no = val
+    console.log(`current page: ${val}`)
+    decisionLists()
+}
+const handleCurrentChange6 = (val: number) => {
+    pager6.page_no = val
+    console.log(`current page: ${val}`)
+    decisionLists()
+}
+const handleCurrentChange7 = (val: number) => {
+    pager7.page_no = val
+    console.log(`current page: ${val}`)
+    buydocumentLists()
+}
+const handleCurrentChange8 = (val: number) => {
+    pager8.page_no = val
+    console.log(`current page: ${val}`)
+    examinationLists()
+}
+const handleCurrentChange9 = (val: number) => {
+    pager9.page_no = val
+    console.log(`current page: ${val}`)
+    bidResultLists()
+}
+const handleCurrentChange10 = (val: number) => {
+    pager10.page_no = val
+    console.log(`current page: ${val}`)
+    applyLists()
+}
+const handleCurrentChange11 = (val: number) => {
+    pager11.page_no = val
+    console.log(`current page: ${val}`)
+
+    refundLists()
+}
+
+const handleCurrentChange12 = (val: number) => {
+    pager12.page_no = val
+    console.log(`current page: ${val}`)
+    personnelLists()
+}
+const handleCurrentChange13 = (val: number) => {
+    pager13.page_no = val
+    console.log(`current page: ${val}`)
+
+    laborcontractLists()
+}
+
+const handleCurrentChange14 = (val: number) => {
+    pager11.page_no = val
+    console.log(`current page: ${val}`)
+
+    refundLists()
+}
+
+const handleCurrentChange15 = (val: number) => {
+    pager11.page_no = val
+    console.log(`current page: ${val}`)
+
+    refundLists()
+}
+const handleCurrentChange16 = (val: number) => {
+    pager11.page_no = val
+    console.log(`current page: ${val}`)
+
+    refundLists()
+}
+
+const handleCurrentChange17 = (val: number) => {
+    pager11.page_no = val
+    console.log(`current page: ${val}`)
+
+    refundLists()
+}
+
+
+//获取客户跟进进路
+const followUpLists = () => {
+    apiProjectFollowUpLists(pager5).then((res) => {
+        tableData1.value = res.lists
+
+        total.value = res.count
+
+    })
+}
+//获取客户需求列表
+const demandList = () => {
+    apiCustomerDemandLists(pager5).then((res) => {
+        tableData1.value = res.lists
+        total1.value = res.count
+
+    })
+}
+
+
+// 解决方案列表
+const solutionLists = () => {
+    apiCustomerDemandSolutionLists(pager5).then((res) => {
+        tableData3.value = res.lists
+        total2.value = res.count
+
+    })
+}
+
+// 获取项目概算列表
+const estimateLists = () => {
+    apiProjectEstimateLists(pager4).then((res) => {
+        tableData4.value = res.lists
+        total3.value = res.count
+    })
+}
+
+// 获取竞争对手列表
+const competitorLists = () => {
+    apiCompetitorLists(pager5).then((res) => {
+        tableData5.value = res.lists
+        total4.value = res.count
+    })
+}
+
+//获取投标决策列表
+const decisionLists = () => {
+    apiBidBiddingDecisionLists(pager6).then((res) => {
+        tableData6.value = res.lists
+        total5.value = res.count
+    })
+}
+//获取购买标书列表
+const buydocumentLists = () => {
+    apiBidBuyBiddingDocumentLists(pager7).then((res) => {
+        tableData7.value = res.lists
+        total6.value = res.count
+    })
+}
+//获取标书审查列表
+const examinationLists = () => {
+    apiBidDocumentExaminationLists(pager8).then((res) => {
+        tableData8.value = res.lists
+        total7.value = res.count
+    })
+}
+//获取投标结果列表
+const bidResultLists = () => {
+    apiBidResultLists(pager9).then((res) => {
+        tableData9.value = res.lists
+        total8.value = res.count
+    })
+}
+//获取投标保证金列表
+const applyLists = () => {
+    bidapplyLists(pager10).then((res) => {
+        tableData10.value = res.lists
+        total9.value = res.count
+    })
+}
+//获取退投标保证金列表
+const refundLists = () => {
+    bidrefundLists(pager11).then((res) => {
+        tableData11.value = res.lists
+        total10.value = res.count
+    })
+}
+//获取项目人员列表
+
+const personnelLists = () => {
+    projectpersonnelLists(pager12).then((res) => {
+        tableData12.value = res.lists
+        total11.value = res.count
+    })
+}
+//获取劳动合同列表
+
+const laborcontractLists = () => {
+    projectlaborcontractLists(pager13).then((res) => {
+        tableData13.value = res.lists
+        total12.value = res.count
+    })
+}
+
+//获取保险管理列表
+
+const insurancemanagementlists = () => {
+    insurancemanagementLists(pager14).then((res) => {
+        tableData14.value = res.lists
+        total13.value = res.count
+    })
+}
+//获取考勤记录列表
+
+const attendanceRecord = () => {
+    attendanceRecordLists(pager15).then((res) => {
+        tableData15.value = res.lists
+        total14.value = res.count
+    })
+}
+
+//获取考勤明细列表
+
+const attendancedetail = () => {
+    attendancedetailLists(pager16).then((res) => {
+        tableData16.value = res.lists
+        total15.value = res.count
+    })
+}
+//获取工资付款列表
+
+const salarypaymentLists = () => {
+    projectsalaryDetailLists(pager17).then((res) => {
+        tableData17.value = res.lists
+        total16.value = res.count
+    })
+}
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    // for (const key in formData) {
+    //     if (data[key] != null && data[key] != undefined) {
+    //         //@ts-ignore
+    //         formData[key] = data[key]
+
+    //     }
+
+    // }
+
+    pager1.project_id = data.id
+    pager2.project_id = data.id
+    pager3.project_id = data.id
+    pager4.project_id = data.id
+    pager5.project_id = data.id
+    pager6.project_id = data.id
+    pager7.project_id = data.id
+    pager8.project_id = data.id
+    pager9.project_id = data.id
+    pager10.project_id = data.id
+    pager11.project_id = data.id
+    pager11.project_id = data.id
+    pager11.project_id = data.id
+    pager12.project_id = data.id
+    pager13.project_id = data.id
+    pager14.project_id = data.id
+    pager15.project_id = data.id
+    pager16.project_id = data.id
+    pager17.project_id = data.id
+    Object.assign(formData, data)
+
+    if (data.annex && data.annex.length > 0) {
+        const arry1 = data.annex.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex, arry1)
+    }
+    followUpLists()
+    demandList()
+    competitorLists()
+    solutionLists()
+    estimateLists()
+    decisionLists()
+    buydocumentLists()
+    examinationLists()
+    bidResultLists()
+    applyLists()
+    refundLists()
+    personnelLists()
+    laborcontractLists()
+    insurancemanagementlists()
+    attendanceRecord()
+    attendancedetail()
+    salarypaymentLists()
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiCustomDetail({
+        id: formData.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    console.log('1111111')
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
+<style lang="scss" scoped>
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+
+:deep(.my-label) {
+    width: 150px;
+}
+</style>
diff --git a/src/views/project_list/index.vue b/src/views/project_list/index.vue
new file mode 100644
index 0000000..cf94815
--- /dev/null
+++ b/src/views/project_list/index.vue
@@ -0,0 +1,393 @@
+<template>
+    <div><el-card>
+            <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+
+                <el-tab-pane label="我参与的项目" name="first">
+                    <div class="first_list">
+                        <div v-for="(item, index) in toplist" :key="index" @click="(item)" class="first_list-item">
+                            <div class="first_list-item-a">{{ item.name }}</div>
+                            <div class="first_list-item-b">{{ item.value }}</div>
+                        </div>
+                    </div>
+                    <el-card class="!border-none mb-4" shadow="never">
+                        <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
+                            <el-form-item label="客户名称" prop="custom_name">
+                                <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户昵称" />
+                            </el-form-item>
+                            <el-form-item label="负责人" prop="person">
+                                <el-input class="w-[280px]" v-model="queryParams.person" clearable placeholder="请输入负责人" />
+                            </el-form-item>
+                            <el-form-item label="项目编码" prop="project_code">
+                                <el-input class="w-[280px]" v-model="queryParams.project_code" clearable placeholder="请输入项目编码" />
+                            </el-form-item>
+                            <el-form-item label="项目名称" prop="name">
+                                <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入项目名称" />
+                            </el-form-item>
+
+                            <el-form-item label="项目内容" prop="project_content">
+                                <el-select class="w-[280px]" v-model="queryParams.project_content" clearable placeholder="请选择战略意义">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.project_content" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="项目状态" prop="status">
+                                <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入项目状态" />
+                            </el-form-item>
+                            <el-form-item label="项目所在地址" prop="project_address">
+                                <el-input class="w-[280px]" v-model="queryParams.project_address" clearable placeholder="请输入客户昵称" />
+                            </el-form-item>
+
+                            <el-form-item label="战略意义" prop="strategic_significance">
+                                <el-select class="w-[280px]" v-model="queryParams.strategic_significance" clearable placeholder="请选择战略意义">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.strategic_significance" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="所属行业" prop="industry">
+                                <el-select class="w-[280px]" v-model="queryParams.industry" clearable placeholder="请选择所属行业">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.industry" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="单位性质" prop="unit_nature">
+                                <el-select class="w-[280px]" v-model="queryParams.unit_nature" clearable placeholder="请选择单位性质">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.unit_nature" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="招标方式" prop="bidding_method">
+                                <el-select class="w-[280px]" v-model="queryParams.bidding_method" clearable placeholder="请选择招标方式">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.bidding_method" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="信息来源" prop="information_sources">
+                                <el-select class="w-[280px]" v-model="queryParams.information_sources" clearable placeholder="请选择信息来源">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.information_sources" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="项目类型" prop="project_type">
+                                <el-select class="w-[280px]" v-model="queryParams.project_type" clearable placeholder="请选择项目类型">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in protype" :key="index" :label="item.name" :value="item.id" />
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item>
+                                <el-button type="primary" @click="resetPage">查询</el-button>
+                                <el-button @click="resetParams">重置</el-button>
+                            </el-form-item>
+                        </el-form>
+                    </el-card>
+                    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+
+                        <div class="mt-4">
+                            <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                                <el-table-column type="selection" width="55" />
+                                <el-table-column label="序号" type="index" width="55" />
+                                <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
+                                <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
+                                <el-table-column label="项目名称" prop="name" show-overflow-tooltip />
+                                <el-table-column label="项目状态" prop="status" show-overflow-tooltip />
+                                <el-table-column label="立项日期" prop="create_time" show-overflow-tooltip />
+                                <el-table-column label="项目类型" prop="project_type" show-overflow-tooltip />
+                                <el-table-column label="实施进度" prop="project_type" show-overflow-tooltip />
+
+                                <el-table-column label="负责人" prop="person" show-overflow-tooltip />
+                                <el-table-column label="操作" width="160" fixed="right">
+                                    <template #default="{ row }">
+
+                                        <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
+                                            详情
+                                        </el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div class="flex justify-end mt-4">
+                            <pagination v-model="pager" @change="getLists" />
+                        </div>
+                    </el-card>
+                </el-tab-pane>
+                <el-tab-pane label="我创建的项目" name="second">
+                    <div class="first_list">
+                        <div v-for="(item, index) in toplist" :key="index" @click="(item)" class="first_list-item">
+                            <div class="first_list-item-a">{{ item.name }}</div>
+                            <div class="first_list-item-b">{{ item.value }}</div>
+                        </div>
+                    </div>
+                    <el-card class="!border-none mb-4" shadow="never">
+
+                        <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
+                            <el-form-item label="客户名称" prop="custom_name">
+                                <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户昵称" />
+                            </el-form-item>
+                            <el-form-item label="负责人" prop="person">
+                                <el-input class="w-[280px]" v-model="queryParams.person" clearable placeholder="请输入负责人" />
+                            </el-form-item>
+                            <el-form-item label="项目编码" prop="project_code">
+                                <el-input class="w-[280px]" v-model="queryParams.project_code" clearable placeholder="请输入项目编码" />
+                            </el-form-item>
+                            <el-form-item label="项目名称" prop="name">
+                                <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入项目名称" />
+                            </el-form-item>
+
+                            <el-form-item label="项目内容" prop="project_content">
+                                <el-select class="w-[280px]" v-model="queryParams.project_content" clearable placeholder="请选择战略意义">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.project_content" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="项目状态" prop="status">
+                                <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入项目状态" />
+                            </el-form-item>
+                            <el-form-item label="项目所在地址" prop="project_address">
+                                <el-input class="w-[280px]" v-model="queryParams.project_address" clearable placeholder="请输入客户昵称" />
+                            </el-form-item>
+
+                            <el-form-item label="战略意义" prop="strategic_significance">
+                                <el-select class="w-[280px]" v-model="queryParams.strategic_significance" clearable placeholder="请选择战略意义">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.strategic_significance" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="所属行业" prop="industry">
+                                <el-select class="w-[280px]" v-model="queryParams.industry" clearable placeholder="请选择所属行业">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.industry" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="单位性质" prop="unit_nature">
+                                <el-select class="w-[280px]" v-model="queryParams.unit_nature" clearable placeholder="请选择单位性质">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.unit_nature" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="招标方式" prop="bidding_method">
+                                <el-select class="w-[280px]" v-model="queryParams.bidding_method" clearable placeholder="请选择招标方式">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.bidding_method" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="信息来源" prop="information_sources">
+                                <el-select class="w-[280px]" v-model="queryParams.information_sources" clearable placeholder="请选择信息来源">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in dictData.information_sources" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="项目类型" prop="project_type">
+                                <el-select class="w-[280px]" v-model="queryParams.project_type" clearable placeholder="请选择项目类型">
+                                    <el-option label="全部" value=""></el-option>
+                                    <el-option v-for="(item, index) in protype" :key="index" :label="item.name" :value="item.id" />
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item>
+                                <el-button type="primary" @click="resetPage">查询</el-button>
+                                <el-button @click="resetParams">重置</el-button>
+                            </el-form-item>
+                        </el-form>
+                    </el-card>
+                    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+
+                        <div class="mt-4">
+                            <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                                <el-table-column type="selection" width="55" />
+                                <el-table-column label="序号" type="index" width="55" />
+                                <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
+                                <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
+                                <el-table-column label="项目名称" prop="name" show-overflow-tooltip />
+                                <el-table-column label="项目状态" prop="status" show-overflow-tooltip />
+                                <el-table-column label="立项日期" prop="create_time" show-overflow-tooltip />
+                                <el-table-column label="项目类型" prop="project_type" show-overflow-tooltip />
+                                <el-table-column label="实施进度" prop="project_type" show-overflow-tooltip />
+
+                                <el-table-column label="负责人" prop="person" show-overflow-tooltip />
+                                <el-table-column label="操作" width="160" fixed="right">
+                                    <template #default="{ row }">
+
+                                        <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
+                                            详情
+                                        </el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div class="flex justify-end mt-4">
+                            <pagination v-model="pager" @change="getLists" />
+                        </div>
+                    </el-card>
+                </el-tab-pane>
+
+            </el-tabs>
+        </el-card>
+
+
+
+        <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiProjectLists, apiProjectDelete, apiProjectDetail } from '@/api/project'
+import { timeFormat } from '@/utils/util'
+import { getAllProjectTypes } from '@/api/projecttype'
+const protype = reactive([])
+import feedback from '@/utils/feedback'
+import DetailPopup from './detail.vue'
+const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
+import type { TabsPaneContext } from 'element-plus'
+
+const activeName = ref('first')
+
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+    console.log(tab.index, event)
+}
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const showDtail = ref(false)
+const toplist = reactive([
+    {
+        name: '项目立项',
+        value: 10
+    },
+    {
+        name: '项目跟进',
+        value: 10
+    },
+    {
+        name: '招投标',
+        value: 10
+    },
+    {
+        name: '合同签约',
+        value: 10
+    },
+    {
+        name: '项目实施',
+        value: 10
+    },
+    {
+        name: '预算超支',
+        value: 10
+    },
+    {
+        name: '进度超期',
+        value: 10
+    },
+    {
+        name: '回款超期',
+        value: 10
+    },
+    {
+        name: '项目中止',
+        value: 10
+    },
+    {
+        name: '项目完成',
+        value: 10
+    }
+])
+
+
+// 查询条件
+const queryParams = reactive({
+    custom_name: '',
+    project_type: '',
+    project_code: '',
+    name: '',
+    project_address: '',
+    estimated_construction: '',
+    bidding_method: '',
+    person: '',
+    relationship: '',
+    strategic_significance: '',
+    industry: '',
+    unit_nature: '',
+    status: '',
+    project_content: '',
+    information_sources: ''
+
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('project_type,project_content,bidding_method,relationship,information_sources,construction_funds_sources,construction_financial_status,construction_recognition,my_construction_recognition,strategic_significance,industry,unit_nature')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectLists,
+    params: queryParams
+})
+
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiProjectDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await apiProjectDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+//获取项目类型 
+const list = () => {
+    getAllProjectTypes().then((res) => {
+        protype.splice(0, protype.length, ...res);
+    })
+}
+
+list()
+
+getLists()
+</script>
+<style lang="scss" scoped>
+.first_list {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+
+
+    .first_list-item {
+        background-color: #f3f7f9;
+        width: 280px;
+        height: 90px;
+        margin-right: 40px;
+        margin-bottom: 20px;
+
+        .first_list-item-a {
+            margin-top: 25px;
+            text-align: left;
+            padding-left: 20px;
+            color: #6C757D;
+        }
+
+        .first_list-item-b {
+            margin-top: 5px;
+            text-align: left;
+            padding-left: 30px;
+            color: #495057;
+            font-weight: bold;
+            font-size: 16px;
+        }
+    }
+}
+</style>
+
diff --git a/src/views/project_logs/detail.vue b/src/views/project_logs/detail.vue
index 2da20d0..89b7800 100644
--- a/src/views/project_logs/detail.vue
+++ b/src/views/project_logs/detail.vue
@@ -136,9 +136,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_manager_appointment/detail.vue b/src/views/project_manager_appointment/detail.vue
index 4e23d89..52e8eca 100644
--- a/src/views/project_manager_appointment/detail.vue
+++ b/src/views/project_manager_appointment/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_member/detail.vue b/src/views/project_member/detail.vue
index efb8011..0cdfac3 100644
--- a/src/views/project_member/detail.vue
+++ b/src/views/project_member/detail.vue
@@ -129,9 +129,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_milestones/detail.vue b/src/views/project_milestones/detail.vue
index 6c587e1..46a72c4 100644
--- a/src/views/project_milestones/detail.vue
+++ b/src/views/project_milestones/detail.vue
@@ -115,9 +115,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_personnel/detail.vue b/src/views/project_personnel/detail.vue
index 5281c88..f526e9b 100644
--- a/src/views/project_personnel/detail.vue
+++ b/src/views/project_personnel/detail.vue
@@ -296,9 +296,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_plan/detail.vue b/src/views/project_plan/detail.vue
index ba0f9fa..20eaf78 100644
--- a/src/views/project_plan/detail.vue
+++ b/src/views/project_plan/detail.vue
@@ -139,9 +139,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_pre_sales_members/detail.vue b/src/views/project_pre_sales_members/detail.vue
index 4125377..6a742c4 100644
--- a/src/views/project_pre_sales_members/detail.vue
+++ b/src/views/project_pre_sales_members/detail.vue
@@ -1,53 +1,24 @@
 
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="售前成员详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
+        <popup ref="popupRef" title="售前成员详情" :async="true" width="40%" @confirm="handleSubmit" @close="handleClose">
 
-                                {{ formData.project_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
 
-                                {{ formData.custom_name
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="技术人员">
-                                {{ formData.technician }}
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="技术人员" label-align="left" align="left" label-class-name="my-label"> {{ formData.technician }}</el-descriptions-item>
+                <el-descriptions-item label="商务人员" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.business_people }}
+                </el-descriptions-item>
+                <el-descriptions-item label="跨部门人员" label-align="left" align="left" label-class-name="my-label"> {{ formData.cross_departmental_personnel }}</el-descriptions-item>
+                <el-descriptions-item label="添加人" label-align="left" align="left" label-class-name="my-label"> {{ formData.add_user_name
 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="商务人员">
-                                {{ formData.business_people }}
+                }}</el-descriptions-item>
 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="跨部门人员">
-                                {{ formData.cross_departmental_personnel }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="添加人">
 
-                                {{ formData.add_user_name
+            </el-descriptions>
 
-                                }}
-
-                            </el-form-item>
-                        </el-col>
-
-                    </el-row>
-                </el-card>
-            </el-form>
         </popup>
     </div>
 </template>
@@ -129,9 +100,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_profit_set/detail.vue b/src/views/project_profit_set/detail.vue
index 7d43368..2996555 100644
--- a/src/views/project_profit_set/detail.vue
+++ b/src/views/project_profit_set/detail.vue
@@ -111,9 +111,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_role_set/detail.vue b/src/views/project_role_set/detail.vue
index 7c18fa4..0a5c08f 100644
--- a/src/views/project_role_set/detail.vue
+++ b/src/views/project_role_set/detail.vue
@@ -102,9 +102,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_salary_payment/detail.vue b/src/views/project_salary_payment/detail.vue
index ac5b657..582324c 100644
--- a/src/views/project_salary_payment/detail.vue
+++ b/src/views/project_salary_payment/detail.vue
@@ -179,9 +179,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_settlement/detail.vue b/src/views/project_settlement/detail.vue
index 1fea839..ac3b76c 100644
--- a/src/views/project_settlement/detail.vue
+++ b/src/views/project_settlement/detail.vue
@@ -167,9 +167,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_settlement/partsettlement/detail.vue b/src/views/project_settlement/partsettlement/detail.vue
index 35e19a5..2bc5809 100644
--- a/src/views/project_settlement/partsettlement/detail.vue
+++ b/src/views/project_settlement/partsettlement/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_settlement/projectclosure/detail.vue b/src/views/project_settlement/projectclosure/detail.vue
index 35e19a5..2bc5809 100644
--- a/src/views/project_settlement/projectclosure/detail.vue
+++ b/src/views/project_settlement/projectclosure/detail.vue
@@ -178,9 +178,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_stakeholder/detail.vue b/src/views/project_stakeholder/detail.vue
index fd6492f..1084047 100644
--- a/src/views/project_stakeholder/detail.vue
+++ b/src/views/project_stakeholder/detail.vue
@@ -139,9 +139,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_subcontract_settlement/detail.vue b/src/views/project_subcontract_settlement/detail.vue
index 37334f4..8107f53 100644
--- a/src/views/project_subcontract_settlement/detail.vue
+++ b/src/views/project_subcontract_settlement/detail.vue
@@ -166,9 +166,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_total_budget/detail.vue b/src/views/project_total_budget/detail.vue
new file mode 100644
index 0000000..52e8eca
--- /dev/null
+++ b/src/views/project_total_budget/detail.vue
@@ -0,0 +1,190 @@
+
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="项目经理委任详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="160px">
+                <el-card class="mb-2">
+                    <el-row>
+
+
+
+                        <el-col :span="12">
+                            <el-form-item label="项目名称">
+                                {{ formData.project_name
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="项目编码">
+                                {{ formData.project_code
+
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="客户名称">
+                                {{ formData.custom_name
+                                }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目类型">
+                                {{ formData.project_type_name
+                                }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目金额">
+                                {{ formData.amount }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目经理">
+                                {{ formData.project_manager_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="立项日期">
+                                {{ formData.project_approval_date }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目开始日期">
+                                {{ formData.start_date }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目交付日期">
+                                {{ formData.delivery_date }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="备注">
+                                {{ formData.remark
+                                }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+
+                            <el-form-item label="附件" prop="field127">
+
+
+                                <div>
+                                    <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
+                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                                        <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
+                                    </div>
+                                </div>
+
+                            </el-form-item>
+                        </el-col>
+
+
+
+                    </el-row>
+                </el-card>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCustomDetail } from '@/api/custom'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const formDataannex = reactive([])
+const datas = reactive({
+    provinceOptions: [],
+    cityOptions: [],
+    areaOptions: [],
+});
+
+
+// 表单数据
+const formData = reactive({
+
+})
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    Object.assign(formData, data)
+
+    if (data.annex && data.annex.length > 0) {
+
+        const arry1 = data.annex.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex, arry1)
+
+    }
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiCustomDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    console.log('1111111')
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
+<style lang="scss" scoped>
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+
+:deep(.my-label) {
+    width: 150px;
+}
+</style>
diff --git a/src/views/project_total_budget/edit.vue b/src/views/project_total_budget/edit.vue
new file mode 100644
index 0000000..a237b62
--- /dev/null
+++ b/src/views/project_total_budget/edit.vue
@@ -0,0 +1,492 @@
+<template>
+    <div class="edit-popup">
+
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-steps :active="active" align-center style="margin-bottom: 20px;">
+                <el-step title="项目经理" />
+                <el-step title="项目总监" />
+                <el-step title="财务总监" />
+                <el-step title="总经理" />
+            </el-steps>
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
+                <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
+                    <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
+                        <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
+                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                </div>
+
+
+                <el-row>
+
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_id" @click="showDialog2 = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="project_name" clearable placeholder="请输入项目名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目编码" prop="project_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同金额(元)" prop="project_manager" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="manage_name" readonly clearable placeholder="请输入合同金额(元)" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目利润(元)" prop="amount" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.amount" clearable placeholder="请输入项目利润(元)" />
+
+                        </el-form-item>
+                    </el-col>
+
+
+
+                </el-row>
+
+
+                <el-row>
+                    <el-table :data="tableData" :summary-method="getSummaries" show-summary>
+                        <el-table-column label="序号" type="index" width="56">
+
+                        </el-table-column>
+                        <el-table-column label="分项">
+                            <template #default="{ row, $index }">
+                                <div>{{ row.name }}</div>
+                                <div>{{ row.text }}</div>
+                            </template>
+                        </el-table-column>
+
+                        <el-table-column label="预算成本" prop="cost">
+                            <template #default="{ row }">
+                                <el-input v-model="row.cost" /> </template>
+                        </el-table-column>
+
+
+                        <el-table-column label="成本占比" prop="rate">
+                            <template #default="{ row }">
+                                {{ row.rate }}
+                            </template>
+                        </el-table-column>
+
+
+                    </el-table>
+
+
+
+
+
+                </el-row>
+
+                <el-row>
+
+
+
+
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目经理" prop="amount" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.amount" clearable placeholder="请输入项目经理" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="预算日期" prop="project_approval_date" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-date-picker v-model="formData.project_approval_date" clearable type="date" value-format="YYYY-MM-DD " placeholder="选择预算日期">
+                            </el-date-picker>
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+
+                        <el-form-item label="预算清单" prop="field127">
+                            <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+                                <el-button type="primary">
+                                    上传
+                                </el-button>
+                            </el-upload>
+
+                            <div>
+                                <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
+                                </div>
+                            </div>
+
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- <el-dialog v-model="showDialog" title="选择客户" width="70%">
+                    <customDialog @customEvent="customEvent"></customDialog>
+                </el-dialog> -->
+                <el-dialog v-model="showDialog1" title="选择合同" width="70%">
+                    <salescontractDialog @customEvent="customEvent1"></salescontractDialog>
+                </el-dialog>
+
+                <el-dialog v-model="showDialog2" title="选择项目" width="70%">
+                    <projectDialog @customEvent="customEvent2"></projectDialog>
+                </el-dialog>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+            </el-form>
+        </popup>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEdit">
+import customDialog from '@/components/custom-dialog/index.vue'
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import salescontractDialog from '@/components/salescontract/index.vue'
+import projectDialog from '@/components/project/index.vue'
+import type { TableColumnCtx } from 'element-plus'
+import { apiProjectbudgetAdd, apiProjectbudgetEdit, apiProjectbudgetDetail } from '@/api/project_total_budget'
+import { toChinesNum } from "@/utils/util";
+import { getAllProjectTypes } from '@/api/projecttype'
+import { timeFormat } from '@/utils/util'
+import { isEmail, isIdCard, isPhone } from '@/utils/validate'
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import type { PropType } from 'vue'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+const protype = reactive([])
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const active = ref(0)
+const formDataannex = reactive([])
+const list1 = reactive([])
+const list2 = reactive([])
+const tableData = reactive([{
+    name: "材料/设备成本(元)",
+    text: '用于控制材料成本',
+    cost: "", rate: "",
+    cl_cost: ''
+},
+{
+    name: "分包成本(元)",
+    text: '用于控制分包成本', cost: "", rate: "",
+    fb_cost: '',
+},
+{
+    name: "人工成本(元)",
+    text: '用于控制工时成本及项目人力成本', cost: "", rate: "",
+    rg_cost: ''
+},
+{
+    name: "费用成本(元)",
+    text: '用于控制费用报销及差旅报销', cost: "", rate: "",
+    fy_cost: ''
+},
+{
+    name: "机械 & 工具成本(元)",
+    text: '用于控制机械及设备成本', cost: "", rate: "",
+    jj_cost: ''
+},
+
+])
+const contract_name = ref('')
+const project_name = ref('')
+const project_code = ref('')
+const contract_no = ref('')
+const custom_name = ref('')
+const manage_name = ref('')
+const userInfo = userStore.userInfo
+const personnel = ref<any>()
+// console.log(userInfo, '222222')
+// 上传文件
+const handleAvatarSuccess_four = (
+    response,
+    uploadFile
+) => {
+    if (response.code == 0) {
+        ElMessage.error(response.msg);
+        return;
+    }
+    formDataannex.push(
+        { uri: response.data.uri, name: response.data.name }
+
+    );
+};
+//验证
+const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
+
+    if (value && !/^1\d{10}$/.test(value)) {
+        callback(new Error('请输入正确的手机号码'));
+    } else {
+        callback()
+    }
+
+}
+const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => {
+
+    // const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
+    // // if (!value) {
+    // //     return callback(new Error('邮箱不能为空'))
+    // // }
+
+
+    if (value && !mailReg.test(value)) {
+        callback(new Error('请输入正确的邮箱格式'))
+    } else {
+        callback()
+    }
+
+};
+// 删除上传的文件
+const delFileFn = (index: number) => {
+    formDataannex.splice(index, 1)
+}
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const amount_daxie = ref('')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const showDialog2 = ref(false)
+const customEvent = (e: any) => {
+    formData.customer_id = e.id;
+    custom_name.value = e.name;
+    showDialog.value = false;
+};
+const customEvent1 = (e: any) => {
+    formData.contract_id = e.id;
+    contract_name.value = e.contract_name;
+    contract_no.value = e.contract_code
+    showDialog1.value = false;
+};
+
+const customEvent2 = (e: any) => {
+    formData.project_id = e.id;
+    project_name.value = e.name;
+    project_code.value = e.project_code;
+    custom_name.value = e.custom_name;
+    showDialog2.value = false;
+};
+//打开弹窗
+
+const userclick = () => {
+    // console.log(personnel.value, '1111111')
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData.project_manager = e.id;
+    manage_name.value = e.name;
+}
+interface Product {
+    id: string
+    name: string
+    text: string
+    cost: number
+    rate: string
+    cl_cost: number
+
+}
+interface SummaryMethodProps<T = Product> {
+    columns: TableColumnCtx<T>[]
+    data: T[]
+}
+const getSummaries = (param: SummaryMethodProps) => {
+    const { columns, data } = param
+    const sums: string[] = []
+    columns.map((column, index) => {
+
+        if (column.label == '序号') {
+            sums[index] = '合计'
+            return
+        }
+        if (column.label == '分项') {
+            sums[index] = ''
+            return
+        }
+        if (column.label === '成本占比') {
+            sums[index] = ''
+            return
+        }
+
+        const values = data.map((item: any) => Number(item[column.property]))
+
+        if (!values.every((value) => Number.isNaN(value))) {
+
+            sums[index] = `${values.reduce((prev, curr) => {
+                const value = Number(curr)
+                if (!Number.isNaN(value)) {
+                    return prev + curr
+                } else {
+                    return prev
+                }
+            }, 0)}`
+        } else {
+            sums[index] = 'N/A'
+        }
+
+    })
+    console.log(sums)
+    return sums
+}
+
+
+//监听输入
+const amountinput = (e) => {
+    // console.log(e)
+    if (e && e > 0) {
+        formData.amount_daxie = toChinesNum(e)
+    }
+}
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑项目经理委任表' : '新增项目经理委任表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    org_id: "",
+    dept_id: "",
+    project_id: "",
+    contract_amount: "",
+    cl_cost: "",
+    fb_cost: "",
+    rg_cost: "",
+    fy_cost: "",
+    jj_cost: "",
+    remark: "",
+    budget_list: "",
+    budget_date: "",
+    project_manager: "",
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+        if (res.length > 0 && !formData.org_id) {
+            formData.org_id = res[0].id
+            deptAll({ 'org_id': res[0].id }).then((res) => {
+                if (res.length > 0) {
+                    Object.assign(list2, res)
+                    formData.dept_id = res[0].id
+                }
+
+            })
+        }
+    })
+}
+const deptrmt = (e: any) => {
+    formData.dept_id = ''
+    getlist1(e)
+
+}
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        list2.splice(0, list2.length, ...res)
+    })
+}
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    if (data.annex && data.annex.length > 0) {
+
+        const arry1 = data.annex.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex, arry1)
+
+    }
+
+
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    custom_name.value = data.custom_name
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    contract_no.value = data.contract_code
+    manage_name.value = data.project_manager_name
+
+    if (data && data.contract_name) {
+        contract_name.value = data.contract_name;
+
+    }
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiProjectbudgetDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    if (formDataannex.length > 0) {
+        formData.annex = JSON.stringify(formDataannex.map((item: any) => item.uri))
+    }
+
+    console.log(formRef.value?.validate(), '22222222')
+    await formRef.value?.validate()
+
+    const data = { ...formData }
+    mode.value == 'edit'
+        ? await apiProjectbudgetEdit(data)
+        : await apiProjectbudgetAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+
+    getAllProjectTypes().then((res) => {
+        protype.splice(0, protype.length, ...res);
+    })
+    getlist()
+
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/project_total_budget/index.vue b/src/views/project_total_budget/index.vue
new file mode 100644
index 0000000..7922b6e
--- /dev/null
+++ b/src/views/project_total_budget/index.vue
@@ -0,0 +1,166 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="立项日期" prop="project_approval_date">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.project_approval_date" clearable type="date" value-format="YYYY-MM-DD " placeholder="选择签订日期">
+                    </el-date-picker>
+                </el-form-item>
+
+
+                <el-form-item label="项目时间范围">
+                    <el-date-picker v-model="dtimevalue" type="daterange" start-placeholder="项目开始日期" end-placeholder="项目交付日期" :default-time="defaultTime" value-format="YYYY-MM-DD " @change="dateclick" />
+                </el-form-item>
+
+
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="reset">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['project.project_manager_apiprojectbudget/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['project.project_manager_apiprojectbudget/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+                删除
+            </el-button>
+
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="序号" type="index" width="55" />
+                    <el-table-column label="处理流程" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="流程步骤" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="委任单号" prop="process_code" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
+                    <el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip />
+                    <el-table-column label="项目类型" prop="project_type_name" show-overflow-tooltip />
+                    <el-table-column label="项目金额" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="立项日期" prop="project_approval_date" show-overflow-tooltip />
+                    <el-table-column label="项目开始日期" prop="start_date" show-overflow-tooltip />
+                    <el-table-column label="项目交付日期" prop="delivery_date" show-overflow-tooltip />
+
+
+                    <el-table-column label="操作" width="150" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['project.project_manager_apiprojectbudget/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['project.project_manager_apiprojectbudget/delete']" type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button v-perms="['project.project_manager_apiprojectbudget/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
+
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiProjectbudgetLists, apiProjectbudgetDelete, apiProjectbudgetDetail } from '@/api/project_total_budget'
+import { timeFormat } from '@/utils/util'
+import { getAllProjectTypes } from '@/api/projecttype'
+const protype = reactive([])
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import DetailPopup from './detail.vue'
+const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDtail = ref(false)
+const dtimevalue = ref([])
+
+//查询
+const dateclick = (e: any) => {
+    queryParams.start_date = e[0]
+    queryParams.delivery_date = e[1]
+}
+
+// 查询条件
+const queryParams = reactive({
+    project_approval_date: '',
+    start_date: '',
+    delivery_date: '',
+})
+
+//重置
+const reset = () => {
+    Object.assign(queryParams, {
+        project_approval_date: '',
+        start_date: '',
+        delivery_date: '',
+    })
+    dtimevalue.value = ''
+    getLists()
+}
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('invoice_type')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectbudgetLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+
+// 编辑
+const handleEdit = async (data: any) => {
+    console.log(data.id)
+    let res = await apiProjectbudgetDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiProjectbudgetDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await apiProjectbudgetDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/project_type_set/detail.vue b/src/views/project_type_set/detail.vue
index caa07c4..6cbeb33 100644
--- a/src/views/project_type_set/detail.vue
+++ b/src/views/project_type_set/detail.vue
@@ -163,9 +163,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/project_wbs_set/detail.vue b/src/views/project_wbs_set/detail.vue
index 0e4152e..123ff28 100644
--- a/src/views/project_wbs_set/detail.vue
+++ b/src/views/project_wbs_set/detail.vue
@@ -123,9 +123,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_accept/detail.vue b/src/views/quality_accept/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_accept/detail.vue
+++ b/src/views/quality_accept/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_accident/detail.vue b/src/views/quality_accident/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_accident/detail.vue
+++ b/src/views/quality_accident/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_check/detail.vue b/src/views/quality_check/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_check/detail.vue
+++ b/src/views/quality_check/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_check_nature/detail.vue b/src/views/quality_check_nature/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_check_nature/detail.vue
+++ b/src/views/quality_check_nature/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_detection/detail.vue b/src/views/quality_detection/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_detection/detail.vue
+++ b/src/views/quality_detection/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_detection_temp/detail.vue b/src/views/quality_detection_temp/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_detection_temp/detail.vue
+++ b/src/views/quality_detection_temp/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_event/detail.vue b/src/views/quality_event/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_event/detail.vue
+++ b/src/views/quality_event/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_mbo/detail.vue b/src/views/quality_mbo/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_mbo/detail.vue
+++ b/src/views/quality_mbo/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_modify/detail.vue b/src/views/quality_modify/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_modify/detail.vue
+++ b/src/views/quality_modify/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_professional_category/detail.vue b/src/views/quality_professional_category/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_professional_category/detail.vue
+++ b/src/views/quality_professional_category/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_specification/detail.vue b/src/views/quality_specification/detail.vue
index d380cb3..2b4c204 100644
--- a/src/views/quality_specification/detail.vue
+++ b/src/views/quality_specification/detail.vue
@@ -105,14 +105,14 @@ const setFormData = async (data: Record<any, any>) => {
 
     if (data.file && data.file.length > 0) {
 
-            const arry1 = data.file.map((item: any, index: any) => {
-                return {
-                    name: `文件${index + 1}`,
-                    uri: item
-                };
-            });
-            Object.assign(formDataannex, arry1)
-      
+        const arry1 = data.file.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex, arry1)
+
     }
 }
 
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quality_supervise/detail.vue b/src/views/quality_supervise/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/quality_supervise/detail.vue
+++ b/src/views/quality_supervise/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quotation/detail.vue b/src/views/quotation/detail.vue
index 473ac36..b1a22ca 100644
--- a/src/views/quotation/detail.vue
+++ b/src/views/quotation/detail.vue
@@ -4,86 +4,63 @@
         <popup ref="popupRef" title="报价单详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px">
                 <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.customer_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="报价日期">
 
-                                {{ formData.quotation_date }}
+                    <el-descriptions :column="2" border>
 
-                            </el-form-item>
-                        </el-col>
+                        <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                        <el-descriptions-item label="报价日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.quotation_date }}</el-descriptions-item>
+                        <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.custom_master_name }}</el-descriptions-item>
 
-                        <el-col :span="12">
-                            <el-form-item label="联系人">
-                                {{ formData.contacts }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="联系电话">
-                                {{ formData.contacts_phone }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="制单人">
-                                {{ formData.create_user }}
-                            </el-form-item>
+                        <el-descriptions-item label="联系电话" label-align="left" align="left" label-class-name="my-label">
+                            {{ formData.custom_master_phone
+                            }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="制单人" label-align="left" align="left" label-class-name="my-label"> {{ formData.create_user
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="发票类型" label-align="left" align="left" label-class-name="my-label"> {{ formData.invoice_type_text
 
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="联系人电话">
-                                {{ formData.competitor_contacts_phone }}
-                            </el-form-item>
-                        </el-col>
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="订单金额" label-align="left" align="left" label-class-name="my-label"> {{ formData.amount_including_tax
 
 
-                        <el-col :span="12">
-                            <el-form-item label="发票类型">
-                                <dict-value :options="dictData.invoice_type" :value="formData.invoice_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="含税金额">
-                                {{ formData.amount_including_tax }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="运费">
-                                {{ formData.freight }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="其他费用">
-                                {{ formData.other_fee }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="合计金额">
-                                {{ formData.total_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="客户需求">
-                                {{ formData.customer_require }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="运费">
-                                {{ formData.freight }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark }}
-                            </el-form-item>
-                        </el-col>
+                        }}</el-descriptions-item>
+                        <!-- <el-descriptions-item label="订单金额大写" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitive_power
 
-                    </el-row>
+                        }}</el-descriptions-item> -->
+                        <el-descriptions-item label="运费" label-align="left" align="left" label-class-name="my-label"> {{ formData.freight
 
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="其它费用" label-align="left" align="left" label-class-name="my-label"> {{ formData.other_fee
+
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="合计金额" label-align="left" align="left" label-class-name="my-label"> {{ formData.total_amount
+
+                        }}</el-descriptions-item>
+
+                        <!-- <el-descriptions-item label="合计金额大写" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor_disadvantages
+
+                        }}</el-descriptions-item> -->
+                        <el-descriptions-item label="客户需求" label-align="left" align="left" label-class-name="my-label"> {{ formData.customer_require
+
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{ formData.remark
+
+                        }}</el-descriptions-item>
+
+
+
+                        <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                            <div v-if="formData.annex.length > 0">
+                                <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                    <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+
+                                </div>
+                            </div>
+                            <div v-else>
+                                暂无附件
+                            </div>
+                        </el-descriptions-item>
+                    </el-descriptions>
                     <div class="tit">报价明细</div>
                     <el-row>
                         <el-table :data="quotationList">
@@ -215,9 +192,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/quotation/index.vue b/src/views/quotation/index.vue
index c33ae76..6f1783c 100644
--- a/src/views/quotation/index.vue
+++ b/src/views/quotation/index.vue
@@ -1,9 +1,9 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="auto" inline>
                 <el-form-item label="客户" prop="custom_id">
-                    <el-select class="flex-1" v-model="queryParams.custom_id" clearable placeholder="请选择客户">
+                    <el-select class="w-[280px]" v-model="queryParams.custom_id" clearable placeholder="请选择客户">
                         <el-option v-for="(item, index) in customerList" :key="index" :label="item.name" :value="parseInt(item.id)" />
                     </el-select>
 
@@ -33,9 +33,9 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['quotation.quotation/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <!-- <el-button v-perms="['quotation.quotation/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
-            </el-button>
+            </el-button> -->
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
@@ -56,9 +56,9 @@
                             <!-- <el-button v-perms="['quotation.quotation/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button> -->
-                            <el-button v-perms="['quotation.quotation/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <!-- <el-button v-perms="['quotation.quotation/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
-                            </el-button>
+                            </el-button> -->
                             <el-button v-perms="['quotation.quotation/detail']" link @click="handleDetail(row)">
                                 详情
                             </el-button>
diff --git a/src/views/recordsPayment/detail.vue b/src/views/recordsPayment/detail.vue
index 52fc9fd..4b07f38 100644
--- a/src/views/recordsPayment/detail.vue
+++ b/src/views/recordsPayment/detail.vue
@@ -181,9 +181,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/redemption_bill/detail.vue b/src/views/redemption_bill/detail.vue
index 71e0dc6..c0fb6f4 100644
--- a/src/views/redemption_bill/detail.vue
+++ b/src/views/redemption_bill/detail.vue
@@ -181,9 +181,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/refund/detail.vue b/src/views/refund/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/refund/detail.vue
+++ b/src/views/refund/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/refundbidDeposit/detail.vue b/src/views/refundbidDeposit/detail.vue
index 464e329..16d5847 100644
--- a/src/views/refundbidDeposit/detail.vue
+++ b/src/views/refundbidDeposit/detail.vue
@@ -153,9 +153,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/remittance/detail.vue b/src/views/remittance/detail.vue
index b5dd319..873a189 100644
--- a/src/views/remittance/detail.vue
+++ b/src/views/remittance/detail.vue
@@ -168,9 +168,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_accident/detail.vue b/src/views/safety_accident/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_accident/detail.vue
+++ b/src/views/safety_accident/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_check/detail.vue b/src/views/safety_check/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_check/detail.vue
+++ b/src/views/safety_check/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_emergency_plan/detail.vue b/src/views/safety_emergency_plan/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_emergency_plan/detail.vue
+++ b/src/views/safety_emergency_plan/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_evaluate/detail.vue b/src/views/safety_evaluate/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_evaluate/detail.vue
+++ b/src/views/safety_evaluate/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_event/detail.vue b/src/views/safety_event/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_event/detail.vue
+++ b/src/views/safety_event/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_hazard/detail.vue b/src/views/safety_hazard/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_hazard/detail.vue
+++ b/src/views/safety_hazard/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_modify/detail.vue b/src/views/safety_modify/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_modify/detail.vue
+++ b/src/views/safety_modify/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_product_month/detail.vue b/src/views/safety_product_month/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_product_month/detail.vue
+++ b/src/views/safety_product_month/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_rehearsal/detail.vue b/src/views/safety_rehearsal/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_rehearsal/detail.vue
+++ b/src/views/safety_rehearsal/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_standard/detail.vue b/src/views/safety_standard/detail.vue
index 8594fd8..2b4c204 100644
--- a/src/views/safety_standard/detail.vue
+++ b/src/views/safety_standard/detail.vue
@@ -154,9 +154,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_supervise/detail.vue b/src/views/safety_supervise/detail.vue
index 041cb0b..da6404e 100644
--- a/src/views/safety_supervise/detail.vue
+++ b/src/views/safety_supervise/detail.vue
@@ -164,9 +164,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/safety_target/detail.vue b/src/views/safety_target/detail.vue
index 560014f..ce5fadc 100644
--- a/src/views/safety_target/detail.vue
+++ b/src/views/safety_target/detail.vue
@@ -172,9 +172,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/subcontracting_contract/detail.vue b/src/views/subcontracting_contract/detail.vue
index 2a6f88f..86a7611 100644
--- a/src/views/subcontracting_contract/detail.vue
+++ b/src/views/subcontracting_contract/detail.vue
@@ -153,9 +153,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/subcontracting_contract_negotiation/detail.vue b/src/views/subcontracting_contract_negotiation/detail.vue
index 791ecd8..6469e84 100644
--- a/src/views/subcontracting_contract_negotiation/detail.vue
+++ b/src/views/subcontracting_contract_negotiation/detail.vue
@@ -144,9 +144,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/supplier/detail.vue b/src/views/supplier/detail.vue
index d4a321d..b389a90 100644
--- a/src/views/supplier/detail.vue
+++ b/src/views/supplier/detail.vue
@@ -1,136 +1,241 @@
 
-
-
 <template>
     <div class="detail-popup">
         <popup ref="popupRef" title="供应商管理详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="建档人">
-
-                                {{ formData.custom_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="组织">
-                                {{ formData.org.name }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="部门">
-                                {{ formData.dept.name
-                                }}
-
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="供应商编码">
-                                {{ formData.supplier_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商名称">
-                                {{ formData.supplier_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商简介">
-                                {{ formData.supplier_introduction }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="品牌类别">
-                                {{ formData.brand_category }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商照片" prop="photos">
-                                <div v-if="formData.photos && formData.photos.length > 0">
-                                    <material-picker v-model="formData.photos" />
-                                </div>
-                                <div v-else>暂无供应商照片</div>
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商分组">
-                                <dict-value :options="dictData.supplier_group" :value="formData.group_id" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商分类">
-                                <dict-value :options="dictData.supplier_category" :value="formData.category_id" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商等级">
-                                <dict-value :options="dictData.supplier_grade" :value="formData.grade" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="联系人">
-                                {{ formData.contacts }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="性别">
-                                <dict-value :options="dictData.sex" :value="formData.contacts_sex" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="出生日期">
-                                {{ formData.birthday }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="电话号码">
-                                {{ formData.competitor }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="开标日期">
-                                {{ formData.phone }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="邮箱">
-                                {{ formData.email }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="地址">
-                                {{ formData.address }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="24">
-                            <el-form-item label="附件" prop="field127">
+            <el-form ref="formRef" :model="formData" label-width="120px">
+                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                    <el-tab-pane label="基本信息" name="demo-tabs-1">
+                        <el-descriptions title="基本信息" :column="2" border>
+                            <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
+                            <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{ formData.dept_name }}</el-descriptions-item>
+                            <el-descriptions-item label="供应商简介" label-align="left" align="left" label-class-name="my-label">{{ formData.supplier_introduction }}</el-descriptions-item>
+                            <el-descriptions-item label="供应商分组" label-align="left" align="left" label-class-name="my-label"> {{ formData.supplier_group_text }}</el-descriptions-item>
+                            <el-descriptions-item label="供应商分类" label-align="left" align="left" label-class-name="my-label"> {{ formData.supplier_category_text }}</el-descriptions-item>
+                            <el-descriptions-item label="供应商等级" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.supplier_grade_text }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="性别" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts_sex_text
 
 
-                                <div v-if="formDataannex.length > 0">
-                                    <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                            }}</el-descriptions-item>
+
+                            <el-descriptions-item label="出生日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.birthday }}</el-descriptions-item>
+
+                            <el-descriptions-item label="联系电话" label-align="left" align="left" label-class-name="my-label"> {{ formData.phone
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="邮箱" label-align="left" align="left" label-class-name="my-label"> {{ formData.email
+
+                            }}</el-descriptions-item>
+
+                            <el-descriptions-item label="地址" label-align="left" align="left" label-class-name="my-label"> {{ formData.address
+
+                            }}</el-descriptions-item>
+                            <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{ formData.remark
+                            }}</el-descriptions-item>
+
+
+
+                            <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                                <div v-if="formData.annex.length > 0">
+                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                        <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
 
                                     </div>
                                 </div>
-                                <div v-else>暂无附件</div>
+                                <div v-else>
+                                    暂无附件
+                                </div>
+                            </el-descriptions-item>
+                        </el-descriptions>
+                        <el-descriptions title="开票信息" border style="margin:20px 0">
+                            <el-descriptions-item label="开票公司名称" label-align="left" align="left" label-class-name="my-label">{{ formData.invoice_company_name }}</el-descriptions-item>
+                            <el-descriptions-item label="纳税人识别号" label-align="left" align="left" label-class-name="my-label">{{ formData.taxpayer_identification_number }}</el-descriptions-item>
+                            <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_name }}</el-descriptions-item>
+                            <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.bank_accnout_name }}</el-descriptions-item>
+                            <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label"> {{ formData.bank_account }}</el-descriptions-item>
+                            <el-descriptions-item label="开户地址" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.bank_address }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="期初未开票金额" label-align="left" align="left" label-class-name="my-label"> {{ formData.init_invoice_amount
+                            }}</el-descriptions-item>
 
-                            </el-form-item>
-                        </el-col>
+                        </el-descriptions>
+                        <el-descriptions title="账期管理" border style="margin:20px 0">
+                            <el-descriptions-item label="授信额度" label-align="left" align="left" label-class-name="my-label">{{ formData.credit_limit }}</el-descriptions-item>
+                            <el-descriptions-item label="账期" label-align="left" align="left" label-class-name="my-label">{{ formData.account_period }}</el-descriptions-item>
+                            <el-descriptions-item label="账单日" label-align="left" align="left" label-class-name="my-label">{{ }}</el-descriptions-item>
+                            <el-descriptions-item label="期初账户余额" label-align="left" align="left" label-class-name="my-label"> {{ }}</el-descriptions-item>
 
-                    </el-row>
-                </el-card>
+
+                        </el-descriptions>
+                    </el-tab-pane>
+                    <el-tab-pane label="价格" name="demo-tabs-2">
+                        <div>
+                            <el-table :data="tableData" stripe style="width: 100%">
+                                <el-table-column label="解决方案主题" prop='customer_demand_name' width="180" />
+                                <el-table-column label="提交时间" prop='submission_time' width="180" />
+                                <el-table-column label="方案内容" prop='solution_content' />
+                                <el-table-column label="客户反馈" prop='customer_feedback' />
+                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        <div v-if="row.annex && row.annex.length > 0">
+                                            <div v-for="(item, i) in row.annex " :key='i'>
+                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                            </div>
+                                        </div>
+                                        <div v-else>
+                                            暂无文件
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="合同" name="demo-tabs-3">
+                        <div class="tit">采购合同</div>
+                        <div>
+                            <el-table :data="tableData1" stripe style="width: 100%">
+                                <el-table-column label="合同编号" prop='estimate_source_text' width="180" />
+                                <el-table-column label="签订日期" prop='create_user' width="180" />
+                                <el-table-column label="合同金额" prop='quotation_date' />
+                                <el-table-column label="已付款金额" prop='technician_name' width="180" />
+                                <el-table-column label="实际合同金额" prop='estimate_amount' width="180" />
+                                <el-table-column label="已开票金额" prop='ask' />
+                                <el-table-column label="未付款金额" prop='ask' />
+                                <el-table-column label="未开票金额" prop='ask' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
+                        </div>
+                        <div class="tit">分包合同</div>
+                        <div>
+                            <el-table :data="tableData2" stripe style="width: 100%">
+                                <el-table-column label="合同编号" prop='estimate_source_text' width="180" />
+                                <el-table-column label="签订日期" prop='create_user' width="180" />
+                                <el-table-column label="合同金额	" prop='quotation_date' />
+                                <el-table-column label="洽商金额" prop='technician_name' width="180" />
+                                <el-table-column label="实际合同金额" prop='estimate_amount' width="180" />
+                                <el-table-column label="已付款" prop='ask' />
+                                <el-table-column label="未付款" prop='ask' />
+                                <el-table-column label="已开票" prop='ask' />
+                                <el-table-column label="未开票" prop='ask' />
+                                <el-table-column label="结算差异" prop='ask' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
+                        </div>
+                        <div class="tit">行政合同</div>
+                        <div>
+                            <el-table :data="tableData3" stripe style="width: 100%">
+                                <el-table-column label="合同编号" prop='estimate_source_text' width="180" />
+                                <el-table-column label="签约日期" prop='create_user' width="180" />
+                                <el-table-column label="付款方式" prop='quotation_date' />
+                                <el-table-column label="合同金额" prop='technician_name' width="180" />
+                                <el-table-column label="已付款" prop='estimate_amount' width="180" />
+                                <el-table-column label="未付款" prop='ask' />
+                                <el-table-column label="已开票" prop='ask' />
+                                <el-table-column label="未开票" prop='ask' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager4.page_no" v-model:page-size="pager4.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total3" @size-change="handleSizeChange4" @current-change="handleCurrentChange4" />
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="发票" name="demo-tabs-4">
+                        <div class="tit">采购/分包发票</div>
+                        <div>
+                            <el-table :data="tableData4" stripe style="width: 100%">
+                                <el-table-column label="项目名称" prop='competitor_name' width="180" />
+                                <el-table-column label="合同编号" prop='competitor_contacts' width="180" />
+                                <el-table-column label="收票日期" prop='competitor_contacts_phone' />
+                                <el-table-column label="发票税率" prop='competitive_power' />
+                                <el-table-column label="发票金额	" prop='competitor_advantages' />
+                                <el-table-column label="不含税金额" prop='competitor_disadvantages' />
+                                <el-table-column label="发票类型" prop='remark' />
+
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager5.page_no" v-model:page-size="pager5.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total4" @size-change="handleSizeChange5" @current-change="handleCurrentChange5" />
+                        </div>
+                        <div class="tit">行政采购发票</div>
+                        <div>
+                            <el-table :data="tableData5" stripe style="width: 100%">
+                                <el-table-column label="合同编号" prop='competitor_name' width="180" />
+                                <el-table-column label="收票日期" prop='competitor_contacts' width="180" />
+                                <el-table-column label="开票日期" prop='competitor_contacts_phone' />
+                                <el-table-column label="发票税率" prop='competitive_power' />
+                                <el-table-column label="发票类型" prop='competitor_advantages' />
+                                <el-table-column label="发票金额" prop='competitor_disadvantages' />
+                                <el-table-column label="不含税金额" prop='remark' />
+                                <el-table-column label="税额" prop='remark' />
+
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager6.page_no" v-model:page-size="pager6.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total5" @size-change="handleSizeChange6" @current-change="handleCurrentChange6" />
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="付款" name="demo-tabs-5">
+                        <div class="tit">付款计划</div>
+                        <div>
+                            <el-table :data="tableData6" stripe style="width: 100%">
+                                <el-table-column label="合同编号" prop='competitor_name' width="180" />
+                                <el-table-column label="计划付款日期" prop='competitor_contacts' width="180" />
+                                <el-table-column label="期次" prop='competitor_contacts_phone' />
+                                <el-table-column label="状态" prop='competitive_power' />
+                                <el-table-column label="金额" prop='competitor_advantages' />
+                                <el-table-column label="已付款" prop='competitor_disadvantages' />
+                                <el-table-column label="未付款" prop='remark' />
+
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager7.page_no" v-model:page-size="pager7.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total6" @size-change="handleSizeChange7" @current-change="handleCurrentChange7" />
+                        </div>
+                        <div class="tit">采购/分包付款</div>
+                        <div>
+                            <el-table :data="tableData7" stripe style="width: 100%">
+                                <el-table-column label="付款单号" prop='competitor_name' width="180" />
+                                <el-table-column label="合同编号" prop='competitor_contacts' width="180" />
+                                <el-table-column label="项目名称" prop='competitor_contacts_phone' />
+                                <el-table-column label="期次" prop='competitive_power' />
+                                <el-table-column label="付款日期" prop='competitor_advantages' />
+                                <el-table-column label="付款性质" prop='competitor_disadvantages' />
+                                <el-table-column label="申请人" prop='remark' />
+                                <el-table-column label="付款金额" prop='remark' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager8.page_no" v-model:page-size="pager8.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total7" @size-change="handleSizeChange8" @current-change="handleCurrentChange8" />
+                        </div>
+                        <div class="tit">行政付款</div>
+                        <div>
+                            <el-table :data="tableData8" stripe style="width: 100%">
+                                <el-table-column label="付款单号" prop='competitor_name' width="180" />
+                                <el-table-column label="合同编号" prop='competitor_contacts' width="180" />
+                                <el-table-column label="联系人电话" prop='competitor_contacts_phone' />
+                                <el-table-column label="申请日期" prop='competitive_power' />
+                                <el-table-column label="申请人" prop='competitor_advantages' />
+                                <el-table-column label="竞争对手劣势" prop='competitor_disadvantages' />
+                                <el-table-column label="合同金额" prop='remark' />
+                                <el-table-column label="合计已付款" prop='remark' />
+                                <el-table-column label="本次支付金额" prop='remark' />
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager9.page_no" v-model:page-size="pager9.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total8" @size-change="handleSizeChange9" @current-change="handleCurrentChange9" />
+                        </div>
+                    </el-tab-pane>
+                </el-tabs>
             </el-form>
         </popup>
     </div>
@@ -141,7 +246,13 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiCustomDetail } from '@/api/custom'
+import { apiCustomerDemandSolutionLists } from '@/api/customer_demand_solution'
+import { apiProjectEstimateLists } from '@/api/project_estimate'
+import { apiCompetitorLists } from '@/api/competitor'
 import { timeFormat } from '@/utils/util'
+import type { TabsPaneContext } from 'element-plus'
+
+const activeName = ref('demo-tabs-1')
 
 import type { PropType } from 'vue'
 defineProps({
@@ -150,6 +261,66 @@ defineProps({
         default: () => ({})
     }
 })
+
+const pager1 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+const pager2 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+const pager3 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+const pager4 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+
+const pager5 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+
+const pager6 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+
+const pager7 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+const pager8 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+const pager9 = reactive({
+    page_size: 10,
+    page_no: 1,
+    customer_demand_id: ""
+})
+const total = ref(0)
+const total1 = ref(0)
+const total2 = ref(0)
+const total3 = ref(0)
+const total4 = ref(0)
+const total5 = ref(0)
+const total6 = ref(0)
+const total7 = ref(0)
+const total8 = ref(0)
+
+
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
@@ -159,27 +330,150 @@ const datas = reactive({
     cityOptions: [],
     areaOptions: [],
 });
-
-
+const tableData = ref([])
+const tableData1 = ref([])
+const tableData2 = ref([])
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+    console.log(tab, event)
+}
 // 表单数据
 const formData = reactive({
 
-
 })
 
 
+//条数
+const handleSizeChange1 = (val: number) => {
+
+    pager1.page_size = val
+    solutionLists()
+}
+const handleSizeChange2 = (val: number) => {
+
+    pager2.page_size = val
+    estimateLists()
+}
+const handleSizeChange3 = (val: number) => {
+
+    pager3.page_size = val
+    competitorLists()
+}
+const handleSizeChange4 = (val: number) => {
+
+    pager4.page_size = val
+    competitorLists()
+}
+const handleSizeChange5 = (val: number) => {
+
+    pager5.page_size = val
+    competitorLists()
+}
+const handleSizeChange6 = (val: number) => {
+
+    pager6.page_size = val
+    competitorLists()
+}
+const handleSizeChange7 = (val: number) => {
+
+    pager7.page_size = val
+    competitorLists()
+}
+const handleSizeChange8 = (val: number) => {
+
+    pager8.page_size = val
+    competitorLists()
+}
+const handleSizeChange9 = (val: number) => {
+
+    page9.page_size = val
+    competitorLists()
+}
+//分页
+const handleCurrentChange1 = (val: number) => {
+    console.log(`current page: ${val}`)
+    pager1.page_no = val
+    solutionLists()
+}
+const handleCurrentChange2 = (val: number) => {
+    console.log(`current page: ${val}`)
+    pager2.page_no = val
+    estimateLists()
+}
+const handleCurrentChange3 = (val: number) => {
+    pager3.page_no = val
+    console.log(`current page: ${val}`)
+    competitorLists()
+}
+const handleCurrentChange4 = (val: number) => {
+    pager4.page_no = val
+    console.log(`current page: ${val}`)
+    competitorLists()
+}
+const handleCurrentChange5 = (val: number) => {
+    pager5.page_no = val
+    console.log(`current page: ${val}`)
+    competitorLists()
+}
+const handleCurrentChange6 = (val: number) => {
+    pager6.page_no = val
+    console.log(`current page: ${val}`)
+    competitorLists()
+}
+
+const handleCurrentChange7 = (val: number) => {
+    pager7.page_no = val
+    console.log(`current page: ${val}`)
+    competitorLists()
+}
+
+const handleCurrentChange8 = (val: number) => {
+    pager8.page_no = val
+    console.log(`current page: ${val}`)
+    competitorLists()
+}
+const handleCurrentChange9 = (val: number) => {
+    pager9.page_no = val
+    console.log(`current page: ${val}`)
+    competitorLists()
+}
+
+
+// 解决方案列表
+const solutionLists = () => {
+    apiCustomerDemandSolutionLists(pager1).then((res) => {
+        tableData.value = res.lists
+
+        total.value = res.count
+
+    })
+}
+
+// 获取项目概算列表
+const estimateLists = () => {
+    apiProjectEstimateLists(pager2).then((res) => {
+        tableData1.value = res.lists
+        total1.value = res.count
+    })
+}
+
+// 获取竞争对手列表
+const competitorLists = () => {
+    apiCompetitorLists(pager3).then((res) => {
+        tableData2.value = res.lists
+        total2.value = res.count
+    })
+}
+
+
+
+
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    // for (const key in formData) {
-    //     if (data[key] != null && data[key] != undefined) {
-    //         //@ts-ignore
-    //         formData[key] = data[key]
-
-    //     }
-
-    // }
+    Object.assign(formData, data)
+    pager1.customer_demand_id = data.id
+    pager2.customer_demand_id = data.id
+    pager3.customer_demand_id = data.id
     if (data.annex && data.annex.length > 0) {
-
         const arry1 = data.annex.map((item: any, index: any) => {
             return {
                 name: `文件${index + 1}`,
@@ -187,12 +481,10 @@ const setFormData = async (data: Record<any, any>) => {
             };
         });
         Object.assign(formDataannex, arry1)
-
     }
-    Object.assign(formData, data)
-    console.log(formData, '2222222222')
-
-
+    competitorLists()
+    solutionLists()
+    estimateLists()
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -233,9 +525,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/supplier/edit.vue b/src/views/supplier/edit.vue
index 109148e..3bc726d 100644
--- a/src/views/supplier/edit.vue
+++ b/src/views/supplier/edit.vue
@@ -44,27 +44,27 @@
                                     <el-input v-model="formData.brand_category" clearable placeholder="请输入" />
                                 </el-form-item></el-col>
                             <el-col :span="24">
-                                <el-form-item label="供应商照片" prop="photos">
-                                    <material-picker v-model="formData.photos" />
+                                <el-form-item label="供应商照片" prop="supplier_photos">
+                                    <material-picker v-model="formData.supplier_photos" />
                                 </el-form-item></el-col>
                             <el-col :span="24">
-                                <el-form-item label="供应商分组" label-width="130px" prop="group_id">
-                                    <el-radio-group v-model="formData.group_id" placeholder="请选择供应商分组">
+                                <el-form-item label="供应商分组" label-width="130px" prop="supplier_group">
+                                    <el-radio-group v-model="formData.supplier_group" placeholder="请选择供应商分组">
                                         <el-radio v-for="(item, index) in dictData.supplier_group" :key="index" :label="parseInt(item.value)">
                                             {{ item.name }}
                                         </el-radio>
                                     </el-radio-group>
                                 </el-form-item></el-col>
                             <el-col :span="24">
-                                <el-form-item label="供应商分类" label-width="130px" prop="category_id">
-                                    <el-radio-group v-model="formData.category_id" placeholder="请选择供应商分类">
+                                <el-form-item label="供应商分类" label-width="130px" prop="supplier_category">
+                                    <el-radio-group v-model="formData.supplier_category" placeholder="请选择供应商分类">
                                         <el-radio v-for="(item, index) in dictData.supplier_category" :key="index" :label="parseInt(item.value)">
                                             {{ item.name }}
                                         </el-radio>
                                     </el-radio-group>
                                 </el-form-item></el-col><el-col :span="24">
-                                <el-form-item label="供应商等级" label-width="130px" prop="grade">
-                                    <el-radio-group v-model="formData.grade" placeholder="请选择供应商等级">
+                                <el-form-item label="供应商等级" label-width="130px" prop="supplier_grade">
+                                    <el-radio-group v-model="formData.supplier_grade" placeholder="请选择供应商等级">
                                         <el-radio v-for="(item, index) in dictData.supplier_grade" :key="index" :label="parseInt(item.value)">
                                             {{ item.name }}
                                         </el-radio>
@@ -323,10 +323,10 @@ const formData = reactive({
     supplier_name: "",
     supplier_introduction: "",
     brand_category: "",
-    photos: "",
-    group_id: "",
-    category_id: "",
-    grade: "",
+    supplier_photos: "",
+    supplier_group: "",
+    supplier_category: "",
+    supplier_grade: "",
     contacts: "",
     contacts_sex: "",
     birthday: "",
@@ -392,8 +392,8 @@ const handleSubmit = async () => {
     if (formDataannex.length > 0) {
         formData.annex = JSON.stringify(formDataannex.map((item: any) => item.uri))
     }
-    if (formData.photos.length > 0) {
-        formData.photos = JSON.stringify(formData.photos)
+    if (formData.supplier_photos.length > 0) {
+        formData.supplier_photos = JSON.stringify(formData.supplier_photos)
     }
     await formRef.value?.validate()
     const data = { ...formData, }
diff --git a/src/views/supplier/index.vue b/src/views/supplier/index.vue
index ca3d156..bf52382 100644
--- a/src/views/supplier/index.vue
+++ b/src/views/supplier/index.vue
@@ -1,25 +1,31 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="auto" inline>
+                <el-form-item label="联系人" prop="contacts">
+                    <el-input class="w-[280px]" v-model="queryParams.contacts" clearable placeholder="请输入联系人" />
+                </el-form-item>
+                <el-form-item label="建档人" prop="create_user_name">
+                    <el-input class="w-[280px]" v-model="queryParams.create_user_name" clearable placeholder="请输入建档人" />
+                </el-form-item>
                 <el-form-item label="供应商编码" prop="supplier_code">
                     <el-input class="w-[280px]" v-model="queryParams.supplier_code" clearable placeholder="请输入供应商编码" />
                 </el-form-item>
                 <el-form-item label="供应商名称" prop="supplier_name">
                     <el-input class="w-[280px]" v-model="queryParams.supplier_name" clearable placeholder="请输入供应商名称" />
                 </el-form-item>
-                <el-form-item label="供应商分组" prop="group_id">
-                    <el-select class="flex-1" v-model="queryParams.group_id" clearable placeholder="请选择供应商分组">
+                <el-form-item label="供应商分组" prop="supplier_group">
+                    <el-select class="flex-1" v-model="queryParams.supplier_group" clearable placeholder="请选择供应商分组">
                         <el-option v-for="(item, index) in dictData.supplier_group" :key="index" :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="供应商分类" prop="category_id">
-                    <el-select class="flex-1" v-model="queryParams.category_id" clearable placeholder="请选择供应商分类">
+                <el-form-item label="供应商分类" prop="supplier_category">
+                    <el-select class="flex-1" v-model="queryParams.supplier_category" clearable placeholder="请选择供应商分类">
                         <el-option v-for="(item, index) in dictData.supplier_category" :key="index" :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="供应商等级" prop="grade">
-                    <el-select class="flex-1" v-model="queryParams.grade" clearable placeholder="请选择供应商等级">
+                <el-form-item label="供应商等级" prop="supplier_grade">
+                    <el-select class="flex-1" v-model="queryParams.supplier_grade" clearable placeholder="请选择供应商等级">
                         <el-option v-for="(item, index) in dictData.supplier_grade" :key="index" :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
@@ -44,33 +50,17 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
 
-                    <el-table-column label="建档人" prop="create_user" show-overflow-tooltip />
+                    <el-table-column label="建档人" prop="create_user_name" show-overflow-tooltip />
                     <el-table-column label="供应商编码" prop="supplier_code" show-overflow-tooltip />
                     <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
                     <el-table-column label="品牌类别" prop="brand_category" show-overflow-tooltip />
-                    <el-table-column label="供应商分组" prop="group_id">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.supplier_group" :value="row.group_id" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="供应商分组" prop="supplier_group" show-overflow-tooltip />
 
-                    <el-table-column label="供应商分类" prop="category_id">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.supplier_category" :value="row.category_id" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="供应商分类" prop="supplier_category" show-overflow-tooltip />
 
-                    <el-table-column label="供应商等级" prop="grade">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.supplier_grade" :value="row.grade" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="供应商等级" prop="supplier_grade" show-overflow-tooltip />
                     <el-table-column label="联系人" prop="contacts" show-overflow-tooltip />
-                    <el-table-column label="性别" prop="contacts_sex" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.sex" :value="row.contacts_sex" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="性别" prop="contacts_sex" show-overflow-tooltip />
                     <el-table-column label="电话号码" prop="phone" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
@@ -113,11 +103,13 @@ const showDtail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    category_id: '',
-    grade: '',
-    group_id: "",
+    supplier_category: '',
+    supplier_grade: '',
+    supplier_group: "",
     supplier_name: '',
-    supplier_code: ''
+    supplier_code: '',
+    contacts: '',
+    create_user_name: '',
 })
 
 // 选中数据
diff --git a/src/views/supplier_contacts/detail.vue b/src/views/supplier_contacts/detail.vue
index 8375ab1..1147304 100644
--- a/src/views/supplier_contacts/detail.vue
+++ b/src/views/supplier_contacts/detail.vue
@@ -4,120 +4,48 @@
 <template>
     <div class="detail-popup">
         <popup ref="popupRef" title="供应商联系人详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="供应商编码">
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="姓名" label-align="left" align="left" label-class-name="my-label">{{ formData.name }}</el-descriptions-item>
+                <el-descriptions-item label="性别" label-align="left" align="left" label-class-name="my-label"> {{ formData.sex_text }}</el-descriptions-item>
+                <el-descriptions-item label="供应商" label-align="left" align="left" label-class-name="my-label"> {{ formData.supplier_name }}</el-descriptions-item>
+                <el-descriptions-item label="联系人分类" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.contacts_type_text
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="负责业务" label-align="left" align="left" label-class-name="my-label"> {{ formData.responsible }}</el-descriptions-item>
+                <el-descriptions-item label="称谓" label-align="left" align="left" label-class-name="my-label"> {{ formData.title }}</el-descriptions-item>
+                <el-descriptions-item label="类型" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts_cate_text }}</el-descriptions-item>
 
-                                {{ formData.supplier.supplier_code }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商名称">
-                                {{ formData.supplier.supplier_name }}
+                <el-descriptions-item label="部门" label-align="left" align="left" label-class-name="my-label"> {{ formData.department }}</el-descriptions-item>
+                <el-descriptions-item label="职务" label-align="left" align="left" label-class-name="my-label"> {{ formData.duties }}</el-descriptions-item>
+                <el-descriptions-item label="工作电话" label-align="left" align="left" label-class-name="my-label"> {{ formData.work_phone }}</el-descriptions-item>
+                <el-descriptions-item label="移动电话" label-align="left" align="left" label-class-name="my-label"> {{ formData.mobile }}</el-descriptions-item>
 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="姓名">
-                                {{ formData.name }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="性别">
-                                <dict-value :options="dictData.sex" :value="formData.sex" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="出生日期">
-                                {{ formData.birthday }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="联系人分类">
-                                <dict-value :options="dictData.contacts_type" :value="formData.contacts_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="负责业务">
-                                {{ formData.responsible }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="类型">
-                                <dict-value :options="dictData.contacts_cate" :value="formData.contacts_cate" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="部门">
-                                {{ formData.department }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="职务">
-                                {{ formData.duties }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="工作电话">
-                                {{ formData.work_phone }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="邮件地址">
-                                {{ formData.email }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="传真">
-                                {{ formData.fax }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="邮编">
-                                {{ formData.zip_code }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="家庭住址">
-                                {{ formData.family_address }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="证件类型">
-                                <dict-value :options="dictData.id_type" :value="formData.id_type" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="证件号码">
-                                {{ formData.idcard }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="附件" prop="field127">
+                <el-descriptions-item label="邮件地址" label-align="left" align="left" label-class-name="my-label"> {{ formData.email }}</el-descriptions-item>
+                <el-descriptions-item label="传真" label-align="left" align="left" label-class-name="my-label"> {{ formData.fax }}</el-descriptions-item>
 
 
-                                <div v-if="formDataannex.length > 0">
-                                    <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                <el-descriptions-item label="邮编" label-align="left" align="left" label-class-name="my-label"> {{ formData.zip_code }}</el-descriptions-item>
 
-                                    </div>
-                                </div>
-                                <div v-else>暂无附件</div>
+                <el-descriptions-item label="证件类型" label-align="left" align="left" label-class-name="my-label"> {{ formData.email }}</el-descriptions-item>
 
-                            </el-form-item>
-                        </el-col>
+                <el-descriptions-item label="证件号码" label-align="left" align="left" label-class-name="my-label"> {{ formData.id_type_text }}</el-descriptions-item>
+                <el-descriptions-item label="家庭住址" label-align="left" align="left" label-class-name="my-label"> {{ formData.family_address }}</el-descriptions-item>
+                <!-- <el-descriptions-item label="爱好" label-align="left" align="left" label-class-name="my-label"> {{ formData.next_follow_date }}</el-descriptions-item> -->
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{ formData.remark }}</el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <div v-if="formData.annex && formData.annex.length > 0">
+                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
 
-                    </el-row>
-                </el-card>
-            </el-form>
+                        </div>
+                    </div>
+                    <div v-else>
+                        暂无文件
+                    </div>
+                </el-descriptions-item>
+
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -219,9 +147,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>
diff --git a/src/views/supplier_contacts/edit.vue b/src/views/supplier_contacts/edit.vue
index aba3705..68aaa50 100644
--- a/src/views/supplier_contacts/edit.vue
+++ b/src/views/supplier_contacts/edit.vue
@@ -265,8 +265,8 @@ const IDcard = (rule: any, value: string, callback: (arg0: Error | undefined) =>
 };
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    supplier_name.value = data.supplier.supplier_name
-    supplier_code.value = data.supplier.supplier_code
+    supplier_name.value = data.supplier_name
+    supplier_code.value = data.supplier_code
     if (data.annex && data.annex.length > 0) {
         const arry1 = data.annex.map((item: any, index: any) => {
             return {
diff --git a/src/views/supplier_contacts/index.vue b/src/views/supplier_contacts/index.vue
index 62d6fc1..21f9bf3 100644
--- a/src/views/supplier_contacts/index.vue
+++ b/src/views/supplier_contacts/index.vue
@@ -1,17 +1,17 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="auto" inline>
                 <el-form-item label="姓名" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入姓名" />
                 </el-form-item>
                 <el-form-item label="联系人分类" prop="contacts_type">
-                    <el-select class="flex-1" v-model="queryParams.contacts_type" clearable placeholder="请选择联系人分类">
+                    <el-select class="w-[280px]" v-model="queryParams.contacts_type" clearable placeholder="请选择联系人分类">
                         <el-option v-for="(item, index) in dictData.contacts_type" :key="index" :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="供应商" prop="supplier_id">
-                    <el-select class="flex-1" v-model="queryParams.supplier_id" clearable placeholder="请选择供应商">
+                    <el-select class="w-[280px]" v-model="queryParams.supplier_id" clearable placeholder="请选择供应商">
                         <el-option v-for="(item, index) in supplierList" :key="index" :label="item.supplier_name" :value="item.id" />
                     </el-select>
                 </el-form-item>
diff --git a/src/views/transfer_bill/detail.vue b/src/views/transfer_bill/detail.vue
index 2675f80..bc793f0 100644
--- a/src/views/transfer_bill/detail.vue
+++ b/src/views/transfer_bill/detail.vue
@@ -225,9 +225,13 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
+
+:deep(.my-label) {
+    width: 150px;
+}
 </style>