From 3c39ed1223c9aab5710538c6bc40fff7d4c882a6 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Sat, 6 Jan 2024 17:12:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E6=A0=87=E7=AE=A1=E7=90=86=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/biddingDecision/index.vue      |  31 +--
 src/components/biddocument/index.vue          |  32 +--
 src/components/document_examination/index.vue |  47 +---
 .../Asset depreciation/edit.vue               |   3 +-
 .../Inquirydetails/index.vue                  |   4 +-
 .../Inventoryquery/index.vue                  |   4 +-
 .../Monthlyinventory_detail/index.vue         |   4 +-
 .../materialHandlingForm_detail/index.vue     |   4 +-
 .../outbounddetails/index.vue                 |   4 +-
 src/views/bid_bidding_decision/detail.vue     | 158 ++++--------
 src/views/bid_bidding_decision/index.vue      |  25 +-
 src/views/bid_buy_bidding_document/detail.vue | 125 +++-------
 src/views/bid_buy_bidding_document/edit.vue   | 109 ++++-----
 src/views/bid_buy_bidding_document/index.vue  |  61 ++---
 src/views/bid_document_examination/detail.vue | 197 +++++++++------
 src/views/bid_document_examination/edit.vue   | 228 ++++++++++--------
 src/views/bid_document_examination/index.vue  |  30 +--
 .../detail.vue                                | 129 +++-------
 .../bid_document_examination_detail/edit.vue  |  49 ++--
 .../bid_document_examination_detail/index.vue |  35 +--
 src/views/bid_result/detail.vue               | 100 ++++----
 src/views/bid_result/edit.vue                 | 152 ++++++++++--
 src/views/bid_result/index.vue                |  25 +-
 src/views/bidbbond/edit.vue                   |  28 +--
 src/views/custom/edit.vue                     |  36 ++-
 src/views/custom_contacts/detail.vue          |  46 +++-
 src/views/custom_contacts/edit.vue            |   1 +
 src/views/quotation_detail/edit.vue           |  32 +--
 src/views/refundbidDeposit/edit.vue           |   4 +-
 29 files changed, 792 insertions(+), 911 deletions(-)

diff --git a/src/components/biddingDecision/index.vue b/src/components/biddingDecision/index.vue
index 998b1fd..9da68a6 100644
--- a/src/components/biddingDecision/index.vue
+++ b/src/components/biddingDecision/index.vue
@@ -17,37 +17,16 @@
                     <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_estimation" show-overflow-tooltip />
-                    <el-table-column label="招标项目资金来源" prop="bidding_project_fund_source">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.construction_funds_sources" :value="row.bidding_project_fund_source" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="招标项目资金来源" prop="bidding_project_fund_source" show-overflow-tooltip />
                     <el-table-column label="投标时间" prop="bidding_time" show-overflow-tooltip />
-                    <el-table-column label="购买标书时间" prop="buy_bid_document_date" show-overflow-tooltip />
-                    <el-table-column label="招标方式" prop="bid_type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.bidding_method" :value="row.bid_type" />
-                        </template>
-                    </el-table-column>
+                    <!-- <el-table-column label="购买标书时间" prop="buy_bid_document_date" show-overflow-tooltip /> -->
+                    <el-table-column label="招标方式" prop="bid_type" show-overflow-tooltip />
                     <el-table-column label="竞争对手" prop="competitor" show-overflow-tooltip />
-                    <!-- <el-table-column label="是否需要保证金" prop="is_margin">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.whether_status" :value="row.is_margin" />
-                        </template>
-                    </el-table-column> -->
                     <el-table-column label="保证金金额" prop="margin_amount" show-overflow-tooltip />
                     <el-table-column label="开标日期" prop="bid_opening_date" show-overflow-tooltip />
                     <el-table-column label="保证金退还时间" prop="margin_amount_return_date" show-overflow-tooltip />
-                    <el-table-column label="有无内部资源" prop="is_internal_resources">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.whether_status" :value="row.is_internal_resources" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="项目把握度" prop="project_assurance" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.project_assurance" :value="row.project_assurance" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="有无内部资源" prop="is_internal_resources" show-overflow-tooltip />
+                    <el-table-column label="项目把握度" prop="project_assurance" show-overflow-tooltip />
                 </el-table>
 
             </div>
diff --git a/src/components/biddocument/index.vue b/src/components/biddocument/index.vue
index d6ff304..572d74e 100644
--- a/src/components/biddocument/index.vue
+++ b/src/components/biddocument/index.vue
@@ -14,39 +14,19 @@
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <div class="mt-4">
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
-                    <el-table-column label="客户名称" prop="customer_name" 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="bid_document_no" show-overflow-tooltip />
                     <el-table-column label="招标公司名称" width="120" prop="invite_tenders_company_name" show-overflow-tooltip />
                     <el-table-column label="投标公司名称" width="120" prop="bid_company_name" show-overflow-tooltip />
                     <el-table-column label="购买人员" prop="buyer" show-overflow-tooltip />
                     <el-table-column label="购买标书金额" width="120" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="招标项目资金来源" width="150" prop="project_fund_source">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.construction_funds_sources" :value="row.project_fund_source" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="投标时间" prop="bid_date">
-                        <template #default="{ row }">
-                            <span>{{ row.bid_date ? row.bid_date : '' }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="购买标书时间" prop="buy_date" width="120">
-                        <template #default="{ row }">
-                            <span>{{ row.buy_date ? row.buy_date : '' }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="招标方式" prop="invite_tenders_type" width="100">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.bidding_method" :value="row.invite_tenders_type" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="招标项目资金来源" width="150" prop="bidding_project_fund_source" show-overflow-tooltip />
+                    <el-table-column label="投标时间" prop="bidding_time" show-overflow-tooltip />
+                    <el-table-column label="购买标书时间" prop="buy_date" width="120" show-overflow-tooltip />
+                    <el-table-column label="招标方式" prop="bid_type" width="100" show-overflow-tooltip />
                     <el-table-column label="投标地址" prop="bid_address" show-overflow-tooltip width="100" />
-                    <el-table-column label="是否需要保证金" prop="is_margin">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.whether_status" :value="row.is_margin" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="是否需要保证金" prop="is_margin" show-overflow-tooltip />
                     <el-table-column label="保证金金额" prop="margin_amount" width="100" show-overflow-tooltip />
                     <!-- <el-table-column label="招标项目慨况" prop="bid_project_overview" show-overflow-tooltip />
                     <el-table-column label="项目简介" prop="project_desc" show-overflow-tooltip />
diff --git a/src/components/document_examination/index.vue b/src/components/document_examination/index.vue
index d5c55fb..1d53a27 100644
--- a/src/components/document_examination/index.vue
+++ b/src/components/document_examination/index.vue
@@ -17,46 +17,17 @@
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-
-                    <el-table-column label="流程编号" prop="supplier_name" show-overflow-tooltip />
-                    <el-table-column label="组织名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="部门名称" prop="contract_no" show-overflow-tooltip />
-                    <el-table-column label="客户名称" prop="contract_no" 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="project_name" show-overflow-tooltip />
-                    <el-table-column label="项目编码" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="标书编号" prop="contract_no" show-overflow-tooltip />
-                    <el-table-column label="购买人员" prop="pay_date" show-overflow-tooltip />
-                    <el-table-column label="招标公司名称" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="投标公司名称" prop="refunder" show-overflow-tooltip />
-                    <el-table-column label="投标时间" prop="refunder" show-overflow-tooltip />
-                    <el-table-column label="招标方式" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="投标地址" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="是否需要保证金" prop="is_need_deposit">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.whether_status" :value="row.is_need_deposit" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="保证金金额" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="招标公司名称" prop="invite_tenders_company_name" show-overflow-tooltip />
+                    <el-table-column label="投标公司名称" prop="bid_company_name" show-overflow-tooltip />
+                    <el-table-column label="招标项目资金来源" width="150" prop="bidding_project_fund_source" show-overflow-tooltip />
+                    <el-table-column label="投标地址" prop="bid_address" show-overflow-tooltip />
+                    <el-table-column label="是否需要保证金" prop="is_margin" show-overflow-tooltip />
+                    <el-table-column label="保证金金额	" prop="margin_amount" show-overflow-tooltip />
                     <el-table-column label="开标日期" prop="bid_opening_date" show-overflow-tooltip />
-                    <el-table-column label="保证金退还时间" prop="deposit_refund_time" show-overflow-tooltip />
-                    <el-table-column label="招标项目概况" prop="bidding_project_overview" show-overflow-tooltip />
-                    <el-table-column label="项目简介" prop="project_introduction" show-overflow-tooltip />
-                    <el-table-column label="技术协议偏差" prop="technical_protocol_deviation" show-overflow-tooltip />
-                    <el-table-column label="协议偏差处理方案" prop="protocol_deviation_handling_plan" show-overflow-tooltip />
-                    <el-table-column label="总金额" prop="business_review_total_amount" show-overflow-tooltip />
-                    <el-table-column label="税率" prop="tax_rate">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.tax_rate" :value="row.tax_rate" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="付款方式" prop="pay_type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.pay_type" :value="row.pay_type" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="付款比例" prop="pay_rate" show-overflow-tooltip />
-                    <el-table-column label="商务合同偏差" prop="business_contract_deviation" show-overflow-tooltip />
-                    <el-table-column label="偏差处理方案" prop="business_contract_deviation_handling_plan" show-overflow-tooltip />
+                    <el-table-column label="总金额" prop="total_amount" show-overflow-tooltip />
                 </el-table>
 
             </div>
diff --git a/src/views/AssetManagement/Asset depreciation/edit.vue b/src/views/AssetManagement/Asset depreciation/edit.vue
index 1c4493f..3ca985a 100644
--- a/src/views/AssetManagement/Asset depreciation/edit.vue	
+++ b/src/views/AssetManagement/Asset depreciation/edit.vue	
@@ -25,8 +25,7 @@
                     <el-col :span="8">
                         <el-form-item label="折旧日期" prop="invoicing_date" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
 
-                            <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择                        <el-form-item label=" 折旧日期" prop="invoicing_date" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
-                                ">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss">
                             </el-date-picker>
 
                         </el-form-item>
diff --git a/src/views/Materialmanagement/Inquirydetails/index.vue b/src/views/Materialmanagement/Inquirydetails/index.vue
index 47ca3f3..289de77 100644
--- a/src/views/Materialmanagement/Inquirydetails/index.vue
+++ b/src/views/Materialmanagement/Inquirydetails/index.vue
@@ -89,8 +89,8 @@ import { apiCustomLists } from '@/api/custom'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
 import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
+// import EditPopup from './edit.vue'
+// import DetailPopup from './detail.vue'
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 // 是否显示编辑框
 
diff --git a/src/views/Materialmanagement/Inventoryquery/index.vue b/src/views/Materialmanagement/Inventoryquery/index.vue
index bb4184a..c04322e 100644
--- a/src/views/Materialmanagement/Inventoryquery/index.vue
+++ b/src/views/Materialmanagement/Inventoryquery/index.vue
@@ -79,8 +79,8 @@ import { apiCustomLists } from '@/api/custom'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
 import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
+// import EditPopup from './edit.vue'
+// import DetailPopup from './detail.vue'
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
diff --git a/src/views/Materialmanagement/Monthlyinventory_detail/index.vue b/src/views/Materialmanagement/Monthlyinventory_detail/index.vue
index 139052a..a1aebd2 100644
--- a/src/views/Materialmanagement/Monthlyinventory_detail/index.vue
+++ b/src/views/Materialmanagement/Monthlyinventory_detail/index.vue
@@ -88,8 +88,8 @@ import { apiCustomLists } from '@/api/custom'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
 import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
+// import EditPopup from './edit.vue'
+// import DetailPopup from './detail.vue'
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
diff --git a/src/views/Materialmanagement/materialHandlingForm_detail/index.vue b/src/views/Materialmanagement/materialHandlingForm_detail/index.vue
index 8a99cfc..376ce6f 100644
--- a/src/views/Materialmanagement/materialHandlingForm_detail/index.vue
+++ b/src/views/Materialmanagement/materialHandlingForm_detail/index.vue
@@ -96,8 +96,8 @@ import { apiCustomLists } from '@/api/custom'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
 import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
+// import EditPopup from './edit.vue'
+// import DetailPopup from './detail.vue'
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
diff --git a/src/views/Materialmanagement/outbounddetails/index.vue b/src/views/Materialmanagement/outbounddetails/index.vue
index c07872d..7094a41 100644
--- a/src/views/Materialmanagement/outbounddetails/index.vue
+++ b/src/views/Materialmanagement/outbounddetails/index.vue
@@ -79,7 +79,7 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <!-- <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>
@@ -94,7 +94,7 @@ import { apiCustomLists } from '@/api/custom'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
 import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
+// import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
diff --git a/src/views/bid_bidding_decision/detail.vue b/src/views/bid_bidding_decision/detail.vue
index 249cc38..ba03f7c 100644
--- a/src/views/bid_bidding_decision/detail.vue
+++ b/src/views/bid_bidding_decision/detail.vue
@@ -4,128 +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="3" border>
+                <el-descriptions-item label="流程编号" label-align="left" align="left" label-class-name="my-label">{{ formData.code }}</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.project_estimation }}</el-descriptions-item>
 
-                                {{ formData.custom_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.project_code }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目估算(万元)">
-                                {{ formData.project_estimation }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="投标时间">
-                                {{ formData.bidding_time }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="购买标书时间">
-                                {{ formData.buy_bid_document_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标项目资金来源">
-
-                                {{ formData.bidding_project_fund_source }}
-                                <!-- <dict-value :options="dictData.construction_funds_sources" :value="formData.bidding_project_fund_source" /> -->
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标方式">
-                                {{ formData.bid_type }}
-                            </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.margin_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="是否需要保证金">
-                                {{ formData.whether_status }}
-                                <!-- <dict-value :options="dictData.whether_status" :value="formData.whether_status" /> -->
-                            </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.bid_opening_date }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="保证金退还时间">
-                                {{ formData.margin_amount_return_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="有无内部资源">
-                                {{ formData.is_internal_resources }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目把握度">
-                                {{ formData.project_assurance
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标项目概况">
-                                {{ formData.bid_project_overview }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目简介">
-                                {{ formData.project_desc }}
-                            </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.bidding_project_fund_source }}</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.bidding_time }}</el-descriptions-item>
 
-                                    </div>
-                                </div>
-                                <div v-else>暂无附件</div>
 
-                            </el-form-item>
-                        </el-col>
+                <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_type }}</el-descriptions-item>
 
-                    </el-row>
-                </el-card>
-            </el-form>
+                <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.is_margin }}</el-descriptions-item>
+                <el-descriptions-item label="保证金金额(元)" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
+
+                <el-descriptions-item label="开标日期" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item>
+                <el-descriptions-item label="保证金退还时间" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount_return_date }}</el-descriptions-item>
+
+                <el-descriptions-item label="有无内部资源" label-align="left" align="left" label-class-name="my-label">{{ formData.is_internal_resources }}</el-descriptions-item>
+
+                <el-descriptions-item label="项目把握度" label-align="left" align="left" label-class-name="my-label">{{ formData.project_assurance }}</el-descriptions-item>
+                <el-descriptions-item label="招标项目概况" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_project_overview }}</el-descriptions-item>
+
+                <el-descriptions-item label="项目简介" label-align="left" align="left" label-class-name="my-label">{{ formData.project_desc }}</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;">
+                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+
+                        </div>
+                    </div>
+                    <div v-else>暂无附件</div>
+                </el-descriptions-item>
+
+
+            </el-descriptions>
         </popup>
     </div>
 </template>
@@ -227,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/bid_bidding_decision/index.vue b/src/views/bid_bidding_decision/index.vue
index b3cab63..f5e01c1 100644
--- a/src/views/bid_bidding_decision/index.vue
+++ b/src/views/bid_bidding_decision/index.vue
@@ -1,17 +1,23 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <!-- <el-form-item label="项目" prop="invite_tenders_company_name">
-                    <el-input class="w-[280px]" v-model="queryParams.invite_tenders_company_name" clearable placeholder="请输入招标公司名称" />
-                </el-form-item> -->
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="auto" inline>
+                <el-form-item label="编码" prop="code">
+                    <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编码" />
+                </el-form-item>
+                <el-form-item label="项目名称" prop="project_name">
+                    <el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
+                </el-form-item>
+                <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="bidding_project_fund_source">
-                    <el-select class="flex-1" v-model="queryParams.bidding_project_fund_source" clearable placeholder="请选择类型">
+                    <el-select class="w-[280px]" v-model="queryParams.bidding_project_fund_source" clearable placeholder="请选择类型">
                         <el-option v-for="(item, index) in dictData.construction_funds_sources" :key="index" :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="招标方式" prop="bid_type">
-                    <el-select class="flex-1" v-model="queryParams.bid_type" clearable placeholder="请选择类型">
+                    <el-select class="w-[280px]" v-model="queryParams.bid_type" clearable placeholder="请选择类型">
                         <el-option v-for="(item, index) in dictData.bidding_method" :key="index" :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
@@ -99,9 +105,12 @@ const showDtail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    project_id: '',
+
     bidding_project_fund_source: '',
-    bid_type: ""
+    bid_type: "",
+    project_name: "",
+    code: "",
+    custom_name: "",
 })
 
 // 选中数据
diff --git a/src/views/bid_buy_bidding_document/detail.vue b/src/views/bid_buy_bidding_document/detail.vue
index 41b2d57..7dd587f 100644
--- a/src/views/bid_buy_bidding_document/detail.vue
+++ b/src/views/bid_buy_bidding_document/detail.vue
@@ -4,110 +4,35 @@
 <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.project.name }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project ? formData.project.project_code : '暂无数据' }}
-
-                            </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.buyer }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="投标时间">
-                                {{ formData.bidding_time }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="购买标书时间">
-                                {{ formData.buy_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标项目资金来源">
-                                <dict-value :options="dictData.construction_funds_sources" :value="formData.project_fund_source" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标方式">
-                                <dict-value :options="dictData.bidding_method" :value="formData.invite_tenders_type" />
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="保证金金额">
-                                {{ formData.margin_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="是否需要保证金">
-                                <dict-value :options="dictData.whether_status" :value="formData.is_margin" />
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="投标时间">
-                                {{ formData.bid_date }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="投标地址">
-                                {{ formData.bid_address }}
-                            </el-form-item>
-                        </el-col>
 
 
-                        <el-col :span="12">
-                            <el-form-item label="招标项目概况">
-                                {{ formData.bid_project_overview }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目简介">
-                                {{ formData.project_desc }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="附件" prop="field127">
 
+            <el-descriptions :column="3" border>
+                <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.bid_decision_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.invite_tenders_company_name }}</el-descriptions-item>
+                <el-descriptions-item label="投标公司名称" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_company_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.buyer }}</el-descriptions-item>
+                <el-descriptions-item label="购买标书金额(元)" label-align="left" align="left" label-class-name="my-label">{{ formData.buyer }}</el-descriptions-item>
+                <el-descriptions-item label="招标项目资金来源" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_project_fund_source }}</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.bidding_time }}</el-descriptions-item>
+                <el-descriptions-item label="购买标书时间" label-align="left" align="left" label-class-name="my-label">{{ formData.buy_date }}</el-descriptions-item>
 
-                                    </div>
-                                </div>
-                                <div v-else>暂无附件</div>
+                <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_type }}</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.bid_address }}</el-descriptions-item>
 
+                <el-descriptions-item label="是否需要保证金" label-align="left" align="left" label-class-name="my-label">{{ formData.is_margin }}</el-descriptions-item>
+                <el-descriptions-item label="保证金金额(元)" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
+                <el-descriptions-item label="招标项目慨况" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_project_overview }}</el-descriptions-item>
+                <el-descriptions-item label="项目简介" label-align="left" align="left" label-class-name="my-label">{{ formData.project_desc }}</el-descriptions-item>
+                <!-- <el-descriptions-item label="保证金金额(元)" label-align="left" align="left" label-class-name="my-label"></el-descriptions-item> -->
+            </el-descriptions>
 
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
-            </el-form>
         </popup>
     </div>
 </template>
@@ -208,9 +133,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_buy_bidding_document/edit.vue b/src/views/bid_buy_bidding_document/edit.vue
index ac4d088..abfb54e 100644
--- a/src/views/bid_buy_bidding_document/edit.vue
+++ b/src/views/bid_buy_bidding_document/edit.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules" inline>
                 <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="请选择部门">
@@ -24,19 +24,24 @@
                     <el-col :span="8">
                         <el-form-item label="客户名称" prop="project_id" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
                             <el-input v-model="matsname" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item></el-col><el-col :span="8">
+                        </el-form-item></el-col>
+                    <el-col :span="8">
                         <el-form-item label="招标公司名称" prop="invite_tenders_company_name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.invite_tenders_company_name" clearable placeholder="请输入招标公司名称" />
-                        </el-form-item></el-col><el-col :span="8">
+                        </el-form-item></el-col>
+                    <el-col :span="8">
                         <el-form-item label="投标公司名称" prop="bid_company_name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.bid_company_name" clearable placeholder="请输入投标公司名称" />
-                        </el-form-item></el-col><el-col :span="8">
+                        </el-form-item></el-col>
+                    <el-col :span="8">
                         <el-form-item label="购买人员" prop="buyer" @click="userclick">
                             <el-input v-model="buyer_name" clearable placeholder="请输入购买人员" />
-                        </el-form-item></el-col><el-col :span="8">
+                        </el-form-item></el-col>
+                    <el-col :span="8">
                         <el-form-item label="购买标书金额" prop="amount">
                             <el-input v-model="formData.amount" clearable placeholder="请输入购买标书金额" />
-                        </el-form-item></el-col><el-col :span="24">
+                        </el-form-item></el-col>
+                    <!-- <el-col :span="24">
                         <el-form-item label="招标项目资金来源" prop="project_fund_source">
                             <el-radio-group v-model="formData.project_fund_source" placeholder="请选择招标项目资金来源">
                                 <el-radio v-for="(item, index) in dictData.construction_funds_sources" :key="index" :label="parseInt(item.value)">
@@ -48,12 +53,14 @@
                             <el-date-picker class="flex-1 !flex" v-model="formData.bid_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择投标时间">
                             </el-date-picker>
                         </el-form-item>
-                    </el-col><el-col :span="8">
+                    </el-col> -->
+                    <el-col :span="8">
                         <el-form-item label="购买标书时间" prop="buy_date">
                             <el-date-picker class="flex-1 !flex" v-model="formData.buy_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择购买标书时间">
                             </el-date-picker>
                         </el-form-item>
-                    </el-col><el-col :span="24">
+                    </el-col>
+                    <!-- <el-col :span="24">
                         <el-form-item label="招标方式" prop="invite_tenders_type">
                             <el-radio-group v-model="formData.invite_tenders_type" placeholder="请选择招标方式">
                                 <el-radio v-for="(item, index) in dictData.bidding_method" :key="index" :label="parseInt(item.value)">
@@ -70,7 +77,8 @@
                                     {{ item.name }}
                                 </el-radio>
                             </el-radio-group>
-                        </el-form-item></el-col><el-col :span="8">
+                        </el-form-item></el-col>
+                        <el-col :span="8">
                         <el-form-item label="保证金金额" prop="margin_amount">
                             <el-input v-model="formData.margin_amount" clearable placeholder="请输入保证金金额" />
                         </el-form-item></el-col><el-col :span="8">
@@ -79,7 +87,8 @@
                         </el-form-item></el-col><el-col :span="8">
                         <el-form-item label="项目简介" prop="project_desc">
                             <el-input v-model="formData.project_desc" clearable placeholder="请输入项目简介" />
-                        </el-form-item></el-col><el-col :span="8">
+                        </el-form-item></el-col>
+                        <el-col :span="8">
                         <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">
@@ -96,8 +105,8 @@
 
 
 
-                        </el-form-item>
-                    </el-col>
+                        </el-form-item> 
+                    </el-col>-->
                 </el-row>
             </el-form>
             <reviewprocess />
@@ -106,7 +115,6 @@
 
         <el-dialog v-model="showDialog" title="选择项目" width="70%">
             <projectTable @customEvent="customEvent"></projectTable>
-
         </el-dialog>
     </div>
 </template>
@@ -117,7 +125,7 @@ import reviewprocess from '@/components/reviewprocess/index.vue'
 import Popup from '@/components/popup/index.vue'
 import personnelselector from '@/components/personnelselector/index.vue'
 
-import projectTable from "@/components/project/index.vue"
+import projectTable from "@/components/biddingDecision/index.vue"
 import { apiBidBuyBiddingDocumentAdd, apiBidBuyBiddingDocumentDetail } from '@/api/bid_buy_bidding_document'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
@@ -146,24 +154,24 @@ const userStore = useUserStore();
 const formDataannex = reactive([])
 const showDialog = ref(false)
 const buyer_name = ref('')
-// 上传文件
-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 handleAvatarSuccess_four = (
+//     response,
+//     uploadFile
+// ) => {
+//     if (response.code == 0) {
+//         ElMessage.error(response.msg);
+//         return;
+//     }
+//     formDataannex.push(
+//         { uri: response.data.uri, name: response.data.name }
 
-    );
-};
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formDataannex.splice(index, 1)
-}
+//     );
+// };
+// // 删除上传的文件
+// const delFileFn = (index: number) => {
+//     formDataannex.splice(index, 1)
+// }
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -176,22 +184,14 @@ const formData = reactive({
     dept_id: '',
     org_id: '',
     project_id: '',
-    approve_id: '1',
+    bid_decision_id: '',
     bid_document_no: '',
     invite_tenders_company_name: '',
     bid_company_name: '',
     buyer: '',
     amount: '',
-    project_fund_source: '',
-    bid_date: '',
     buy_date: '',
-    invite_tenders_type: '',
     bid_address: '',
-    is_margin: '',
-    margin_amount: '',
-    bid_project_overview: '',
-    project_desc: '',
-    annex: '',
 })
 
 //打开弹窗
@@ -241,8 +241,8 @@ const getlist1 = (id: any) => {
 //获取值
 const customEvent = (e: any) => {
     formData.project_id = e.id;
-    matsname.value = e.person
-    project_name.value = e.custom_name
+    matsname.value = e.custom_name
+    project_name.value = e.project_name
     project_code.value = e.project_code
     showDialog.value = false;
 };
@@ -258,21 +258,18 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    if (data.annex && data.annex.length > 0) {
+    // 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 arry1 = data.annex.map((item: any, index: any) => {
+    //         return {
+    //             name: `文件${index + 1}`,
+    //             uri: item
+    //         };
+    //     });
+    //     Object.assign(formDataannex, arry1)
+
+    // }
 
-    }
-    //@ts-ignore
-    formData.bid_date = timeFormat(formData.bid_date, 'yyyy-mm-dd hh:MM:ss')
-    //@ts-ignore
-    formData.buy_date = timeFormat(formData.buy_date, 'yyyy-mm-dd hh:MM:ss')
 }
 
 
@@ -286,7 +283,7 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    formData.annex = JSON.stringify(formDataannex.map(item => item.uri))
+    // formData.annex = JSON.stringify(formDataannex.map(item => item.uri))
 
 
     await formRef.value?.validate()
diff --git a/src/views/bid_buy_bidding_document/index.vue b/src/views/bid_buy_bidding_document/index.vue
index 5f4b4bb..601000b 100644
--- a/src/views/bid_buy_bidding_document/index.vue
+++ b/src/views/bid_buy_bidding_document/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="project_id">
-                    <el-select v-model="queryParams.project_id" clearable placeholder="请选择项目">
+                    <el-select class="w-[250px]" v-model="queryParams.project_id" clearable placeholder="请选择项目">
                         <el-option v-for="(item, index) in projectList" :key="index" :label="item.name" :value="parseInt(item.id)" />
                     </el-select>
                 </el-form-item>
@@ -16,7 +16,15 @@
                 <el-form-item label="投标公司名称" prop="bid_company_name">
                     <el-input class="w-[250px]" v-model="queryParams.bid_company_name" clearable placeholder="请输入招标公司名称" />
                 </el-form-item>
-
+                <el-form-item label="项目名称" prop="project_name">
+                    <el-input class="w-[250px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
+                </el-form-item>
+                <el-form-item label="客户名称" prop="custom_name">
+                    <el-input class="w-[250px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
+                </el-form-item>
+                <el-form-item label="编码" prop="code">
+                    <el-input class="w-[250px]" v-model="queryParams.code" clearable placeholder="请输入编码" />
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -40,44 +48,20 @@
 
                     <el-table-column label="处理流程" prop="bid_document_no" show-overflow-tooltip />
                     <el-table-column label="流程步骤" prop="bid_document_no" show-overflow-tooltip />
-                    <el-table-column label="流程编号" prop="bid_document_no" show-overflow-tooltip />
-                    <el-table-column label="客户名称" prop="customer_name" show-overflow-tooltip />
+                    <el-table-column label="流程编号" prop="code" width="210" 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="bid_document_no" show-overflow-tooltip />
+                    <el-table-column label="标书编号" prop="bid_document_no" width="180" show-overflow-tooltip />
                     <el-table-column label="招标公司名称" width="120" prop="invite_tenders_company_name" show-overflow-tooltip />
                     <el-table-column label="投标公司名称" width="120" prop="bid_company_name" show-overflow-tooltip />
                     <el-table-column label="购买人员" prop="buyer" show-overflow-tooltip />
                     <el-table-column label="购买标书金额" width="120" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="招标项目资金来源" width="150" prop="project_fund_source">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.construction_funds_sources" :value="row.project_fund_source" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="投标时间" prop="bid_date">
-                        <template #default="{ row }">
-                            <span>{{ row.bid_date ? timeFormat(row.bid_date, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="购买标书时间" prop="buy_date" width="120">
-                        <template #default="{ row }">
-                            <span>{{ row.buy_date ? timeFormat(row.buy_date, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="招标方式" prop="invite_tenders_type" width="100">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.bidding_method" :value="row.invite_tenders_type" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="投标地址" prop="bid_address" show-overflow-tooltip width="100" />
-                    <el-table-column label="是否需要保证金" prop="is_margin">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.whether_status" :value="row.is_margin" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="保证金金额" prop="margin_amount" width="100" show-overflow-tooltip />
-                    <!-- <el-table-column label="招标项目慨况" prop="bid_project_overview" show-overflow-tooltip />
-                    <el-table-column label="项目简介" prop="project_desc" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip /> -->
+                    <el-table-column label="招标项目资金来源" width="150" prop="bidding_project_fund_source" show-overflow-tooltip />
+                    <el-table-column label=" 投标时间" prop="bidding_time" show-overflow-tooltip />
+                    <el-table-column label="购买标书时间" prop="buy_date" width="120" show-overflow-tooltip />
+                    <el-table-column label="招标方式" prop="bid_type" show-overflow-tooltip />
+                    <el-table-column label="投标地址" prop="bid_address" show-overflow-tooltip width="200" />
+
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <!-- <el-button v-perms="['bid.bid_buy_bidding_document/edit']" type="primary" link @click="handleEdit(row)">
@@ -125,7 +109,10 @@ const queryParams = reactive({
     project_id: '',
     bid_document_no: '',
     invite_tenders_company_name: '',
-    bid_company_name: ''
+    bid_company_name: '',
+    code: '',
+    project_name: '',
+    custom_name: '',
 })
 
 // 选中数据
diff --git a/src/views/bid_document_examination/detail.vue b/src/views/bid_document_examination/detail.vue
index 440bf02..1151689 100644
--- a/src/views/bid_document_examination/detail.vue
+++ b/src/views/bid_document_examination/detail.vue
@@ -4,86 +4,89 @@
 <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-descriptions title="基本信息" :column="3" border>
+                <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.buyer }}</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.invite_tenders_company_name }}</el-descriptions-item>
+                <el-descriptions-item label="投标公司名称" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_company_name }}</el-descriptions-item>
+                <el-descriptions-item label="购买标书金额" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_document_amount }}</el-descriptions-item>
+                <el-descriptions-item label="招标项目资金来源" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_project_fund_source }}</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.buy_date }}</el-descriptions-item>
+                <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_type }}</el-descriptions-item>
+                <el-descriptions-item label="投标地址" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_address }}</el-descriptions-item>
+                <el-descriptions-item label="是否需要保证金" label-align="left" align="left" label-class-name="my-label">{{ formData.is_margin }}</el-descriptions-item>
+                <el-descriptions-item label="保证金金额" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
+                <el-descriptions-item label="保证金退还时间" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount_return_date }}</el-descriptions-item>
+                <el-descriptions-item label="开标日期" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item>
+                <el-descriptions-item label="招标项目概况" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_project_overview }}</el-descriptions-item>
+                <el-descriptions-item label="项目简介" label-align="left" align="left" label-class-name="my-label">{{ formData.project_desc }}</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-descriptions title="技术审查" :column="1" border style="margin-top:30px">
+                <el-descriptions-item label="技术协议偏差" label-align="left" align="left" label-class-name="my-label">{{ formData.technical_protocol_deviation }}</el-descriptions-item>
+                <el-descriptions-item label="协议偏差处理方案" label-align="left" align="left" label-class-name="my-label">{{ formData.protocol_deviation_handling_plan }}</el-descriptions-item>
 
 
-                        <el-col :span="12">
-                            <el-form-item label="开标时间">
-                                {{ formData.bid_opening_date }}
-                            </el-form-item>
-                        </el-col>
+                <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>
+
+                        </div>
+                    </div>
+                    <div v-else> 暂无附件</div>
+                </el-descriptions-item>
+
+            </el-descriptions>
+            <el-descriptions title="商务审查" :column="3" border style="margin-top:30px">
+                <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.tax_rate }}</el-descriptions-item>
+                <el-descriptions-item label="付款方式" label-align="left" align="left" label-class-name="my-label">{{ formData.pay_type }}</el-descriptions-item>
+                <el-descriptions-item label="付款比例" label-align="left" align="left" label-class-name="my-label">{{ formData.pay_rate }}</el-descriptions-item>
+                <el-descriptions-item label="商务合同偏差" label-align="left" align="left" label-class-name="my-label">{{ formData.business_contract_deviation }}</el-descriptions-item>
+                <el-descriptions-item label="偏差处理方案" label-align="left" align="left" label-class-name="my-label">{{ formData.business_contract_deviation_handling_plan }}</el-descriptions-item>
+
+                <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>
+
+                        </div>
+                    </div>
+                    <div v-else> 暂无附件</div>
+                </el-descriptions-item>
+
+            </el-descriptions>
+
+            <div class="tit" style="margin-top:30px;color:#000;font-size: 16px;">产品明细</div>
+            <el-row>
+                <el-table :data="productList">
+                    <el-table-column label="序号" type="index" width="55" />
+                    <el-table-column label="产品名称" prop="product_name" show-overflow-tooltip />
+                    <el-table-column label="型号规格" prop="product_specs" show-overflow-tooltip />
+                    <el-table-column label="单位" prop="product_unit" show-overflow-tooltip />
+                    <el-table-column label="数量" prop="num" show-overflow-tooltip />
+                    <el-table-column label="成本单价" prop="cost_price" show-overflow-tooltip />
+                    <el-table-column label="金额" prop="cost_amount" show-overflow-tooltip />
+                    <el-table-column label="点数" prop="points" show-overflow-tooltip />
+                    <el-table-column label="报价单价" prop="sale_price" show-overflow-tooltip />
+                    <el-table-column label="报价金额" prop="sale_amount" show-overflow-tooltip />
+                </el-table>
 
 
-
-                        <el-col :span="12">
-                            <el-form-item label="是否需要保证金">
-                                <dict-value :options="dictData.whether_status" :value="formData.is_need_deposit" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额">
-                                {{ formData.business_review_total_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标项目概况">
-                                {{ formData.bidding_project_overview }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="保证金退还时间">
-                                {{ formData.deposit_refund_time }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="技术协议偏差">
-                                {{ formData.technical_protocol_deviation }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标项目概况">
-                                {{ formData.bidding_project_overview }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目简介">
-                                {{ formData.project_introduction }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="税率">
-                                {{ formData.pay_type }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="付款比例">
-                                {{ formData.pay_rate }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="商务合同偏差">
-                                {{ formData.business_contract_deviation }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="偏差处理方案">
-                                {{ formData.business_contract_deviation_handling_plan }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="商务审查附件">
-                                {{ formData.business_contract_deviation_annex }}
-                            </el-form-item>
-                        </el-col>
-
-
-                    </el-row>
-                </el-card>
-            </el-form>
+            </el-row>
         </popup>
     </div>
 </template>
@@ -93,6 +96,8 @@ import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiCustomDetail } from '@/api/custom'
 import { timeFormat } from '@/utils/util'
+import { apiBidDocumentExaminationDetailLists } from '@/api/bid_document_examination_detail'
+
 import type { PropType } from 'vue'
 defineProps({
     dictData: {
@@ -103,13 +108,40 @@ defineProps({
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
-
+const productList = ref([])
+const total = ref('')
 const datas = reactive({
     provinceOptions: [],
     cityOptions: [],
     areaOptions: [],
 });
+const pager1 = reactive({
+    page_size: 10,
+    page_no: 1,
+    bid_document_examination_id: ""
+})
+//条数
+const handleSizeChange1 = (val: number) => {
 
+    pager1.page_size = val
+    productLists()
+}
+
+//分页
+const handleCurrentChange1 = (val: number) => {
+
+    pager1.page_no = val
+    productLists()
+}
+
+// 解决方案列表
+const productLists = () => {
+    apiBidDocumentExaminationDetailLists(pager1).then((res) => {
+        productList.value = res.lists
+        total.value = res.count
+
+    })
+}
 
 // 表单数据
 const formData = reactive({
@@ -128,9 +160,10 @@ const setFormData = async (data: Record<any, any>) => {
     //     }
 
     // }
-
+    pager1.bid_document_examination_id = data.id
     Object.assign(formData, data)
-    console.log(formData, '2222222222')
+    productLists()
+    // console.log(formData, '2222222222')
 
 
 }
@@ -173,9 +206,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/edit.vue b/src/views/bid_document_examination/edit.vue
index ed965c0..ba7dccf 100644
--- a/src/views/bid_document_examination/edit.vue
+++ b/src/views/bid_document_examination/edit.vue
@@ -21,7 +21,7 @@
                 </div>
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="标书编号" prop="buy_bidding_document_id" @click="showDialog = true">
+                        <el-form-item label="标书编号" prop="buy_bidding_document_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="bid_document_no" clearable readonly placeholder="请选择标书编号" />
                         </el-form-item>
                     </el-col>
@@ -31,10 +31,16 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="客户名称" prop="buy_bidding_document_id">
+                        <el-form-item label="客户名称" prop="buy_bidding_document_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="bid_document_no" clearable disabled 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="project_name" clearable disabled placeholder="系统自动填写" />
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="8">
                         <el-form-item label="招标公司名称" prop="buy_bidding_document_id">
                             <el-input v-model="invite_tenders_company_name" clearable disabled placeholder="系统自动填写" />
@@ -53,9 +59,10 @@
                     <el-col :span="8">
 
                         <el-form-item label="招标项目资金来源" prop="buy_bidding_document_id">
-                            <el-select v-model="project_fund_source" clearable disabled placeholder="系统自动填写">
+                            <!-- <el-select v-model="project_fund_source" clearable disabled placeholder="系统自动填写">
                                 <el-option v-for="(item, index) in dictData.construction_funds_sources" :key="index" :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
+                            </el-select> -->
+                            <el-input v-model="bidding_project_fund_source" clearable disabled placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -70,10 +77,10 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="招标方式" prop="buy_bidding_document_id">
-                            <el-select v-model="invite_tenders_type" clearable disabled placeholder="系统自动填写">
+                            <!-- <el-select v-model="invite_tenders_type" clearable disabled placeholder="系统自动填写">
                                 <el-option v-for="(item, index) in dictData.bidding_method" :key="index" :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-
+                            </el-select> -->
+                            <el-input v-model="invite_tenders_type" clearable disabled placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -84,50 +91,42 @@
 
 
                     <el-col :span="8">
-                        <el-form-item label="是否需要保证金" prop="is_need_deposit">
-                            <el-radio-group v-model="formData.is_need_deposit" placeholder="请选择是否需要保证金">
+                        <el-form-item label="是否需要保证金" prop="is_margin">
+                            <el-input v-model="is_margin" clearable disabled placeholder="系统自动填写" />
+                            <!-- <el-radio-group v-model="is_margin" placeholder="请选择是否需要保证金">
                                 <el-radio v-for="(item, index) in dictData.whether_status" :key="index" :label="parseInt(item.value)">
                                     {{ item.name }}
                                 </el-radio>
-                            </el-radio-group>
+                            </el-radio-group> -->
                         </el-form-item>
                     </el-col>
 
 
 
-                    <el-col :span="8">
-                        <el-form-item label="开标日期" prop="bid_opening_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.bid_opening_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开标日期">
-                            </el-date-picker>
-                        </el-form-item></el-col> <el-col :span="8">
+                    <!--   <el-col :span="8"><el-form-item label="开标日期" prop="bid_opening_date">
+                             <el-date-picker class="flex-1 !flex" v-model="formData.bid_opening_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开标日期">
+                            </el-date-picker> 
+                            <el-input v-model="bid_opening_date" clearable disabled placeholder="系统自动填写" />
+                        </el-form-item></el-col> <el-col :span="8"> -->
 
-                        <el-form-item label="保证金退还时间" prop="deposit_refund_time">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.deposit_refund_time" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择保证金退还时间">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col> <el-col :span="8">
+                    <!--       <el-col :span="8"><el-form-item label="保证金退还时间" prop="deposit_refund_time">
+                             <el-date-picker class="flex-1 !flex" v-model="formData.deposit_refund_time" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择保证金退还时间">
+                            </el-date-picker> 
+                            <el-input v-model="deposit_refund_time" clearable disabled placeholder="系统自动填写" />
+                        </el-form-item> 
+                    </el-col>-->
+
+
+                    <!-- <el-col :span="8">
                         <el-form-item label="招标项目概况" prop="bidding_project_overview">
+                            <el-input v-model="bidding_project_overview" clearable disabled placeholder="系统自动填写" />
                             <el-input v-model="formData.bidding_project_overview" clearable placeholder="请输入招标项目概况" />
                         </el-form-item></el-col> <el-col :span="8">
                         <el-form-item label="项目简介" prop="project_introduction">
+                            <el-input v-model="project_introduction" clearable disabled placeholder="系统自动填写" />
                             <el-input v-model="formData.project_introduction" clearable placeholder="请输入项目简介" />
-                        </el-form-item></el-col> <el-col :span="24">
-                        <el-form-item label="附件" prop="annex">
-
-                            <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-form-item>
+                    </el-col> -->
                 </el-row>
                 <div class="tit">技术审查</div>
                 <el-row>
@@ -231,31 +230,31 @@
                             <template #default="{ row }">
                                 <el-input v-model="row.unit" /> </template>
                         </el-table-column>
-                        <el-table-column label="数量" prop="product_num">
-                            <template #default="{ row }">
-                                <el-input v-model="row.product_num" /> </template>
+                        <el-table-column label="数量" prop="num">
+                            <template #default="{ row, $index }">
+                                <el-input v-model="row.num" type="number" @input="jiprice1(row, $index)" /> </template>
                         </el-table-column>
 
-                        <el-table-column label="成本单价" prop="price">
-                            <template #default="{ row }">
-                                <el-input v-model="row.cprice" /> </template>
+                        <el-table-column label="成本单价" prop="cost_price">
+                            <template #default="{ row, $index }">
+                                <el-input v-model="row.cost_price" type="number" @input="jiprice2(row, $index)" /> </template>
                         </el-table-column>
 
-                        <el-table-column label="金额" prop="amount">
+                        <el-table-column label="金额" prop="cost_amount">
                             <template #default="{ row }">
-                                <el-input v-model="row.amount" /> </template>
+                                <el-input v-model="row.cost_amount" type="number" disabled placeholder="系统自动计算" /> </template>
                         </el-table-column>
-                        <el-table-column label="点数" prop="rate">
+                        <el-table-column label="点数" prop="points">
                             <template #default="{ row }">
-                                <el-input v-model="row.rate" /> </template>
+                                <el-input v-model="row.points" type="number" /> </template>
                         </el-table-column>
-                        <el-table-column label="报价单价" prop="unit_price">
-                            <template #default="{ row }">
-                                <el-input v-model="row.unit_price" /> </template>
+                        <el-table-column label="报价单价" prop="sale_price">
+                            <template #default="{ row, $index }">
+                                <el-input v-model="row.sale_price" type="number" @input="jiprice3(row, $index)" /> </template>
                         </el-table-column>
                         <el-table-column label="报价金额" prop="total_amount">
                             <template #default="{ row }">
-                                <el-input v-model="row.total_amount" />
+                                <el-input v-model="row.sale_amount" type="number" disabled placeholder="系统自动计算" />
                             </template>
                         </el-table-column>
                     </el-table>
@@ -298,10 +297,17 @@ const invite_tenders_company_name = ref('')
 const bid_company_name = ref('')
 const amount = ref('')
 const buyer = ref('')
+const project_name = ref('')
 const project_fund_source = ref('')
+const is_margin = ref('')
 const bid_date = ref('')
 const buy_date = ref('')
+const bidding_project_fund_source = ref('')
 const invite_tenders_type = ref('')
+const bid_opening_date = ref('')
+const deposit_refund_time = ref('')
+const bidding_project_overview = ref('')
+const project_introduction = ref('')
 const bid_address = ref('')
 const tableData = ref([{}])
 const list1 = reactive([])
@@ -352,6 +358,29 @@ const handleAvatarSuccess_four1 = (
 const delFileFn1 = (index: number) => {
     formDataannex1.splice(index, 1)
 }
+//金额计算
+const jiprice1 = (row: any, index: any) => {
+    console.log(row)
+    if (row.cost_price) {
+        row.cost_amount = row.num * row.cost_price
+    }
+    if (row.sale_price) {
+        row.cost_amount = row.num * row.sale_price
+    }
+}
+const jiprice2 = (row: any, index: any) => {
+    console.log(row)
+    if (row.num) {
+        row.cost_amount = row.num * row.cost_price
+    }
+}
+
+const jiprice3 = (row: any, index: any) => {
+    if (row.num) {
+        row.sale_amount = row.num * row.sale_price
+    }
+    // console.log(row)
+}
 
 // 上传文件
 const handleAvatarSuccess_four2 = (
@@ -401,12 +430,9 @@ const formData = reactive({
     org_id: '',
     approve_id: 0,
     buy_bidding_document_id: '',
-    is_need_deposit: '',
-    bid_opening_date: '',
-    deposit_refund_time: '',
+
     bidding_project_overview: '',
     project_introduction: '',
-    annex: '',
     technical_protocol_deviation: '',
     protocol_deviation_handling_plan: '',
     technical_review_annex: '',
@@ -417,26 +443,28 @@ const formData = reactive({
     business_contract_deviation: '',
     business_contract_deviation_handling_plan: '',
     business_contract_deviation_annex: '',
-    product: [
-        {
-
-        }
-    ]
+    quotation_detail: ''
 })
 
 //获取值
 const customEvent = (e: any) => {
     formData.buy_bidding_document_id = e.id;
+    is_margin.value = e.is_margin
     bid_document_no.value = e.bid_document_no
     invite_tenders_company_name.value = e.invite_tenders_company_name
     bid_company_name.value = e.bid_company_name
     amount.value = e.amount
     buyer.value = e.buyer
-    project_fund_source.value = e.project_fund_source
-    bid_date.value = e.bid_date
+    project_name.value = e.project_name
+    bid_date.value = e.bidding_time
     buy_date.value = e.buy_date
-    invite_tenders_type.value = e.invite_tenders_type
+    invite_tenders_type.value = e.bid_type
     bid_address.value = e.bid_address
+    bidding_project_fund_source.value = e.bidding_project_fund_source
+    bid_opening_date.value = e.bid_opening_date
+    // deposit_refund_time.value = e.margin_amount_return_date
+    bidding_project_overview.value = e.bid_project_overview
+    project_introduction.value = e.project_desc
     showDialog.value = false
 
 };
@@ -445,11 +473,7 @@ const customEvent1 = (e: any) => {
     tableData.value[num.value].name = e.name
     tableData.value[num.value].specs = e.specs
     tableData.value[num.value].unit = e.unit
-    tableData.value[num.value].product_num = e.product_num
-    tableData.value[num.value].price = e.price
-    tableData.value[num.value].amount = e.amount
-    tableData.value[num.value].product_id = e.id
-    tableData.value[num.value].product_id = e.id
+
 
     // formData.customer_id = e.id;
     // customer_name.value = e.name;
@@ -492,7 +516,7 @@ const getlist1 = (id: any) => {
 }
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    bid_document_no.value = data.document.bid_document_no
+
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
@@ -503,17 +527,7 @@ const setFormData = async (data: Record<any, any>) => {
         getlist1(data.org_id)
     }
 
-    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)
-
-    }
     if (data.technical_review_annex && data.technical_review_annex.length > 0) {
         const arry1 = data.technical_review_annex.map((item: any, index: any) => {
             return {
@@ -536,20 +550,28 @@ const setFormData = async (data: Record<any, any>) => {
     }
 
 
-    bid_document_no.value = data.document.bid_document_no
-    invite_tenders_company_name.value = data.document.invite_tenders_company_name
-    bid_company_name.value = data.document.bid_company_name
-    amount.value = data.document.amount
-    buyer.value = data.document.buyer
-    project_fund_source.value = data.document.project_fund_source
-    bid_date.value = data.document.bid_date
-    invite_tenders_type.value = data.document.invite_tenders_type
-    bid_address.value = data.document.bid_address
+    bid_document_no.value = data.bid_document_no
+    invite_tenders_company_name.value = data.invite_tenders_company_name
+    bid_company_name.value = data.bid_company_name
+    amount.value = data.bid_document_amount
 
-    //@ts-ignore
-    formData.bid_opening_date = timeFormat(formData.bid_opening_date, 'yyyy-mm-dd hh:MM:ss')
-    //@ts-ignore
-    formData.deposit_refund_time = timeFormat(formData.deposit_refund_time, 'yyyy-mm-dd hh:MM:ss')
+    buyer.value = data.buyer
+    bid_date.value = data.bidding_time
+    buy_date.value = data.buy_date
+    //project_fund_source.value = data.project_fund_source
+    bid_date.value = data.bidding_time
+    invite_tenders_type.value = data.bid_type
+    bid_address.value = data.bid_address
+    bidding_project_fund_source.value = data.bidding_project_fund_source
+    bid_opening_date.value = data.bid_opening_date
+    deposit_refund_time.value = data.margin_amount_return_date
+    bidding_project_overview.value = data.bid_project_overview
+    project_introduction.value = data.project_desc
+
+    // //@ts-ignore
+    // formData.bid_opening_date = timeFormat(formData.bid_opening_date, 'yyyy-mm-dd hh:MM:ss')
+    // //@ts-ignore
+    // formData.deposit_refund_time = timeFormat(formData.deposit_refund_time, 'yyyy-mm-dd hh:MM:ss')
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -562,9 +584,25 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    formData.annex = JSON.stringify(formDataannex.map(item => item.uri))
-    formData.technical_review_annex = JSON.stringify(formDataannex1.map(item => item.uri))
-    formData.business_contract_deviation_annex = JSON.stringify(formDataannex2.map(item => item.uri))
+    if (formDataannex1.length > 0) {
+        formData.technical_review_annex = JSON.stringify(formDataannex1.map(item => item.uri))
+    }
+    if (formDataannex2.length > 0) {
+        formData.business_contract_deviation_annex = JSON.stringify(formDataannex2.map(item => item.uri))
+    }
+    if (tableData.value.length > 0) {
+        let data1 = tableData.value.map((item) => ({
+            product_id: item.product_id,
+            num: item.num,
+            points: item.points,
+            cost_price: item.cost_price,
+            sale_price: item.sale_price
+        }))
+        formData.quotation_detail = JSON.stringify(data1)
+    }
+
+
+
     await formRef.value?.validate()
     const data = { ...formData, }
     mode.value == 'edit'
diff --git a/src/views/bid_document_examination/index.vue b/src/views/bid_document_examination/index.vue
index 9dd0eda..416ba3d 100644
--- a/src/views/bid_document_examination/index.vue
+++ b/src/views/bid_document_examination/index.vue
@@ -25,9 +25,9 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['bid.bid_document_examination/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <!-- <el-button v-perms="['bid.bid_document_examination/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" />
@@ -35,33 +35,25 @@
 
                     <el-table-column label="处理流程" prop="project_id" show-overflow-tooltip />
                     <el-table-column label="审批状态" prop="project_id" show-overflow-tooltip />
-                    <el-table-column label="流程编号" prop="approve_id" show-overflow-tooltip />
-                    <el-table-column label="标书编号" 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="project_name" show-overflow-tooltip />
                     <el-table-column label="招标公司名称" prop="invite_tenders_company_name" show-overflow-tooltip />
                     <el-table-column label="投标公司名称" prop="bid_company_name" show-overflow-tooltip />
-                    <el-table-column label="招标项目资金来源" width="150" prop="project_fund_source">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.construction_funds_sources" :value="row.project_fund_source" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="招标项目资金来源" width="150" prop="bidding_project_fund_source" show-overflow-tooltip />
                     <el-table-column label="投标地址" prop="bid_address" show-overflow-tooltip />
-                    <el-table-column label="是否需要保证金" prop="is_need_deposit">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.whether_status" :value="row.is_need_deposit" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="是否需要保证金" prop="is_margin" show-overflow-tooltip />
                     <el-table-column label="保证金金额	" prop="margin_amount" show-overflow-tooltip />
                     <el-table-column label="开标日期" prop="bid_opening_date" show-overflow-tooltip />
-                    <el-table-column label="总金额" prop="business_review_total_amount" show-overflow-tooltip />
+                    <el-table-column label="总金额" prop="total_amount" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['bid.bid_document_examination/edit']" type="primary" link @click="handleEdit(row)">
+                            <!-- <el-button v-perms="['bid.bid_document_examination/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
-                            </el-button>
-                            <el-button v-perms="['bid.bid_document_examination/delete']" type="danger" link @click="handleDelete(row.id)">
+                            </el-button> -->
+                            <!-- <el-button v-perms="['bid.bid_document_examination/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
-                            </el-button>
+                            </el-button> -->
                             <el-button v-perms="['bid.bid_document_examination/detail']" link @click="handledetail(row)">
                                 详情
                             </el-button>
diff --git a/src/views/bid_document_examination_detail/detail.vue b/src/views/bid_document_examination_detail/detail.vue
index d51da47..8d7af0a 100644
--- a/src/views/bid_document_examination_detail/detail.vue
+++ b/src/views/bid_document_examination_detail/detail.vue
@@ -3,108 +3,34 @@
 
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="投标决策详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+        <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.project.name }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project ? formData.project.project_code : '暂无数据' }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目估算(万元)">
-                                {{ formData.project_estimation }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="投标时间">
-                                {{ formData.bidding_time }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="购买标书时间">
-                                {{ formData.buy_bid_document_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标项目资金来源">
-                                <dict-value :options="dictData.construction_funds_sources" :value="formData.bidding_project_fund_source" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标方式">
-                                <dict-value :options="dictData.bidding_method" :value="formData.bid_type" />
-                            </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.margin_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="是否需要保证金">
-                                <dict-value :options="dictData.whether_status" :value="formData.whether_status" />
-                            </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="开标日期">
-                                {{ bid_opening_date }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="保证金退还时间">
-                                {{ formData.margin_amount_return_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="有无内部资源">
-                                <dict-value :options="dictData.whether_status" :value="formData.is_internal_resources" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目把握度">
-                                {{ formData.project_assurancee }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标项目概况">
-                                {{ formData.bid_project_overview }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目简介">
-                                {{ formData.project_desc }}
-                            </el-form-item>
-                        </el-col>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="投标审查单号" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_document_examination_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.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-row>
-                </el-card>
+                    <el-descriptions-item label="产品名称" label-align="left" align="left" label-class-name="my-label">{{ formData.product_name }}</el-descriptions-item>
+                    <el-descriptions-item label="型号规格" label-align="left" align="left" label-class-name="my-label">{{ formData.product_specs }}</el-descriptions-item>
+                    <el-descriptions-item label="单位" label-align="left" align="left" label-class-name="my-label">{{ formData.product_unit }}</el-descriptions-item>
+                    <el-descriptions-item label="数量" label-align="left" align="left" label-class-name="my-label">{{ formData.num }}</el-descriptions-item>
+                    <el-descriptions-item label="成本单价" label-align="left" align="left" label-class-name="my-label">{{ formData.cost_price }}</el-descriptions-item>
+                    <el-descriptions-item label="金额" label-align="left" align="left" label-class-name="my-label">{{ formData.cost_amount }}</el-descriptions-item>
+
+                    <el-descriptions-item label="点数" label-align="left" align="left" label-class-name="my-label">{{ formData.points }}</el-descriptions-item>
+                    <el-descriptions-item label="报价单价" label-align="left" align="left" label-class-name="my-label">{{ formData.sale_price }}</el-descriptions-item>
+
+                    <el-descriptions-item label="报价金额" label-align="left" align="left" label-class-name="my-label">{{ formData.sale_amount }}</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>
             </el-form>
         </popup>
     </div>
@@ -196,9 +122,14 @@ 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/edit.vue b/src/views/bid_document_examination_detail/edit.vue
index caae307..a3d6a15 100644
--- a/src/views/bid_document_examination_detail/edit.vue
+++ b/src/views/bid_document_examination_detail/edit.vue
@@ -23,43 +23,33 @@
                         </el-form-item></el-col>
                     <el-col :span="8">
                         <el-form-item label="型号规格" prop="product_id">
-                            <el-input v-model="product_specs" readonly clearable placeholder="请输入产品" />
+                            <el-input v-model="product_specs" clearable disabled placeholder="系统自动填写" />
                         </el-form-item></el-col>
 
                     <el-col :span="8">
                         <el-form-item label="单位" prop="product_id">
-                            <el-input v-model="product_unit" clearable placeholder="请输入产品" />
+                            <el-input v-model="product_unit" clearable disabled placeholder="系统自动填写" />
                         </el-form-item></el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="产品数量" prop="product_num">
-                            <el-input v-model="formData.product_num" clearable placeholder="请输入产品数量" />
+                        <el-form-item label="产品数量" prop="num">
+                            <el-input v-model="formData.num" clearable placeholder="请输入产品数量" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="成本单价" prop="cost_unit_price">
-                            <el-input v-model="formData.cost_unit_price" clearable placeholder="请输入成本单价" />
+                        <el-form-item label="成本单价" prop="cost_price">
+                            <el-input v-model="formData.cost_price" clearable placeholder="请输入成本单价" />
                         </el-form-item></el-col>
 
 
                     <el-col :span="8">
-                        <el-form-item label="金额" prop="amount">
-                            <el-input v-model="formData.amount" clearable disabled placeholder="系统自动计算" />
-                        </el-form-item></el-col>
-
-
-                    <el-col :span="8">
-                        <el-form-item label="点数" prop="rate">
-                            <el-input v-model="formData.rate" clearable placeholder="请输入点数" />
+                        <el-form-item label="点数" prop="points">
+                            <el-input v-model="formData.points" clearable placeholder="请输入点数" />
                         </el-form-item></el-col>
                     <el-col :span="8">
-                        <el-form-item label="报价单价" prop="unit_price">
-                            <el-input v-model="formData.unit_price" clearable placeholder="请输入报价单价" />
-                        </el-form-item></el-col>
-                    <el-col :span="8">
-                        <el-form-item label="报价金额" prop="total_amount">
-                            <el-input v-model="formData.total_amount" clearable disabled placeholder="系统自动计算" />
+                        <el-form-item label="报价单价" prop="usale_price">
+                            <el-input v-model="formData.sale_price" clearable placeholder="请输入报价单价" />
                         </el-form-item></el-col>
 
 
@@ -113,13 +103,11 @@ const formData = reactive({
     id: '',
     bid_document_examination_id: '',
     product_id: '',
-    product_num: '',
-    cost_unit_price: '',
+    num: '',
+    points: '',
     amount: '',
-    rate: '',
-    unit_price: '',
-    total_amount: '',
-    create_user: '',
+    cost_price: '',
+    sale_price: '',
 })
 
 
@@ -140,7 +128,7 @@ const customEvent = (e: any) => {
 };
 //获取值
 const customEvent1 = (e: any) => {
-    // formData.buy_bidding_document_id = e.id;
+    formData.product_id = e.id;
     product_name.value = e.name
     product_specs.value = e.specs
     product_unit.value = e.unit
@@ -157,7 +145,12 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
 
-
+    matsname.value = data.custom_name
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    product_name.value = data.product_name
+    product_specs.value = data.product_specs
+    product_unit.value = data.product_unit
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/bid_document_examination_detail/index.vue b/src/views/bid_document_examination_detail/index.vue
index 19b75a0..2d1ca8d 100644
--- a/src/views/bid_document_examination_detail/index.vue
+++ b/src/views/bid_document_examination_detail/index.vue
@@ -2,11 +2,11 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="标书审查id" prop="bid_document_examination_id">
-                    <el-input class="w-[280px]" v-model="queryParams.bid_document_examination_id" clearable placeholder="请输入标书审查id" />
+                <el-form-item label="标书审查编码" prop="bid_document_examination_code">
+                    <el-input class="w-[280px]" v-model="queryParams.bid_document_examination_code" clearable placeholder="请输入标书审查编码" />
                 </el-form-item>
-                <el-form-item label="产品id" prop="product_id">
-                    <el-input class="w-[280px]" v-model="queryParams.product_id" clearable placeholder="请输入产品id" />
+                <el-form-item label="产品名称" prop="product_name">
+                    <el-input class="w-[280px]" v-model="queryParams.product_name" clearable placeholder="请输入产品名称" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -29,15 +29,20 @@
                     <el-table-column type="selection" width="55" />
 
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="客户名称" prop="bid_document_examination_id" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="product_id" show-overflow-tooltip />
-                    <el-table-column label="项目编码" prop="product_num" show-overflow-tooltip />
-                    <el-table-column label="成本单价" prop="cost_unit_price" show-overflow-tooltip />
-                    <el-table-column label="金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="点数" prop="rate" show-overflow-tooltip />
-                    <el-table-column label="报价单价" prop="unit_price" show-overflow-tooltip />
-                    <el-table-column label="报价金额" prop="total_amount" show-overflow-tooltip />
-                    <el-table-column label="" prop="create_user" 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="product_code" show-overflow-tooltip />
+                    <el-table-column label="投标审查单号" prop="cost_price" show-overflow-tooltip />
+                    <el-table-column label="产品名称" prop="product_name" show-overflow-tooltip />
+                    <el-table-column label="型号规格" prop="product_specs" show-overflow-tooltip />
+                    <el-table-column label="单位" prop="product_unit" show-overflow-tooltip />
+                    <el-table-column label="数量" prop="num" show-overflow-tooltip />
+                    <el-table-column label="成本单价" prop="cost_price" show-overflow-tooltip />
+                    <el-table-column label="金额" prop="cost_amount" show-overflow-tooltip />
+                    <el-table-column label="点数" prop="points" show-overflow-tooltip />
+                    <el-table-column label="报价单价" prop="sale_price" show-overflow-tooltip />
+                    <el-table-column label="报价金额" prop="sale_amount" show-overflow-tooltip />
+
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['bid.bid_document_examination_detail/edit']" type="primary" link @click="handleEdit(row)">
@@ -81,8 +86,8 @@ const showDtail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    bid_document_examination_id: '',
-    product_id: ''
+    product_name: '',
+    bid_document_examination_code: '',
 })
 
 // 选中数据
diff --git a/src/views/bid_result/detail.vue b/src/views/bid_result/detail.vue
index 8c852c2..aab38ce 100644
--- a/src/views/bid_result/detail.vue
+++ b/src/views/bid_result/detail.vue
@@ -4,54 +4,44 @@
 <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.project.name }}
-
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project ? formData.project.project_code : '暂无数据' }}
-
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="是否中标">
-                                <dict-value :options="dictData.whether_status" :value="formData.is_successful" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="中标单位">
-                                {{ formData.bidder_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="中标金额">
-                                {{ formData.bidder_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="投标总结">
-                                {{ formData.bid_summary }}
-                            </el-form-item>
-                        </el-col>
+            <el-descriptions :column="3" 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.bid_document_examination_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.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-row>
-                </el-card>
-            </el-form>
+
+                <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.bid_opening_date }}</el-descriptions-item>
+
+                <el-descriptions-item label="是否中标" label-align="left" align="left" label-class-name="my-label">{{ formData.is_successful_text
+                }}</el-descriptions-item>
+
+                <el-descriptions-item label="中标单位" label-align="left" align="left" label-class-name="my-label">{{ formData.bidder_company
+                }}</el-descriptions-item>
+                <el-descriptions-item label="中标金额" label-align="left" align="left" label-class-name="my-label">{{ formData.bidder_amount }}</el-descriptions-item>
+
+
+                <el-descriptions-item label="投标总结" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_summary }}</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;">
+                            <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-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>
         </popup>
     </div>
 </template>
@@ -72,7 +62,7 @@ defineProps({
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
-
+const formDataannex = reactive([])
 const datas = reactive({
     provinceOptions: [],
     cityOptions: [],
@@ -97,7 +87,17 @@ 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)
+
+    }
     Object.assign(formData, data)
     console.log(formData, '2222222222')
 
@@ -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/bid_result/edit.vue b/src/views/bid_result/edit.vue
index 6513489..89ec6d0 100644
--- a/src/views/bid_result/edit.vue
+++ b/src/views/bid_result/edit.vue
@@ -1,41 +1,64 @@
 <template>
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="标书审查id" prop="bid_document_examination_id" @click="showDialog = true">
-                    <el-input v-model="formData.bid_document_examination_id" clearable placeholder="点击选择标书评审(可以为空)" />
+
+
+            <el-form ref="formRef" :model="formData" label-width="120px" :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-form-item label="标书审查编码" prop="bid_document_examination_id" @click="showDialog = true">
+                    <el-input v-model="bid_document_no" clearable placeholder="点击选择标书评审(可以为空)" />
                 </el-form-item>
-                <el-form-item label="项目名称" prop="project_id">
+                <el-form-item label="项目名称" prop="bid_document_examination_id">
                     <el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
-                <el-form-item label="项目编码" prop="project_id">
+                <el-form-item label="项目编码" prop="bid_document_examination_id">
                     <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
-                <el-form-item label="客户名称" prop="project_id">
-                    <el-input v-model="project_matername" clearable disabled placeholder="系统自动填写" />
+                <el-form-item label="客户名称" prop="bid_document_examination_id">
+                    <el-input v-model="custom_name" clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
 
                 <el-form-item label="是否中标" prop="is_successful">
                     <el-select v-model="formData.is_successful" clearable placeholder="请选择是否中标">
-                        <el-option v-for="(item, index) in dictData.whether_status" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                        <el-option v-for="(item, index) in dictData.is_successful" :key="index" :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
 
 
-                <el-form-item label="中标单位" prop="bidder">
-                    <el-input v-model="formData.bidder" clearable placeholder="请输入中标单位" />
+                <el-form-item label="中标单位" prop="bidder_company">
+                    <el-input v-model="formData.bidder_company" clearable placeholder="请输入中标单位" />
                 </el-form-item>
                 <el-form-item label="中标金额" prop="bidder_amount">
                     <el-input v-model="formData.bidder_amount" clearable placeholder="请输入中标金额" />
                 </el-form-item>
-                <el-form-item label="中标金额大写" prop="bidder_amount_daxie">
-                    <el-input v-model="formData.bidder_amount_daxie" clearable placeholder="请输入中标金额大写" />
-                </el-form-item>
+
                 <el-form-item label="投标总结" prop="bid_summary">
                     <el-input v-model="formData.bid_summary" clearable placeholder="请输入投标总结" />
                 </el-form-item>
                 <el-form-item label="附件" prop="annex">
-                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
+
+                    <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-form>
         </popup>
@@ -54,6 +77,11 @@ import biddocumentTable from "@/components/document_examination/index.vue"
 import { apiBidResultAdd, apiBidResultEdit, apiBidResultDetail } from '@/api/bid_result'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -64,10 +92,36 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-const project_matername = ref('')
+const custom_name = ref('')
 const project_name = ref('')
 const project_code = ref('')
+const bid_document_no = ref('')
+const formDataannex = reactive([])
 const showDialog = ref(false)
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+// 上传文件
+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 delFileFn = (index: number) => {
+    formDataannex.splice(index, 1)
+}
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑投标结果' : '新增投标结果'
@@ -76,17 +130,45 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    org_id: '',
+    dept_id: '',
     bid_document_examination_id: '',
     project_id: '',
     is_successful: '',
-    bidder: '',
+    bidder_company: '',
     bidder_amount: '',
-    bidder_amount_daxie: '',
     bid_summary: '',
     annex: '',
 })
 
+//获取所有组织
+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 formRules = reactive<any>({
 
@@ -94,20 +176,18 @@ const formRules = reactive<any>({
 
 //获取值
 const customEvent = (e: any) => {
-    formData.buy_bidding_document_id = e.id;
+    formData.bid_document_examination_id = e.id;
+    bid_document_no.value = e.code
+    custom_name.value = e.custom_name
+    project_name.value = e.project_name
+    project_code.value = e.project_code
 
-    bidding_name.value = e.custom_name
+    showDialog.value = false
 
 
 };
-//获取值
-const customEvent1 = (e: any) => {
-    formData.buy_bidding_document_id = e.id;
-
-    bidding_name.value = e.custom_name
 
 
-};
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     for (const key in formData) {
@@ -116,7 +196,24 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
+    if (data.dept_id) {
+        getlist1(data.org_id)
+    }
+    bid_document_no.value = data.bid_document_examination_code
+    custom_name.value = data.custom_name
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    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)
+
+    }
 
 }
 
@@ -130,6 +227,10 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
+    if (formDataannex.length > 0) {
+        formData.annex = JSON.stringify(formDataannex.map((item: any) => item.uri))
+    }
+
     await formRef.value?.validate()
     const data = { ...formData, }
     mode.value == 'edit'
@@ -143,6 +244,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/bid_result/index.vue b/src/views/bid_result/index.vue
index 3237898..1cccd96 100644
--- a/src/views/bid_result/index.vue
+++ b/src/views/bid_result/index.vue
@@ -35,20 +35,21 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
 
-                    <el-table-column label="标书审查id" prop="bid_document_examination_id" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="project_id" show-overflow-tooltip />
-                    <el-table-column label="项目编码" prop="project_id" show-overflow-tooltip />
-                    <el-table-column label="投标时间" prop="project_id" show-overflow-tooltip />
-                    <el-table-column label="开标日期" prop="project_id" show-overflow-tooltip />
+                    <el-table-column label="投标编号" prop="bid_document_examination_code" 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="bidding_time" show-overflow-tooltip />
+                    <el-table-column label="开标日期" prop="bid_opening_date" show-overflow-tooltip />
                     <el-table-column label="是否中标" prop="is_successful" show-overflow-tooltip>
                         <template #default="{ row }">
-                            <dict-value :options="dictData.whether_status" :value="row.is_successful" />
+                            <dict-value :options="dictData.is_successful" :value="row.is_successful" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="中标单位" prop="bidder" show-overflow-tooltip />
+                    <el-table-column label="中标单位" prop="bidder_company" show-overflow-tooltip />
                     <el-table-column label="中标金额" prop="bidder_amount" show-overflow-tooltip />
-                    <el-table-column label="中标金额大写" prop="bidder_amount_daxie" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+
+                    <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['bid.bid_result/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
@@ -107,7 +108,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('whether_status')
+const { dictData } = useDictData('is_successful')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -124,10 +125,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiBidResultDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
@@ -141,7 +143,6 @@ const handledetail = async (data: any) => {
     let res = await apiBidResultDetail({ id: data.id })
     showDtail.value = true
     await nextTick()
-
     detailRef.value?.open()
     detailRef.value?.setFormData(res)
 }
diff --git a/src/views/bidbbond/edit.vue b/src/views/bidbbond/edit.vue
index edcaf53..3ba9bdc 100644
--- a/src/views/bidbbond/edit.vue
+++ b/src/views/bidbbond/edit.vue
@@ -144,10 +144,12 @@ import { isEmail, isIdCard, isPhone } from '@/utils/validate'
 import type { PropType } from 'vue'
 import configs from "@/config"
 import useUserStore from "@/stores/modules/user";
-const active = reactive(0)
 
 const base_url = configs.baseUrl + configs.urlPrefix
 const userStore = useUserStore();
+const active = reactive(0)
+
+
 const formDataannex = reactive([])
 const contract_name = ref('')
 const project_name = ref('')
@@ -172,31 +174,7 @@ const handleAvatarSuccess_four = (
 
     );
 };
-//验证
-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)
diff --git a/src/views/custom/edit.vue b/src/views/custom/edit.vue
index 75ce9a5..63c8ed3 100644
--- a/src/views/custom/edit.vue
+++ b/src/views/custom/edit.vue
@@ -131,7 +131,7 @@
                     <div class="tit">其他联系人</div>
 
                     <el-row>
-                        <el-table :data="formData.other_contacts">
+                        <el-table :data="otherList">
                             <el-table-column label="序号">
                                 <template #default="{ row }">
                                     <el-button @click="handleAdd(row)">+</el-button>
@@ -192,7 +192,7 @@
 
 
                         </el-table>
-                        <!-- <template v-for="(item, index) in formData.other_contacts" :key="index">
+                        <!-- <template v-for="(item, index) inotherList" :key="index">
                             <el-col :span="12">
                                 <el-form-item label="姓名" prop="field120">
                                     <el-input :disabled="isDisabled" v-model="item.name" placeholder="请输入姓名" clearable :style="{ width: '100%' }"></el-input>
@@ -218,7 +218,7 @@
                         <!-- <el-col :span="24">
                             <el-form-item label prop="field126">
                                 <el-button type="primary" :disabled="isDisabled" size="medium" @click="other">添加联系人</el-button>
-                                <el-button v-if="formData.other_contacts.length" type="primary" :disabled="isDisabled" size="medium" @click="otherdelete">删除</el-button>
+                                <el-button v-if="otherList.length" type="primary" :disabled="isDisabled" size="medium" @click="otherdelete">删除</el-button>
                             </el-form-item>
                         </el-col> -->
                     </el-row>
@@ -302,6 +302,7 @@ const companyname = ref('')
 const list1 = reactive([])
 const showDialog = ref(false);
 const list2 = reactive([])
+const otherList = reactive([{}])
 import configs from "@/config"
 
 const base_url = configs.baseUrl + configs.urlPrefix
@@ -322,14 +323,14 @@ const customEvent = (e: any) => {
 
 const handleAdd = (row: any) => {
     // 在 row 后面插入一行数据
-    const index = formData.other_contacts.indexOf(row);
-    formData.other_contacts.splice(index + 1, 0, {});
+    const index = otherList.indexOf(row);
+    otherList.splice(index + 1, 0, {});
 };
 
 const handleDelete = (row: any) => {
     // 删除 row
-    const index = formData.other_contacts.indexOf(row);
-    formData.other_contacts.splice(index, 1);
+    const index = otherList.indexOf(row);
+    otherList.splice(index, 1);
 };
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -428,7 +429,7 @@ const formData = reactive({
     bank_name: '',
     bank_account: '',
     status: '',
-    other_contacts: [{}],
+    other_contacts: '',
     area: ""
 
 })
@@ -445,12 +446,12 @@ const handleAvatarSuccess_four1 = (index, response, file, fileList) => {
         ElMessage.error(response.msg);
         return;
     }
-    if (!formData.other_contacts[index].annex) {
-        formData.other_contacts[index].annex = [];  // 如果 annex 不存在，先创建一个空数组
+    if (!otherList[index].annex) {
+        otherList[index].annex = [];  // 如果 annex 不存在，先创建一个空数组
     }
-    // console.log(formData.other_contacts[index], index, tablist2)
+    // console.log(otherList[index], index, tablist2)
     // console.log(index, response)
-    formData.other_contacts[index].annex.push({ uri: response.data.uri, name: response.data.name });
+    otherList[index].annex.push({ uri: response.data.uri, name: response.data.name });
 
 
 
@@ -490,9 +491,7 @@ const setFormData = async (data: Record<any, any>) => {
         companyname.value = data.company_name
 
     }
-    if (data.other_contacts && data.other_contacts.length > 0) {
-        formData.other_contacts = JSON.parse(data.other_contacts)
-    }
+
 
 
 
@@ -509,10 +508,9 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    if (formData.other_contacts && formData.other_contacts.length > 0 && mode.value == 'add') {
-        formData.other_contacts = JSON.stringify(formData.other_contacts)
-    } else {
-        delete formData.other_contacts
+    console.log()
+    if (mode.value == 'add' && otherList.length > 0 && Object.keys(otherList[0]).length > 0) {
+        formData.other_contacts = JSON.stringify(otherList)
     }
 
     await formRef.value?.validate()
diff --git a/src/views/custom_contacts/detail.vue b/src/views/custom_contacts/detail.vue
index d7b23e8..7475c93 100644
--- a/src/views/custom_contacts/detail.vue
+++ b/src/views/custom_contacts/detail.vue
@@ -3,8 +3,36 @@
 
 <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="90px">
+        <popup ref="popupRef" title="客户联系人详情" :async="true" width="40%" @confirm="handleSubmit" @close="handleClose">
+            <el-descriptions :column="1" label-class-name="my-label" class-name="my-content" border>
+                <el-descriptions-item label="客户名称" label-align="left" align="left">{{ formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="姓名" label-align="left" align="left"> {{ formData.name }}</el-descriptions-item>
+                <el-descriptions-item label="职位" label-align="left" align="left"> {{ formData.position }}</el-descriptions-item>
+                <el-descriptions-item label="手机" label-align="left" align="left">
+                    {{ formData.phone }}
+                </el-descriptions-item>
+                <el-descriptions-item label="电话" label-align="left" align="left"> {{ formData.telephone }}</el-descriptions-item>
+                <el-descriptions-item label="邮箱" label-align="left" align="left"> {{ formData.email }}</el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left"> {{ formData.notes }}</el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left">
+                    <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-item label="添加人" label-align="left" align="left"></el-descriptions-item>
+
+                <el-descriptions-item label="创建日期" label-align="left" align="left"></el-descriptions-item>
+                <el-descriptions-item label="更新人" label-align="left" align="left"></el-descriptions-item>
+                <el-descriptions-item label="更新日期" label-align="left" align="left"></el-descriptions-item>
+
+            </el-descriptions>
+
+            <!-- <el-form ref="formRef" :model="formData" label-width="90px">
                 <el-card class="mb-2">
                     <el-row>
                         <el-col :span="12">
@@ -59,7 +87,7 @@
                         </el-col>
                     </el-row>
                 </el-card>
-            </el-form>
+            </el-form> -->
         </popup>
     </div>
 </template>
@@ -148,7 +176,17 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
+:deep(.my-label) {
+    width: 10px !important;
+    background: red !important;
+}
+
+:deep(.my-content) {
+    width: 120px !important;
+    background: rgb(55, 0, 255) !important;
+}
+
 .tit {
     font-size: 1.2em;
     margin-bottom: 10px;
diff --git a/src/views/custom_contacts/edit.vue b/src/views/custom_contacts/edit.vue
index 2e0e931..d6a689f 100644
--- a/src/views/custom_contacts/edit.vue
+++ b/src/views/custom_contacts/edit.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-row>
                     <el-col :span="12">
diff --git a/src/views/quotation_detail/edit.vue b/src/views/quotation_detail/edit.vue
index e2c5e7f..a8a3899 100644
--- a/src/views/quotation_detail/edit.vue
+++ b/src/views/quotation_detail/edit.vue
@@ -1,13 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="报价单id" prop="quotation_id">
                     <el-input v-model="formData.quotation_id" clearable placeholder="请输入报价单id" />
@@ -20,12 +13,7 @@
                 </el-form-item>
                 <el-form-item label="税率" prop="tax_rate">
                     <el-select class="flex-1" v-model="formData.tax_rate" clearable placeholder="请选择税率">
-                        <el-option 
-                            v-for="(item, index) in dictData.tax_rate"
-                            :key="index" 
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        />
+                        <el-option v-for="(item, index) in dictData.tax_rate" :key="index" :label="item.name" :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注" prop="remark">
@@ -36,10 +24,10 @@
     </div>
 </template>
 
-<script lang="ts" setup name="quotationDetailEdit">
+<!-- <script lang="ts" setup name="quotationDetailEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiQuotationDetailAdd, apiQuotationDetailEdit, apiQuotationDetailDetail } from '@/api/quotation_detail'
+import { apiQuotationDetailAdd, apiQuotationDetailEdit, apiQuotationDetail } from '@/api/quotation_detail'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -84,8 +72,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -99,9 +87,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiQuotationDetailEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiQuotationDetailEdit(data)
         : await apiQuotationDetailAdd(data)
     popupRef.value?.close()
     emit('success')
@@ -125,4 +113,4 @@ defineExpose({
     setFormData,
     getDetail
 })
-</script>
+</script> -->
diff --git a/src/views/refundbidDeposit/edit.vue b/src/views/refundbidDeposit/edit.vue
index 755cb94..e097dd9 100644
--- a/src/views/refundbidDeposit/edit.vue
+++ b/src/views/refundbidDeposit/edit.vue
@@ -44,12 +44,12 @@
 
                     <el-col :span="8">
                         <el-form-item label="退款金额" prop="refund_amount">
-                            <el-input v-model="formData.refund_amount" clearable readonly placeholder="请输入退款金额" @input="amountinput" />
+                            <el-input v-model="formData.refund_amount" clearable placeholder="请输入退款金额" @input="amountinput" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="金额大写" prop="refund_amount_daxie">
-                            <el-input v-model="refund_amount_daxie" readonly clearable disabled placeholder="系统自动填写" />
+                            <el-input v-model="refund_amount_daxie" clearable disabled placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>