From 3ff14aa26fc9695a04f6535ed4abcc324e627409 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 13 Apr 2024 16:29:07 +0800
Subject: [PATCH] add

---
 src/api/marketing_bid_evaluation.ts           |  38 ++-
 src/api/marketing_bid_result.ts               |  33 +-
 src/api/marketing_contract_change.ts          |  41 +++
 src/api/marketing_reflux_contract.ts          |  15 +
 .../dialogTable/dialogTableConfig.ts          | 114 ++++++-
 src/components/dialogTable/index.vue          |   8 +-
 src/views/marketing_bid_evaluation/detail.vue |   3 -
 src/views/marketing_bid_evaluation/edit.vue   |  70 ++--
 src/views/marketing_bid_evaluation/index.vue  |  69 +++-
 src/views/marketing_bid_info/detail.js        | 146 ++++++++
 src/views/marketing_bid_info/edit.vue         | 316 ++++++++++++++----
 src/views/marketing_bid_info/index.vue        | 113 ++++---
 src/views/marketing_bid_result/detail.js      | 103 ++++++
 src/views/marketing_bid_result/edit.vue       | 271 ++++++++++++---
 src/views/marketing_bid_result/index.vue      |  79 ++---
 src/views/marketing_competitor/detail.js      |  56 ++++
 src/views/marketing_competitor/edit.vue       |  65 ++--
 src/views/marketing_competitor/index.vue      |  71 ++--
 src/views/marketing_reflux_contract/index.vue | 118 +++++++
 src/views/procurement_contract/index.vue      |   2 +-
 .../procurement_contract_detail/index.vue     |   3 +-
 21 files changed, 1406 insertions(+), 328 deletions(-)
 create mode 100644 src/api/marketing_contract_change.ts
 create mode 100644 src/api/marketing_reflux_contract.ts
 create mode 100644 src/views/marketing_bid_info/detail.js
 create mode 100644 src/views/marketing_bid_result/detail.js
 create mode 100644 src/views/marketing_competitor/detail.js
 create mode 100644 src/views/marketing_reflux_contract/index.vue

diff --git a/src/api/marketing_bid_evaluation.ts b/src/api/marketing_bid_evaluation.ts
index 7263967..7f700be 100644
--- a/src/api/marketing_bid_evaluation.ts
+++ b/src/api/marketing_bid_evaluation.ts
@@ -1,26 +1,50 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 市场经营--投标管理--投标评审列表
 export function apiMarketingBidEvaluationLists(params: any) {
-    return request.get({ url: '/marketing.marketing_bid_evaluation/lists', params })
+  return request.get({
+    url: "/marketing.marketing_bid_evaluation/lists",
+    params,
+  });
 }
 
 // 添加市场经营--投标管理--投标评审
 export function apiMarketingBidEvaluationAdd(params: any) {
-    return request.post({ url: '/marketing.marketing_bid_evaluation/add', params })
+  return request.post({
+    url: "/marketing.marketing_bid_evaluation/add",
+    params,
+  });
 }
 
 // 编辑市场经营--投标管理--投标评审
 export function apiMarketingBidEvaluationEdit(params: any) {
-    return request.post({ url: '/marketing.marketing_bid_evaluation/edit', params })
+  return request.post({
+    url: "/marketing.marketing_bid_evaluation/edit",
+    params,
+  });
 }
 
 // 删除市场经营--投标管理--投标评审
 export function apiMarketingBidEvaluationDelete(params: any) {
-    return request.post({ url: '/marketing.marketing_bid_evaluation/delete', params })
+  return request.post({
+    url: "/marketing.marketing_bid_evaluation/delete",
+    params,
+  });
 }
 
 // 市场经营--投标管理--投标评审详情
 export function apiMarketingBidEvaluationDetail(params: any) {
-    return request.get({ url: '/marketing.marketing_bid_evaluation/detail', params })
-}
\ No newline at end of file
+  return request.get({
+    url: "/marketing.marketing_bid_evaluation/detail",
+    params,
+  });
+}
+
+// 报名登记
+
+export function apiMarketingBidEvaluationReg(params: any) {
+  return request.post({
+    url: "/marketing.marketing_bid_evaluation/reg",
+    params,
+  });
+}
diff --git a/src/api/marketing_bid_result.ts b/src/api/marketing_bid_result.ts
index 314ec74..045a9f3 100644
--- a/src/api/marketing_bid_result.ts
+++ b/src/api/marketing_bid_result.ts
@@ -1,26 +1,45 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 市场经营--投标管理--投标结果列表
 export function apiMarketingBidResultLists(params: any) {
-    return request.get({ url: '/marketing.marketing_bid_result/lists', params })
+  return request.get({ url: "/marketing.marketing_bid_result/lists", params });
 }
 
 // 添加市场经营--投标管理--投标结果
 export function apiMarketingBidResultAdd(params: any) {
-    return request.post({ url: '/marketing.marketing_bid_result/add', params })
+  return request.post({ url: "/marketing.marketing_bid_result/add", params });
 }
 
 // 编辑市场经营--投标管理--投标结果
 export function apiMarketingBidResultEdit(params: any) {
-    return request.post({ url: '/marketing.marketing_bid_result/edit', params })
+  return request.post({ url: "/marketing.marketing_bid_result/edit", params });
 }
 
 // 删除市场经营--投标管理--投标结果
 export function apiMarketingBidResultDelete(params: any) {
-    return request.post({ url: '/marketing.marketing_bid_result/delete', params })
+  return request.post({
+    url: "/marketing.marketing_bid_result/delete",
+    params,
+  });
 }
 
 // 市场经营--投标管理--投标结果详情
 export function apiMarketingBidResultDetail(params: any) {
-    return request.get({ url: '/marketing.marketing_bid_result/detail', params })
-}
\ No newline at end of file
+  return request.get({ url: "/marketing.marketing_bid_result/detail", params });
+}
+
+// 市场经营--投标管理--投标结果列表
+export function apiMarketingBidResultDetailLists(params: any) {
+  return request.get({
+    url: "/marketing.marketing_bid_result_detail/lists",
+    params,
+  });
+}
+
+// 删除市场经营--投标管理--投标结果
+export function apiMarketingBidResultDetailDelete(params: any) {
+  return request.post({
+    url: "/marketing.marketing_bid_result_detail/delete",
+    params,
+  });
+}
diff --git a/src/api/marketing_contract_change.ts b/src/api/marketing_contract_change.ts
new file mode 100644
index 0000000..ccc2489
--- /dev/null
+++ b/src/api/marketing_contract_change.ts
@@ -0,0 +1,41 @@
+import request from "@/utils/request";
+
+// 市场经营--投标管理--竞争对手列表
+export function apiMarketingContractChangeLists(params: any) {
+  return request.get({
+    url: "/marketing.marketing_contract_change/lists",
+    params,
+  });
+}
+
+// 添加市场经营--投标管理--竞争对手
+export function apiMarketingContractChangeAdd(params: any) {
+  return request.post({
+    url: "/marketing.marketing_contract_change/add",
+    params,
+  });
+}
+
+// 编辑市场经营--投标管理--竞争对手
+export function apiMarketingContractChangeEdit(params: any) {
+  return request.post({
+    url: "/marketing.marketing_contract_change/edit",
+    params,
+  });
+}
+
+// 删除市场经营--投标管理--竞争对手
+export function apiMarketingContractChangeDelete(params: any) {
+  return request.post({
+    url: "/marketing.marketing_contract_change/delete",
+    params,
+  });
+}
+
+// 市场经营--投标管理--竞争对手详情
+export function apiMarketingContractChangeDetail(params: any) {
+  return request.get({
+    url: "/marketing.marketing_contract_change/detail",
+    params,
+  });
+}
diff --git a/src/api/marketing_reflux_contract.ts b/src/api/marketing_reflux_contract.ts
new file mode 100644
index 0000000..a6ccbc4
--- /dev/null
+++ b/src/api/marketing_reflux_contract.ts
@@ -0,0 +1,15 @@
+import request from "@/utils/request";
+
+export function apiMarketingRefluxContractLists(params: any) {
+  return request.get({
+    url: "/marketing.marketing_contract_reflux/lists",
+    params,
+  });
+}
+
+export function apiMarketingRefluxContractReflux(params: any) {
+  return request.post({
+    url: "/marketing.marketing_contract_reflux/reflux",
+    params,
+  });
+}
diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts
index 827b6b0..d35fe38 100644
--- a/src/components/dialogTable/dialogTableConfig.ts
+++ b/src/components/dialogTable/dialogTableConfig.ts
@@ -921,12 +921,18 @@ export const marketing_business_opportunity: Iconfig = {
   fetchFn: apiMarketingBusinessOpportunityLists,
   serchList: [
     {
-      label: "项目名称",
-      value: "project_name",
+      label: "招标方式",
+      value: "bid_type",
+      select: "bidding_method",
     },
     {
-      label: "项目编号",
-      value: "project_code",
+      label: "投标性质",
+      value: "bid__nature",
+      select: "bid_nature",
+    },
+    {
+      label: "投标项目编号",
+      value: "bid_code",
     },
   ],
   tableList: [
@@ -943,3 +949,103 @@ export const marketing_business_opportunity: Iconfig = {
     { approve_status_text: "流程状态" },
   ],
 };
+
+import { apiMarketingBidEvaluationLists } from "@/api/marketing_bid_evaluation";
+
+export const marketing_bid_evaluation: Iconfig = {
+  fetchFn: apiMarketingBidEvaluationLists,
+  dictData: "bidding_method,bid_nature",
+
+  serchList: [
+    {
+      label: "招标方式",
+      value: "bid_type",
+      select: "bidding_method",
+    },
+    {
+      label: "投标性质",
+      value: "bid__nature",
+      select: "bid_nature",
+    },
+    {
+      label: "投标项目编号",
+      value: "bid_code",
+    },
+  ],
+  tableList: [
+    { "business_opportunity.project_name": "业务机会" },
+    { "business_opportunity.project_name": "项目名称" },
+    { "business_opportunity.construct_company_name": "建设单位" },
+    { "business_opportunity.total_investment": "工程总投资" },
+    { bid_date: "投标日期" },
+    { "business_opportunity.status_text": "投标状态" },
+    { "business_opportunity.jianan_investment": "建安投资额" },
+    { "business_opportunity.approve_status_text": "流程状态" },
+    { end_date: "报名截止日期" },
+  ],
+};
+
+import { apiMarketingBidInfoLists } from "@/api/marketing_bid_info";
+
+export const marketing_bid_info: Iconfig = {
+  fetchFn: apiMarketingBidInfoLists,
+  serchList: [
+    {
+      label: "建设单位",
+      value: "construct_company",
+    },
+    {
+      label: "拟派总监/总监",
+      value: "general_manager",
+    },
+    {
+      label: "投标负责人",
+      value: "bid_head",
+    },
+  ],
+  tableList: [
+    { "business_opportunity.project_name": "项目名称" },
+    { margin_end_date: "保证金递交截止日期" },
+    { expected_return_date: "预计归还日期" },
+    { service_charge: "中标服务费" },
+    { publish_website: "发布网址" },
+    { general_manager_name: "拟派总监/经理" },
+    { bid_quotation: "拟投标报价" },
+    { bid_rate: "拟投标费率" },
+    { bid_head_name: "投标负责人" },
+    { technology_head_name: "技术标负责人" },
+    { business_head_name: "商务标负责人" },
+    { other_user_name: "其他拟派人员" },
+    { bid_status_text: "状态" },
+  ],
+};
+
+import { apiMarketingCompetitorLists } from "@/api/marketing_competitor";
+
+export const marketing_competitor: Iconfig = {
+  fetchFn: apiMarketingCompetitorLists,
+  dictData: "company_type",
+  serchList: [
+    {
+      label: "单位名称",
+      value: "company_name",
+    },
+    {
+      label: "企业类型",
+      value: "company_type",
+      select: "company_type",
+    },
+    {
+      label: "法人代表",
+      value: "legal_representative",
+    },
+  ],
+  tableList: [
+    { company_name: "单位名称" },
+    { company_type_text: "企业类型" },
+    { legal_representative: "法人代表" },
+    { telephone: "联系电话" },
+    { address: "单位地址" },
+    { qualifications: "企业资质" },
+  ],
+};
diff --git a/src/components/dialogTable/index.vue b/src/components/dialogTable/index.vue
index 03e3ff6..355ef97 100644
--- a/src/components/dialogTable/index.vue
+++ b/src/components/dialogTable/index.vue
@@ -24,10 +24,12 @@
                     @selection-change="handleSelectionChange">
 
                     <el-table-column type="selection" width="55" v-if="multipleChoice" />
-                    <el-table-column :label="item[(Object.keys(item))[0]]" :prop="(Object.keys(item))[0]"
-                        show-overflow-tooltip v-for="item in config.tableList ">
+                    <el-table-column :label="item[(Object.keys(item))[0]]" show-overflow-tooltip
+                        v-for="item in config.tableList ">
                         <template #default="{ row }">
-                            {{ row[(Object.keys(item))[0]] }}
+                            {{ (Object.keys(item))[0].includes('.') ?
+                                row[(Object.keys(item))[0].split(".")[0]][(Object.keys(item))[0].split(".")[1]] :
+                                row[(Object.keys(item))[0]] }}
                         </template>
                     </el-table-column>
                 </el-table>
diff --git a/src/views/marketing_bid_evaluation/detail.vue b/src/views/marketing_bid_evaluation/detail.vue
index a1361a4..c596164 100644
--- a/src/views/marketing_bid_evaluation/detail.vue
+++ b/src/views/marketing_bid_evaluation/detail.vue
@@ -14,9 +14,6 @@
                     <el-descriptions-item label="工程概况" label-align="left" align="left" label-class-name="my-label">
                         {{ formData.business_opportunity.project_overview }}
                     </el-descriptions-item>
-                    <!-- <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
-                        {{ formData.remark }}
-                    </el-descriptions-item> -->
                     <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                         <annexLink :annex="formData.annex"></annexLink>
                     </el-descriptions-item>
diff --git a/src/views/marketing_bid_evaluation/edit.vue b/src/views/marketing_bid_evaluation/edit.vue
index 3461e12..ba22842 100644
--- a/src/views/marketing_bid_evaluation/edit.vue
+++ b/src/views/marketing_bid_evaluation/edit.vue
@@ -90,6 +90,39 @@
                                     placeholder="系统自动获取" disabled />
                             </el-form-item>
                         </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="负责人">
+                                <el-input v-model="formData.business_opportunity.head_name" clearable placeholder="点击选择负责人"
+                                    readonly @click="userclick('head')" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="负责部门">
+                                <el-select disabled v-model="formData.business_opportunity.dept" placeholder="请选择部门"
+                                    class="flex-1">
+                                    <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="分管领导">
+                                <el-input disabled v-model="formData.business_opportunity.leader_name" clearable
+                                    placeholder="请输入分管领导" @click="userclick('leader')" readonly />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="联系人信息">
+                                <el-input disabled v-model="formData.business_opportunity.contacts" clearable
+                                    placeholder="请输入联系人信息" />
+                            </el-form-item>
+                        </el-col>
+
+                    </el-row>
+                </el-card>
+                <el-card>
+                    <template #header>评审信息</template>
+                    <el-row>
                         <el-col :span="8">
                             <el-form-item label="招标方式" prop="bid_type">
                                 <el-select class=' flex-1' v-model="formData.bid_type">
@@ -180,37 +213,7 @@
                         </el-col>
                     </el-row>
                 </el-card>
-                <el-card>
-                    <template #header>跟进信息</template>
-                    <el-row>
-                        <el-col :span="8">
-                            <el-form-item label="负责人">
-                                <el-input v-model="formData.business_opportunity.head_name" clearable placeholder="点击选择负责人"
-                                    readonly @click="userclick('head')" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="负责部门">
-                                <el-select v-model="formData.business_opportunity.dept" placeholder="请选择部门" class="flex-1">
-                                    <el-option :label="item.name" :value="item.id" v-for="item in deptList">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="分管领导">
-                                <el-input v-model="formData.business_opportunity.leader_name" clearable
-                                    placeholder="请输入分管领导" @click="userclick('leader')" readonly />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="联系人信息">
-                                <el-input v-model="formData.business_opportunity.contacts" clearable
-                                    placeholder="请输入联系人信息" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
+
                 <el-card>
                     <template #header>附件</template>
                     <el-col :span="24">
@@ -221,9 +224,6 @@
                 </el-card>
             </el-form>
             <el-dialog v-model="showDialog" title="选择建设单位" width="70%">
-                <!-- <dialogTable :config="marketing_business_opportunity" @customEvent="customEvent"
-                    :query="{ status: 0, approve_check_status: 2 }">
-                </dialogTable> -->
                 <dialogTable :config="marketing_business_opportunity" @customEvent="customEvent" :query="{ status: 0 }">
                 </dialogTable>
             </el-dialog>
@@ -293,8 +293,6 @@ const customEvent = (e) => {
     formData.business_opportunity_id = e.id
     formData.business_opportunity_name = e.project_name
     formData.business_opportunity = e
-    // const { head_name, dept_name, leader_name, project_name, contacts, project_code, construct_company_name, management_company, industry_nature_text, business_nature_text, const_area_text, project_address, info_sources_text, fund_sources_text, total_investment, jianan_investment, project_overview } = e
-    // Object.assign(formData, { head_name, dept_name, leader_name, project_name, contacts, project_name, project_code, construct_company_name, management_company, industry_nature_text, business_nature_text, const_area_text, project_address, info_sources_text, fund_sources_text, total_investment, jianan_investment, project_overview })
     showDialog.value = false
 }
 
diff --git a/src/views/marketing_bid_evaluation/index.vue b/src/views/marketing_bid_evaluation/index.vue
index b0fc60b..bb76950 100644
--- a/src/views/marketing_bid_evaluation/index.vue
+++ b/src/views/marketing_bid_evaluation/index.vue
@@ -49,7 +49,7 @@
                     <el-table-column label="建安投资额" prop="business_opportunity.jianan_investment" show-overflow-tooltip />
                     <el-table-column label="流程状态" prop="business_opportunity.approve_status_text" show-overflow-tooltip />
                     <el-table-column label="报名截止日期" prop="end_date" show-overflow-tooltip />
-                    <el-table-column label="操作" width="200" fixed="right">
+                    <el-table-column label="操作" width="250" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['marketing.marketing_bid_evaluation/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -63,8 +63,8 @@
                                 @click="handleDetail(row)">
                                 详情
                             </el-button>
-                            <el-button v-perms="['marketing.marketing_bid_evaluation/detail']" link
-                                @click="handleDetail(row)">
+                            <el-button v-perms="['marketing.marketing_bid_evaluation/detail']" link type="primary"
+                                @click="showDialog = true; regForm.id = row.id; regForm.project_name = row.business_opportunity.project_name">
                                 报名登记
                             </el-button>
 
@@ -81,13 +81,56 @@
             :deptList="deptList" />
         <detail-popup v-if="showDetail" ref="detailRef" :dict-data="dictData" @close="showDetail = false" />
 
+        <div v-if="showDialog">
+            <el-dialog v-model="showDialog" title="报名信息" width="550px" close-on-click-modal>
+                <el-form :model="regForm">
+
+                    <el-form-item label="项目名称" prop="project_name">
+                        <el-input v-model="regForm.project_name" disabled></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="报名时间" prop="reg_date">
+                        <el-date-picker class="flex-1 !flex" v-model="regForm.reg_date" clearable type="date"
+                            value-format="YYYY-MM-DD" placeholder="选择报名时间">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="资审情况" prop="review_status">
+                        <el-select v-model="regForm.review_status" class=" flex-1">
+                            <el-option label="通过" :value="0"></el-option>
+                            <el-option label="不通过" :value="1"></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="报名结果" prop="reg_result">
+                        <el-select v-model="regForm.reg_result" class="flex-1">
+                            <el-option label="通过" :value="0"></el-option>
+                            <el-option label="不通过" :value="1"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+
+                <template #footer>
+                    <div class="dialog-footer">
+                        <el-button @click="showDialog = false">Cancel</el-button>
+                        <el-button type="primary" @click="handleRegister">
+                            Confirm
+                        </el-button>
+                    </div>
+                </template>
+
+            </el-dialog>
+
+        </div>
+
+
     </div>
 </template>
 
 <script lang="ts" setup name="marketingBidEvaluationLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiMarketingBidEvaluationLists, apiMarketingBidEvaluationDelete, apiMarketingBidEvaluationDetail } from '@/api/marketing_bid_evaluation'
+import { apiMarketingBidEvaluationLists, apiMarketingBidEvaluationDelete, apiMarketingBidEvaluationDetail, apiMarketingBidEvaluationReg } from '@/api/marketing_bid_evaluation'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import { useRoute } from "vue-router"
@@ -156,6 +199,24 @@ const handleDetail = async (data: any) => {
     detailRef.value?.setFormData(res)
 }
 
+// 报名
+const showDialog = ref(false)
+const regForm = reactive({
+    project_name: "",
+    id: 0,
+    reg_date: "",
+    review_status: 0,
+    reg_result: 0
+
+})
+
+const handleRegister = async () => {
+    await apiMarketingBidEvaluationReg({ ...regForm })
+    getLists()
+    showDialog.value = false
+
+}
+
 const deptList = ref([])
 const getDeptList = async () => {
     let res = await deptLists()
diff --git a/src/views/marketing_bid_info/detail.js b/src/views/marketing_bid_info/detail.js
new file mode 100644
index 0000000..fc8b3b3
--- /dev/null
+++ b/src/views/marketing_bid_info/detail.js
@@ -0,0 +1,146 @@
+const detailConfig = {
+    title: "财务管理--分支机构备案",
+    config: [
+        {
+            label: "投标审查",
+            value: "business_opportunity.project_name"
+        },
+        {
+            label: "项目名称",
+            value: "business_opportunity.project_name"
+        },
+        {
+            label: "项目前期编号",
+            value: "business_opportunity.project_code"
+        },
+        {
+            label: "建设单位",
+            value: "business_opportunity.construct_company_name"
+        },
+        {
+            label: "建设管理单位",
+            value: "business_opportunity.management_company",
+
+        },
+        {
+            label: "行业性质",
+            value: "business_opportunity.business_nature_text"
+        },
+        {
+            label: "业务性质",
+            value: "business_opportunity.business_nature_text"
+        },
+        {
+            label: "建设区域",
+            value: "business_opportunity.const_area_text"
+        },
+        {
+            label: "项目地点",
+            value: "business_opportunity.project_address"
+        },
+        {
+            label: "消息来源",
+            value: "business_opportunity.info_sources_text"
+        },
+        {
+            label: "资金来源",
+            value: "business_opportunity.fund_sources_text"
+        },
+        {
+            label: "工程总投资",
+            value: "business_opportunity.total_investment"
+        },
+        {
+            label: "建安投资额",
+            value: "business_opportunity.jianan_investment"
+        },
+        {
+            label: "工程概况",
+            value: "business_opportunity.project_overview"
+        },
+        {
+            label: "负责人",
+            value: "business_opportunity.head_name"
+        },
+        {
+            label: "负责部门",
+            value: "business_opportunity.dept_name"
+        },
+        {
+            label: "分管领导",
+            value: "business_opportunity.leader_name"
+        },
+        {
+            label: "联系人信息",
+            value: "business_opportunity.contacts"
+        },
+        {
+            label: "保证金递交截止日期",
+            value: "margin_end_date"
+        },
+        {
+            label: "预计归还日期",
+            value: "expected_return_date"
+        },
+        {
+            label: "中标服务费",
+            value: "service_charge"
+        },
+        {
+            label: "发布网址",
+            value: "publish_website"
+        },
+        {
+            label: "拟派总监/经理",
+            value: "general_manager_name"
+        },
+        {
+            label: "拟投标报价",
+            value: "bid_quotation"
+        },
+
+        {
+            label: "拟投标费率",
+            value: "bid_rate"
+        }, {
+            label: "投标负责人",
+            value: "bid_head_name"
+        },
+        {
+            label: "技术标负责人",
+            value: "technology_head_name"
+        },
+        {
+            label: "技术标负责人",
+            value: "technology_head_name"
+        },
+        {
+            label: "商务标负责人",
+            value: "business_head_name"
+        },
+        {
+            label: "其他拟派人员",
+            value: "other_user_name"
+        },
+        {
+            label: "状态",
+            value: "bid_status_text"
+        },
+
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+
+
+    ],
+
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/marketing_bid_info/edit.vue b/src/views/marketing_bid_info/edit.vue
index 2015f5b..615d32d 100644
--- a/src/views/marketing_bid_info/edit.vue
+++ b/src/views/marketing_bid_info/edit.vue
@@ -1,60 +1,222 @@
 <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_evaluation_id">
-                    <el-input v-model="formData.bid_evaluation_id" clearable placeholder="请输入投标审查id" />
-                </el-form-item>
-                <el-form-item label="保证金递交截止日期" prop="margin_end_date">
-                    <el-input v-model="formData.margin_end_date" clearable placeholder="请输入保证金递交截止日期" />
-                </el-form-item>
-                <el-form-item label="预计归还日期" prop="expected_return_date">
-                    <el-input v-model="formData.expected_return_date" clearable placeholder="请输入预计归还日期" />
-                </el-form-item>
-                <el-form-item label="中标服务费" prop="service_charge">
-                    <el-input v-model="formData.service_charge" clearable placeholder="请输入中标服务费" />
-                </el-form-item>
-                <el-form-item label="发布网址" prop="publish_website">
-                    <el-input v-model="formData.publish_website" clearable placeholder="请输入发布网址" />
-                </el-form-item>
-                <el-form-item label="拟派总监/经理" prop="general_manager">
-                    <el-input v-model="formData.general_manager" clearable placeholder="请输入拟派总监/经理" />
-                </el-form-item>
-                <el-form-item label="拟投标报价" prop="bid_quotation">
-                    <el-input v-model="formData.bid_quotation" clearable placeholder="请输入拟投标报价" />
-                </el-form-item>
-                <el-form-item label="拟投标费率" prop="bid_rate">
-                    <el-input v-model="formData.bid_rate" clearable placeholder="请输入拟投标费率" />
-                </el-form-item>
-                <el-form-item label="投标负责人" prop="bid_head">
-                    <el-input v-model="formData.bid_head" clearable placeholder="请输入投标负责人" />
-                </el-form-item>
-                <el-form-item label="技术标负责人" prop="technology_head">
-                    <el-input v-model="formData.technology_head" clearable placeholder="请输入技术标负责人" />
-                </el-form-item>
-                <el-form-item label="商务标负责人" prop="business_head">
-                    <el-input v-model="formData.business_head" clearable placeholder="请输入商务标负责人" />
-                </el-form-item>
-                <el-form-item label="其他拟派人员" prop="other_user">
-                    <el-input v-model="formData.other_user" clearable placeholder="请输入其他拟派人员" />
-                </el-form-item>
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
-                </el-form-item>
-                <el-form-item label="附件" prop="annex">
-                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                </el-form-item>
-                <el-form-item label="状态 0-未开标 1-已中标 2-未中标" prop="bid_status">
-                    <el-input v-model="formData.bid_status" clearable placeholder="请输入状态 0-未开标 1-已中标 2-未中标" />
-                </el-form-item>
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="180px" :rules="formRules">
+                <el-card>
+                    <template #header>基本信息</template>
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="投标审查">
+                                <el-input v-model="formData.business_opportunity.project_name" clearable
+                                    placeholder="点击选择投标审查" @click="showDialog = true" readonly />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="项目名称">
+                                <el-input v-model="formData.business_opportunity.project_name" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="项目前期编号">
+                                <el-input v-model="formData.business_opportunity.project_code" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="建设单位">
+                                <el-input v-model="formData.business_opportunity.construct_company_name" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="建设管理单位">
+                                <el-input v-model="formData.business_opportunity.management_company" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="行业性质">
+                                <el-input v-model="formData.business_opportunity.industry_nature_text" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="业务性质">
+                                <el-input v-model="formData.business_opportunity.business_nature_text" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="建设区域">
+                                <el-input v-model="formData.business_opportunity.const_area_text" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="项目地点">
+                                <el-input v-model="formData.business_opportunity.project_address" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="消息来源">
+                                <el-input v-model="formData.business_opportunity.info_sources_text" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="资金来源">
+                                <el-input v-model="formData.business_opportunity.fund_sources_text" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="工程总投资">
+                                <el-input v-model="formData.business_opportunity.total_investment" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="建安投资额">
+                                <el-input v-model="formData.business_opportunity.jianan_investment" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="工程概况">
+                                <el-input v-model="formData.business_opportunity.project_overview" clearable
+                                    placeholder="系统自动获取" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="负责人">
+                                <el-input v-model="formData.business_opportunity.head_name" clearable placeholder="点击选择负责人"
+                                    readonly @click="userclick('head')" disabled />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="负责部门">
+                                <el-select disabled v-model="formData.business_opportunity.dept" placeholder="请选择部门"
+                                    class="flex-1">
+                                    <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="分管领导">
+                                <el-input disabled v-model="formData.business_opportunity.leader_name" clearable
+                                    placeholder="请输入分管领导" @click="userclick('leader')" readonly />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="联系人信息">
+                                <el-input disabled v-model="formData.business_opportunity.contacts" clearable
+                                    placeholder="请输入联系人信息" />
+                            </el-form-item>
+                        </el-col>
+
+                    </el-row>
+                </el-card>
+                <el-card>
+
+                    <template #header>投标信息</template>
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="保证金递交截止日期">
+                                <el-date-picker class="flex-1 !flex" v-model="formData.margin_end_date" clearable
+                                    type="date" value-format="YYYY-MM-DD" placeholder="选择保证金递交截止日期">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="预计归还日期">
+                                <el-date-picker class="flex-1 !flex" v-model="formData.expected_return_date" clearable
+                                    type="date" value-format="YYYY-MM-DD" placeholder="选择预计归还日期">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="中标服务费">
+                                <el-input v-model="formData.service_charge" clearable placeholder="请输入中标服务费"
+                                    type="number" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="发布网址">
+                                <el-input v-model="formData.publish_website" clearable placeholder="请输入发布网址" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="拟派总监/经理" prop="general_manager">
+                                <el-input v-model="formData.general_manager_name" clearable placeholder="请输入拟派总监/经理"
+                                    @click="userclick('general_manager')" readonly />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="拟投标报价">
+                                <el-input v-model="formData.bid_quotation" clearable placeholder="请输入拟投标报价" type="number" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="拟投标费率">
+                                <el-input v-model="formData.bid_rate" clearable placeholder="请输入拟投标费率" type="number" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="投标负责人">
+                                <el-input v-model="formData.bid_head_name" clearable placeholder="点击选择投标负责人" readonly
+                                    @click="userclick('bid_head')" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="技术标负责人">
+                                <el-input v-model="formData.technology_head_name" clearable placeholder="点击选择技术标负责人"
+                                    readonly @click="userclick('technology_head')" />
+
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="商务标负责人">
+                                <el-input v-model="formData.business_head_name" clearable placeholder="点击选择商务标负责人" readonly
+                                    @click="userclick('business_head')" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="其他拟派人员">
+                                <el-input v-model="formData.other_user_name" clearable placeholder="点击选择其他拟派人员" readonly
+                                    @click="userclick('other_user')" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="备注">
+                                <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+
+                <el-card>
+                    <template #header>
+                        附件
+                    </template>
+                    <el-col :span="24">
+                        <el-form-item label-width="0">
+                            <uploadAnnex :formData="formData"></uploadAnnex>
+                        </el-form-item>
+                    </el-col>
+                </el-card>
+
             </el-form>
+            <el-dialog v-model="showDialog" title="选择建设单位" width="70%">
+                <dialogTable :config="marketing_bid_evaluation" @customEvent="customEvent">
+                </dialogTable>
+            </el-dialog>
+            <div v-if="showDialog1">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
         </popup>
     </div>
 </template>
@@ -65,6 +227,7 @@ import Popup from '@/components/popup/index.vue'
 import { apiMarketingBidInfoAdd, apiMarketingBidInfoEdit, apiMarketingBidInfoDetail } from '@/api/marketing_bid_info'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+import { marketing_bid_evaluation } from "@/components/dialogTable/dialogTableConfig";
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -75,7 +238,9 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const personnel = ref(null)
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -91,17 +256,45 @@ const formData = reactive({
     service_charge: '',
     publish_website: '',
     general_manager: '',
+    general_manager_name: '',
     bid_quotation: '',
     bid_rate: '',
     bid_head: '',
+    bid_head_name: "",
     technology_head: '',
+    technology_head_name: '',
     business_head: '',
+    business_head_name: '',
     other_user: '',
+    other_user_name: '',
     remark: '',
-    annex: '',
+    annex: [],
     bid_status: '',
+    business_opportunity: {}
+
 })
 
+const customEvent = (e) => {
+    formData.bid_evaluation_id = e.id
+    formData.business_opportunity = e.business_opportunity
+    showDialog.value = false
+}
+
+let val: string;
+const userclick = async (value: string) => {
+    val = value
+    showDialog1.value = true
+    await nextTick()
+    personnel.value.open()
+
+}
+
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name;
+    showDialog1.value = false
+}
 
 // 表单验证
 const formRules = reactive<any>({
@@ -130,7 +323,7 @@ const formRules = reactive<any>({
         message: '请输入发布网址',
         trigger: ['blur']
     }],
-    general_manager: [{
+    general_manager_name: [{
         required: true,
         message: '请输入拟派总监/经理',
         trigger: ['blur']
@@ -186,8 +379,7 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -201,9 +393,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiMarketingBidInfoEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiMarketingBidInfoEdit(data)
         : await apiMarketingBidInfoAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/marketing_bid_info/index.vue b/src/views/marketing_bid_info/index.vue
index 91a4928..89c9b00 100644
--- a/src/views/marketing_bid_info/index.vue
+++ b/src/views/marketing_bid_info/index.vue
@@ -1,13 +1,9 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="投标审查id" prop="bid_evaluation_id">
-                    <el-input class="w-[280px]" v-model="queryParams.bid_evaluation_id" clearable placeholder="请输入投标审查id" />
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="建设单位" prop="construct_company">
+                    <el-input class="w-[280px]" v-model="queryParams.construct_company" clearable placeholder="请输入建设单位" />
                 </el-form-item>
                 <el-form-item label="拟派总监/经理" prop="general_manager">
                     <el-input class="w-[280px]" v-model="queryParams.general_manager" clearable placeholder="请输入拟派总监/经理" />
@@ -15,8 +11,15 @@
                 <el-form-item label="投标负责人" prop="bid_head">
                     <el-input class="w-[280px]" v-model="queryParams.bid_head" clearable placeholder="请输入投标负责人" />
                 </el-form-item>
+                <el-form-item label="状态" prop="bid_status">
+                    <el-select v-model="queryParams.bid_status">
+                        <el-option label="未开标" :value="0"></el-option>
+                        <el-option label="已中标" :value="1"></el-option>
+                        <el-option label="未中标" :value="2"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button type=" primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
                 </el-form-item>
             </el-form>
@@ -28,49 +31,53 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['marketing.marketing_bid_info/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['marketing.marketing_bid_info/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="投标审查id" prop="bid_evaluation_id" show-overflow-tooltip />
-                    <el-table-column label="保证金递交截止日期" prop="margin_end_date" show-overflow-tooltip />
-                    <el-table-column label="预计归还日期" prop="expected_return_date" show-overflow-tooltip />
-                    <el-table-column label="中标服务费" prop="service_charge" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="项目名称" prop="business_opportunity.project_name"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="项目编号" prop="business_opportunity.project_code"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="保证金递交截止日期" prop="margin_end_date"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="预计归还日期" prop="expected_return_date"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="中标服务费" prop="service_charge"
+                        show-overflow-tooltip />
                     <el-table-column label="发布网址" prop="publish_website" show-overflow-tooltip />
-                    <el-table-column label="拟派总监/经理" prop="general_manager" show-overflow-tooltip />
-                    <el-table-column label="拟投标报价" prop="bid_quotation" show-overflow-tooltip />
-                    <el-table-column label="拟投标费率" prop="bid_rate" show-overflow-tooltip />
-                    <el-table-column label="投标负责人" prop="bid_head" show-overflow-tooltip />
-                    <el-table-column label="技术标负责人" prop="technology_head" show-overflow-tooltip />
-                    <el-table-column label="商务标负责人" prop="business_head" show-overflow-tooltip />
-                    <el-table-column label="其他拟派人员" prop="other_user" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="拟派总监/经理" prop="general_manager_name"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="拟投标报价" prop="bid_quotation"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="拟投标费率" prop="bid_rate" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="投标负责人" prop="bid_head_name"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="技术标负责人" prop="technology_head_name"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="商务标负责人" prop="business_head_name"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="其他拟派人员" prop="other_user_name"
+                        show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
-                    <el-table-column label="状态 0-未开标 1-已中标 2-未中标" prop="bid_status" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column :render-header="pager.calcWidth" label="状态" prop="bid_status_text"
+                        show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['marketing.marketing_bid_info/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['marketing.marketing_bid_info/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['marketing.marketing_bid_info/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['marketing.marketing_bid_info/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['marketing.marketing_bid_info/detail']" link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -80,27 +87,32 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
+
     </div>
 </template>
 
 <script lang="ts" setup name="marketingBidInfoLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiMarketingBidInfoLists, apiMarketingBidInfoDelete } from '@/api/marketing_bid_info'
+import { apiMarketingBidInfoLists, apiMarketingBidInfoDelete, apiMarketingBidInfoDetail } from '@/api/marketing_bid_info'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
-
+const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    bid_evaluation_id: '',
-    general_manager: '',
-    bid_head: ''
+    construct_company: '',
+    bid_head: '',
+    queryParams: "",
+    bid_status: ""
 })
 
 // 选中数据
@@ -129,10 +141,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiMarketingBidInfoDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
@@ -142,6 +155,16 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiMarketingBidInfoDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 getLists()
 </script>
 
diff --git a/src/views/marketing_bid_result/detail.js b/src/views/marketing_bid_result/detail.js
new file mode 100644
index 0000000..bd25dd5
--- /dev/null
+++ b/src/views/marketing_bid_result/detail.js
@@ -0,0 +1,103 @@
+import { apiMarketingBidResultDetailLists } from '@/api/marketing_bid_result'
+
+const detailConfig = {
+    title: "市场经营--投标管理--竞争对手",
+    config: [
+        {
+            label: "投标信息",
+            value: "business_opportunity.project_name"
+        },
+        {
+            label: "投标结果",
+            value: "bid_result_text"
+        },
+        {
+            label: "中标通知书编号",
+            value: "bid_result_code"
+        },
+        {
+            label: "中标报价",
+            value: "quotation"
+        },
+        {
+            label: "开标日期",
+            value: "bid_open_date"
+        },
+        {
+            label: "开标地点",
+            value: "bid_open_address"
+        },
+        {
+            label: "我方报价",
+            value: "our_quotation"
+        },
+        {
+            label: "中标费率",
+            value: "rate",
+        },
+        {
+            label: "投标人月数",
+            value: "month",
+        },
+        {
+            label: "中标总监/经理",
+            value: "manager_name",
+        },
+        {
+            label: "投标结果分析",
+            value: "bid_result_analysis",
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+    ],
+    table: {
+        title: "建设单位",
+        tableConfig: [
+            {
+                label: "投标单位",
+                value: 'company_name'
+
+            },
+            {
+                label: "报价1",
+                value: 'quotation_one'
+
+            },
+            {
+                label: "报价2",
+                value: 'quotation_two'
+            },
+            {
+                label: "报价3",
+                value: 'quotation_three',
+
+            },
+            {
+                label: "最终费率",
+                value: 'final_rate',
+            },
+            {
+                label: "投标总监",
+                value: 'manager'
+            },
+            {
+                label: "投标人月数",
+                value: 'month'
+            },
+            {
+                label: "投标结果",
+                value: 'result_text'
+            },
+
+
+
+        ],
+        fetchFun: apiMarketingBidResultDetailLists,
+        query: 'bid_result_id'
+    }
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/marketing_bid_result/edit.vue b/src/views/marketing_bid_result/edit.vue
index f249fd2..e1d4fc8 100644
--- a/src/views/marketing_bid_result/edit.vue
+++ b/src/views/marketing_bid_result/edit.vue
@@ -1,41 +1,118 @@
 <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_info_id">
-                    <el-input v-model="formData.bid_info_id" clearable placeholder="请输入投标信息id" />
-                </el-form-item>
-                <el-form-item label="投标结果 0-中标 1-不中标" prop="bid_result">
-                    <el-input v-model="formData.bid_result" clearable placeholder="请输入投标结果 0-中标 1-不中标" />
-                </el-form-item>
-                <el-form-item label="中标报价" prop="quotation">
-                    <el-input v-model="formData.quotation" clearable placeholder="请输入中标报价" />
-                </el-form-item>
-                <el-form-item label="开标日期" prop="bid_open_date">
-                    <el-input v-model="formData.bid_open_date" clearable placeholder="请输入开标日期" />
-                </el-form-item>
-                <el-form-item label="开标地点" prop="bid_open_address">
-                    <el-input v-model="formData.bid_open_address" clearable placeholder="请输入开标地点" />
-                </el-form-item>
-                <el-form-item label="我方报价" prop="our_quotation">
-                    <el-input v-model="formData.our_quotation" clearable placeholder="请输入我方报价" />
-                </el-form-item>
-                <el-form-item label="中标费率" prop="rate">
-                    <el-input v-model="formData.rate" clearable placeholder="请输入中标费率" />
-                </el-form-item>
-                <el-form-item label="投标人月数" prop="month">
-                    <el-input v-model="formData.month" clearable placeholder="请输入投标人月数" />
-                </el-form-item>
-                <el-form-item label="中标总监/经理" prop="manager">
-                    <el-input v-model="formData.manager" clearable placeholder="请输入中标总监/经理" />
-                </el-form-item>
-                <el-form-item label="投标结果分析" prop="bid_result analysis">
-                    <el-input v-model="formData.bid_result_analysis" clearable placeholder="请输入投标结果分析" />
-                </el-form-item>
-                <el-form-item label="附件" prop="annex">
-                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                </el-form-item>
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="140px" :rules="formRules">
+
+                <el-card>
+                    <template #header>基本信息</template>
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="投标信息" prop="bid_info_id">
+                                <el-input v-model="formData.business_opportunity.project_name" clearable
+                                    placeholder="点击选择投标信息" readonly @click="showDialog = true" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="投标结果" prop="bid_result">
+                                <el-select v-model="formData.bid_result" class="flex-1">
+                                    <el-option label="中标" :value="0"></el-option>
+                                    <el-option label="不中标" :value="1"></el-option>
+                                </el-select>
+
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="中标通知书编号">
+                                <el-input v-model="formData.bid_result_code" clearable placeholder="请输入中标通知书编号"
+                                    v-type="'code'" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="中标报价">
+                                <el-input v-model="formData.quotation" clearable placeholder="请输入中标报价" type="number" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="开标日期" prop="bid_open_date">
+                                <el-date-picker class="flex-1 !flex" v-model="formData.bid_open_date" clearable type="date"
+                                    value-format="YYYY-MM-DD" placeholder="选择开标日期">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="开标地点">
+                                <el-input v-model="formData.bid_open_address" clearable placeholder="请输入开标地点" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="我方报价">
+                                <el-input v-model="formData.our_quotation" clearable placeholder="请输入我方报价" type="number" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="中标费率">
+                                <el-input v-model="formData.rate" clearable placeholder="请输入中标费率" type="number" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="投标人月数">
+                                <el-input v-model="formData.month" clearable placeholder="请输入投标人月数" type="number" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="中标总监/经理">
+                                <el-input v-model="formData.manager_name" clearable placeholder="点击选择中标总监/经理" readonly
+                                    @click="userclick('manager')" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="投标结果分析">
+                                <el-input v-model="formData.bid_result_analysis" clearable placeholder="请输入投标结果分析"
+                                    type="textarea" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+                <el-card>
+                    <template #header>
+                        参标单位
+                    </template>
+                    <formTable :formData="formData.detail" :config="tableConfig">
+                        <el-table-column label="投标单位" prop="company" show-overflow-tooltip>
+                            <template #default="{ row, $index }">
+                                <el-form-item label-width="0">
+                                    <el-input v-model="row.company_name" clearable placeholder="点击选择投标单位"
+                                        @click="showDialog2 = true; tableIndex = $index" readonly />
+                                </el-form-item>
+                            </template>
+                        </el-table-column>
+                    </formTable>
+                </el-card>
+
+                <el-card>
+                    <template #header>
+                        附件
+                    </template>
+                    <el-col :span="24">
+                        <el-form-item label-width="0">
+                            <uploadAnnex :formData="formData"></uploadAnnex>
+                        </el-form-item>
+                    </el-col>
+                </el-card>
             </el-form>
+
+            <el-dialog v-model="showDialog" title="选择建设单位" width="70%">
+                <dialogTable :config="marketing_bid_info" @customEvent="customEvent">
+                </dialogTable>
+            </el-dialog>
+            <div v-if="showDialog1">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+            <el-dialog v-model="showDialog2" title="选择投标单位" width="70%">
+                <dialogTable :config="marketing_competitor" @customEvent="customEvent1">
+                </dialogTable>
+            </el-dialog>
         </popup>
     </div>
 </template>
@@ -43,9 +120,9 @@
 <script lang="ts" setup name="marketingBidResultEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiMarketingBidResultAdd, apiMarketingBidResultEdit, apiMarketingBidResultDetail } from '@/api/marketing_bid_result'
-import { timeFormat } from '@/utils/util'
+import { apiMarketingBidResultAdd, apiMarketingBidResultEdit, apiMarketingBidResultDetail, apiMarketingBidResultDetailDelete, apiMarketingBidResultDetailLists } from '@/api/marketing_bid_result'
 import type { PropType } from 'vue'
+import { marketing_bid_info, marketing_competitor } from "@/components/dialogTable/dialogTableConfig";
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -56,6 +133,10 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const showDialog2 = ref(false)
+const personnel = ref(null)
 
 
 // 弹窗标题
@@ -65,19 +146,108 @@ const popupTitle = computed(() => {
 
 // 表单数据
 const formData = reactive({
-    id: '',
-    bid_info_id: '',
-    bid_result: '',
-    quotation: '',
-    bid_open_date: '',
-    bid_open_address: '',
-    our_quotation: '',
-    rate: '',
-    month: '',
-    manager: '',
-    bid_result_analysis: '',
-    annex: '',
+    id: "",
+    "bid_info_id": '',
+    "bid_result": '',
+    "bid_result_code": "",
+    "quotation": 0,
+    "bid_open_date": "",
+    "bid_open_address": "",
+    "our_quotation": 0,
+    "rate": '',
+    "month": "",
+    "manager": '',
+    "manager_name": '',
+    "bid_result_analysis": "",
+    "annex": [],
+    business_opportunity: {},
+    "detail": []
 })
+const tableConfig = reactive(
+    {
+        title: "",
+        tableConfig: [
+            {
+                label: "报价1",
+                value: 'quotation_one',
+                type: 'number'
+
+            },
+            {
+                label: "报价2",
+                value: 'quotation_two',
+                type: 'number'
+            },
+            {
+                label: "报价3",
+                value: 'quotation_three',
+                type: 'number'
+
+            },
+            {
+                label: "最终费率",
+                value: 'final_rate',
+                type: 'number'
+
+            },
+            {
+                label: "投标总监",
+                value: 'manager',
+            },
+            {
+                label: "投标人月数",
+                value: 'month',
+                type: 'number'
+
+            },
+            {
+                label: "投标结果",
+                value: 'result',
+                select: [
+                    {
+                        name: "中标",
+                        value: 0
+                    },
+                    {
+                        name: "不中标",
+                        value: 1
+                    },
+                ]
+            },
+
+        ],
+        deleteApi: apiMarketingBidResultDetailDelete,
+    }
+)
+
+const customEvent = (e) => {
+    formData.bid_info_id = e.id
+    formData.business_opportunity = e.business_opportunity
+    showDialog.value = false
+}
+
+const tableIndex = ref(0)
+const customEvent1 = (e) => {
+    formData.detail[tableIndex.value].company = e.id
+    formData.detail[tableIndex.value].company_name = e.company_name
+    showDialog2.value = false
+}
+
+let val: string;
+const userclick = async (value: string) => {
+    val = value
+    showDialog1.value = true
+    await nextTick()
+    personnel.value.open()
+
+}
+
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name;
+    showDialog1.value = false
+}
 
 
 // 表单验证
@@ -143,7 +313,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
+    let res = await apiMarketingBidResultDetailLists({ bid_result_id: data.id })
+    formData.detail = res.lists
 
 }
 
diff --git a/src/views/marketing_bid_result/index.vue b/src/views/marketing_bid_result/index.vue
index f8d8b12..8a69a26 100644
--- a/src/views/marketing_bid_result/index.vue
+++ b/src/views/marketing_bid_result/index.vue
@@ -1,16 +1,13 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="投标信息id" prop="bid_info_id">
-                    <el-input class="w-[280px]" v-model="queryParams.bid_info_id" clearable placeholder="请输入投标信息id" />
-                </el-form-item>
-                <el-form-item label="投标结果 0-中标 1-不中标" prop="bid_result">
-                    <el-input class="w-[280px]" v-model="queryParams.bid_result" clearable placeholder="请输入投标结果 0-中标 1-不中标" />
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="投标结果" prop="bid_result">
+                    <el-select v-model="queryParams.bid_result">
+                        <el-option label="中标" value="0"></el-option>
+                        <el-option label="不中标" value="1"></el-option>
+                    </el-select>
+
                 </el-form-item>
                 <el-form-item label="开标地点" prop="bid_open_address">
                     <el-input class="w-[280px]" v-model="queryParams.bid_open_address" clearable placeholder="请输入开标地点" />
@@ -31,45 +28,37 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['marketing.marketing_bid_result/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['marketing.marketing_bid_result/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="投标信息id" prop="bid_info_id" show-overflow-tooltip />
-                    <el-table-column label="投标结果 0-中标 1-不中标" prop="bid_result" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="business_opportunity.project_name" show-overflow-tooltip />
+                    <el-table-column label="建设单位" prop="business_opportunity.management_company" show-overflow-tooltip />
+                    <el-table-column label="业务性质" prop="business_opportunity.business_nature_text" show-overflow-tooltip />
+                    <!-- <el-table-column label="投标日期" prop="bid_result_text" show-overflow-tooltip /> -->
                     <el-table-column label="中标报价" prop="quotation" show-overflow-tooltip />
                     <el-table-column label="开标日期" prop="bid_open_date" show-overflow-tooltip />
-                    <el-table-column label="开标地点" prop="bid_open_address" show-overflow-tooltip />
-                    <el-table-column label="我方报价" prop="our_quotation" show-overflow-tooltip />
+                    <el-table-column label="投标结果" prop="bid_result_text" show-overflow-tooltip />
                     <el-table-column label="中标费率" prop="rate" show-overflow-tooltip />
-                    <el-table-column label="投标人月数" prop="month" show-overflow-tooltip />
-                    <el-table-column label="中标总监/经理" prop="manager" show-overflow-tooltip />
-                    <el-table-column label="投标结果分析" prop="bid_result analysis" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="中标总监/经理" prop="manager_name" show-overflow-tooltip />
+                    <el-table-column label="投标结果分析" prop="bid_result_analysis" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['marketing.marketing_bid_result/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['marketing.marketing_bid_result/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['marketing.marketing_bid_result/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['marketing.marketing_bid_result/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['marketing.marketing_bid_result/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -79,20 +68,23 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
     </div>
 </template>
 
 <script lang="ts" setup name="marketingBidResultLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiMarketingBidResultLists, apiMarketingBidResultDelete } from '@/api/marketing_bid_result'
-import { timeFormat } from '@/utils/util'
+import { apiMarketingBidResultLists, apiMarketingBidResultDelete, apiMarketingBidResultDetail } from '@/api/marketing_bid_result'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -129,10 +121,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiMarketingBidResultDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
@@ -141,6 +134,14 @@ const handleDelete = async (id: number | any[]) => {
     await apiMarketingBidResultDelete({ id })
     getLists()
 }
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiMarketingBidResultDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
 
 getLists()
 </script>
diff --git a/src/views/marketing_competitor/detail.js b/src/views/marketing_competitor/detail.js
new file mode 100644
index 0000000..9ad4784
--- /dev/null
+++ b/src/views/marketing_competitor/detail.js
@@ -0,0 +1,56 @@
+const detailConfig = {
+    title: "市场经营--投标管理--竞争对手",
+    config: [
+        {
+            label: "单位名称",
+            value: "company_name"
+        },
+        {
+            label: "企业类型",
+            value: "company_type_text"
+        },
+        {
+            label: "法人代表",
+            value: "legal_representative"
+        },
+        {
+            label: "成立日期",
+            value: "creation_date"
+        },
+        {
+            label: "员工人数",
+            value: "employee_num"
+        },
+        {
+            label: "联系电话",
+            value: "telephone"
+        },
+        {
+            label: "单位地址",
+            value: "address"
+        },
+        {
+            label: "企业网址",
+            value: "website",
+        },
+        {
+            label: "企业资质",
+            value: "qualifications",
+        },
+        {
+            label: "经营范围",
+            value: "business_scope",
+        },
+        {
+            label: "竞争优势",
+            value: "competitive_edge",
+        },
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+    ]
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/marketing_competitor/edit.vue b/src/views/marketing_competitor/edit.vue
index baf6272..5434440 100644
--- a/src/views/marketing_competitor/edit.vue
+++ b/src/views/marketing_competitor/edit.vue
@@ -1,49 +1,47 @@
 <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="单位名称" prop="company_name">
                     <el-input v-model="formData.company_name" clearable placeholder="请输入单位名称" />
                 </el-form-item>
                 <el-form-item label="企业类型" prop="company_type">
-                    <el-input v-model="formData.company_type" clearable placeholder="请输入企业类型" />
+                    <el-select class="flex-1" v-model="formData.company_type" clearable placeholder="请选择企业类型">
+                        <el-option v-for="(item, index) in dictData.company_type" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="法人代表" prop="legal_representative">
+                <el-form-item label="法人代表">
                     <el-input v-model="formData.legal_representative" clearable placeholder="请输入法人代表" />
                 </el-form-item>
-                <el-form-item label="成立日期" prop="creation_date">
-                    <el-input v-model="formData.creation_date" clearable placeholder="请输入成立日期" />
+                <el-form-item label="成立日期">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.creation_date" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择成立日期">
+                    </el-date-picker>
                 </el-form-item>
-                <el-form-item label="员工人数" prop="employee_num">
-                    <el-input v-model="formData.employee_num" clearable placeholder="请输入员工人数" />
+                <el-form-item label="员工人数">
+                    <el-input v-model="formData.employee_num" clearable placeholder="请输入员工人数" type="number" />
                 </el-form-item>
                 <el-form-item label="联系电话" prop="telephone">
                     <el-input v-model="formData.telephone" clearable placeholder="请输入联系电话" />
                 </el-form-item>
-                <el-form-item label="单位地址" prop="address">
+                <el-form-item label="单位地址">
                     <el-input v-model="formData.address" clearable placeholder="请输入单位地址" />
                 </el-form-item>
-                <el-form-item label="企业网址" prop="website">
+                <el-form-item label="企业网址">
                     <el-input v-model="formData.website" clearable placeholder="请输入企业网址" />
                 </el-form-item>
-                <el-form-item label="企业资质" prop="qualifications">
+                <el-form-item label="企业资质">
                     <el-input v-model="formData.qualifications" clearable placeholder="请输入企业资质" />
                 </el-form-item>
-                <el-form-item label="经营范围" prop="business_scope">
-                    <el-input v-model="formData.business_scope" clearable placeholder="请输入经营范围" />
+                <el-form-item label="经营范围">
+                    <el-input v-model="formData.business_scope" clearable placeholder="请输入经营范围" type="textarea" />
                 </el-form-item>
-                <el-form-item label="竞争优势" prop="competitive_edge">
-                    <el-input v-model="formData.competitive_edge" clearable placeholder="请输入竞争优势" />
+                <el-form-item label="竞争优势">
+                    <el-input v-model="formData.competitive_edge" clearable placeholder="请输入竞争优势" type="textarea" />
                 </el-form-item>
                 <el-form-item label="附件" prop="annex">
-                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
+                    <uploadAnnex :formData="formData"></uploadAnnex>
                 </el-form-item>
             </el-form>
         </popup>
@@ -54,8 +52,9 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiMarketingCompetitorAdd, apiMarketingCompetitorEdit, apiMarketingCompetitorDetail } from '@/api/marketing_competitor'
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+import { checkPhone } from '@/utils/validate'
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -87,7 +86,7 @@ const formData = reactive({
     qualifications: '',
     business_scope: '',
     competitive_edge: '',
-    annex: '',
+    annex: [],
 })
 
 
@@ -122,7 +121,13 @@ const formRules = reactive<any>({
         required: true,
         message: '请输入联系电话',
         trigger: ['blur']
-    }],
+    },
+    {
+        validator: checkPhone,
+        trigger: ['blur']
+
+    }
+    ],
     address: [{
         required: true,
         message: '请输入单位地址',
@@ -159,8 +164,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -174,9 +179,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiMarketingCompetitorEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiMarketingCompetitorEdit(data)
         : await apiMarketingCompetitorAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/marketing_competitor/index.vue b/src/views/marketing_competitor/index.vue
index 5817a64..462b476 100644
--- a/src/views/marketing_competitor/index.vue
+++ b/src/views/marketing_competitor/index.vue
@@ -1,19 +1,19 @@
 <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" inline>
                 <el-form-item label="单位名称" prop="company_name">
                     <el-input class="w-[280px]" v-model="queryParams.company_name" clearable placeholder="请输入单位名称" />
                 </el-form-item>
                 <el-form-item label="企业类型" prop="company_type">
-                    <el-input class="w-[280px]" v-model="queryParams.company_type" clearable placeholder="请输入企业类型" />
+                    <el-select class="flex-1" v-model="queryParams.company_type" clearable placeholder="请选择企业类型">
+                        <el-option v-for="(item, index) in dictData.company_type" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="法人代表" prop="legal_representative">
-                    <el-input class="w-[280px]" v-model="queryParams.legal_representative" clearable placeholder="请输入法人代表" />
+                    <el-input class="w-[280px]" v-model="queryParams.legal_representative" clearable
+                        placeholder="请输入法人代表" />
                 </el-form-item>
                 <el-form-item label="单位地址" prop="address">
                     <el-input class="w-[280px]" v-model="queryParams.address" clearable placeholder="请输入单位地址" />
@@ -31,46 +31,33 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['marketing.marketing_competitor/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['marketing.marketing_competitor/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="单位名称" prop="company_name" show-overflow-tooltip />
-                    <el-table-column label="企业类型" prop="company_type" show-overflow-tooltip />
+                    <el-table-column label="企业类型" prop="company_type_text" show-overflow-tooltip />
                     <el-table-column label="法人代表" prop="legal_representative" show-overflow-tooltip />
-                    <el-table-column label="成立日期" prop="creation_date" show-overflow-tooltip />
-                    <el-table-column label="员工人数" prop="employee_num" show-overflow-tooltip />
                     <el-table-column label="联系电话" prop="telephone" show-overflow-tooltip />
                     <el-table-column label="单位地址" prop="address" show-overflow-tooltip />
-                    <el-table-column label="企业网址" prop="website" show-overflow-tooltip />
                     <el-table-column label="企业资质" prop="qualifications" show-overflow-tooltip />
-                    <el-table-column label="经营范围" prop="business_scope" show-overflow-tooltip />
-                    <el-table-column label="竞争优势" prop="competitive_edge" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['marketing.marketing_competitor/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['marketing.marketing_competitor/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['marketing.marketing_competitor/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['marketing.marketing_competitor/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button v-perms="['marketing.marketing_competitor/detail']" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -80,20 +67,25 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" :column="1"
+            width="550px" />
     </div>
 </template>
 
 <script lang="ts" setup name="marketingCompetitorLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiMarketingCompetitorLists, apiMarketingCompetitorDelete } from '@/api/marketing_competitor'
-import { timeFormat } from '@/utils/util'
+import { apiMarketingCompetitorLists, apiMarketingCompetitorDelete, apiMarketingCompetitorDetail } from '@/api/marketing_competitor'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailConfig from './detail'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
+const showDetail = ref(false)
+
 
 
 // 查询条件
@@ -113,7 +105,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('company_type')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -143,6 +135,15 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 详情
+const handleDetail = async (id: any) => {
+    let res = await apiMarketingCompetitorDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 getLists()
 </script>
 
diff --git a/src/views/marketing_reflux_contract/index.vue b/src/views/marketing_reflux_contract/index.vue
new file mode 100644
index 0000000..ed33376
--- /dev/null
+++ b/src/views/marketing_reflux_contract/index.vue
@@ -0,0 +1,118 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="协议名称">
+                    <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
+                </el-form-item>
+                <el-form-item label="业务性质">
+                    <el-input class="w-[280px]" v-model="queryParams.business_nature" clearable placeholder="请输入合同编号" />
+                </el-form-item>
+                <el-form-item label="签订部门">
+                    <el-input class="w-[280px]" v-model="queryParams.signed_dept" clearable placeholder="请输入业务性质" />
+                </el-form-item>
+                <el-form-item label="甲方签约单位">
+                    <el-input class="w-[280px]" v-model="queryParams.part_a" clearable placeholder="请输入行业性质" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange" border>
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="协议名称" :render-header="pager.calcWidth" prop="contract_name"
+                        show-overflow-tooltip />
+                    <el-table-column label="协议编号" :render-header="pager.calcWidth" prop="contract_code"
+                        show-overflow-tooltip />
+                    <el-table-column label="关联主合同" :render-header="pager.calcWidth" prop="supplementary_agreement_name"
+                        show-overflow-tooltip />
+                    <el-table-column label="甲方单位" :render-header="pager.calcWidth" prop="part_a_name"
+                        show-overflow-tooltip />
+                    <el-table-column label="签订部门" :render-header="pager.calcWidth" prop="signed_dept_name"
+                        show-overflow-tooltip />
+                    <el-table-column label="乙方单位" :render-header="pager.calcWidth" prop="part_b" show-overflow-tooltip />
+                    <el-table-column label="签订金额" :render-header="pager.calcWidth" prop="signed_amount"
+                        show-overflow-tooltip />
+                    <el-table-column label="签订负责人" :render-header="pager.calcWidth" prop="signed_head_name"
+                        show-overflow-tooltip />
+                    <el-table-column label="业务性质" :render-header="pager.calcWidth" prop="business_nature_text"
+                        show-overflow-tooltip />
+                    <el-table-column label="签订时间" :render-header="pager.calcWidth" prop="create_time"
+                        show-overflow-tooltip />
+                    <el-table-column label="审核状态" :render-header="pager.calcWidth" prop="approve_status_text"
+                        show-overflow-tooltip />
+                    <el-table-column label="移交状态" :render-header="pager.calcWidth" prop="review_status_text"
+                        show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <!-- <el-button v-perms="['marketing.marketing_supplementary_agreement/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button> -->
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="marketingContractLists">
+import { usePaging } from '@/hooks/usePaging'
+import { apiMarketingRefluxContractLists, apiMarketingRefluxContractReflux } from '@/api/marketing_reflux_contract'
+import feedback from '@/utils/feedback'
+
+
+
+
+// 查询条件
+const queryParams = reactive({
+    // contract_name: '',
+    // business_nature: '',
+    // signed_dept: '',
+    // part_a: '',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiMarketingRefluxContractLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+
+
+const deptList = ref([])
+const getDeptList = async () => {
+    let res = await deptLists()
+    deptList.value = res.lists
+}
+
+getLists()
+getDeptList()
+</script>
+
diff --git a/src/views/procurement_contract/index.vue b/src/views/procurement_contract/index.vue
index 89d5111..58817a4 100644
--- a/src/views/procurement_contract/index.vue
+++ b/src/views/procurement_contract/index.vue
@@ -58,7 +58,7 @@
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="未入库数量" prop="not_storage_num"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="数量" prop="num" show-overflow-tooltip />
+                    <el-table-column label="数量" prop="num" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['contract.procurement_contract/edit']" type="primary" link
diff --git a/src/views/procurement_contract_detail/index.vue b/src/views/procurement_contract_detail/index.vue
index 34c9848..4ee56f9 100644
--- a/src/views/procurement_contract_detail/index.vue
+++ b/src/views/procurement_contract_detail/index.vue
@@ -48,8 +48,7 @@
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="规格型号" prop="material_specs"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="品牌" prop="material_brand"
-                        show-overflow-tooltip />
+                    <el-table-column label="品牌" prop="material_brand" show-overflow-tooltip />
                     <el-table-column label="参数说明" prop="material_parameter_description" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">