diff --git a/src/api/marketing_bid_info.ts b/src/api/marketing_bid_info.ts
new file mode 100644
index 0000000..d2e4cd3
--- /dev/null
+++ b/src/api/marketing_bid_info.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 市场经营--投标管理--投标信息列表
+export function apiMarketingBidInfoLists(params: any) {
+    return request.get({ url: '/marketing.marketing_bid_info/lists', params })
+}
+
+// 添加市场经营--投标管理--投标信息
+export function apiMarketingBidInfoAdd(params: any) {
+    return request.post({ url: '/marketing.marketing_bid_info/add', params })
+}
+
+// 编辑市场经营--投标管理--投标信息
+export function apiMarketingBidInfoEdit(params: any) {
+    return request.post({ url: '/marketing.marketing_bid_info/edit', params })
+}
+
+// 删除市场经营--投标管理--投标信息
+export function apiMarketingBidInfoDelete(params: any) {
+    return request.post({ url: '/marketing.marketing_bid_info/delete', params })
+}
+
+// 市场经营--投标管理--投标信息详情
+export function apiMarketingBidInfoDetail(params: any) {
+    return request.get({ url: '/marketing.marketing_bid_info/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/marketing_bid_result.ts b/src/api/marketing_bid_result.ts
new file mode 100644
index 0000000..314ec74
--- /dev/null
+++ b/src/api/marketing_bid_result.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 市场经营--投标管理--投标结果列表
+export function apiMarketingBidResultLists(params: any) {
+    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 })
+}
+
+// 编辑市场经营--投标管理--投标结果
+export function apiMarketingBidResultEdit(params: any) {
+    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 })
+}
+
+// 市场经营--投标管理--投标结果详情
+export function apiMarketingBidResultDetail(params: any) {
+    return request.get({ url: '/marketing.marketing_bid_result/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/marketing_competitor.ts b/src/api/marketing_competitor.ts
new file mode 100644
index 0000000..4228ce2
--- /dev/null
+++ b/src/api/marketing_competitor.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 市场经营--投标管理--竞争对手列表
+export function apiMarketingCompetitorLists(params: any) {
+    return request.get({ url: '/marketing.marketing_competitor/lists', params })
+}
+
+// 添加市场经营--投标管理--竞争对手
+export function apiMarketingCompetitorAdd(params: any) {
+    return request.post({ url: '/marketing.marketing_competitor/add', params })
+}
+
+// 编辑市场经营--投标管理--竞争对手
+export function apiMarketingCompetitorEdit(params: any) {
+    return request.post({ url: '/marketing.marketing_competitor/edit', params })
+}
+
+// 删除市场经营--投标管理--竞争对手
+export function apiMarketingCompetitorDelete(params: any) {
+    return request.post({ url: '/marketing.marketing_competitor/delete', params })
+}
+
+// 市场经营--投标管理--竞争对手详情
+export function apiMarketingCompetitorDetail(params: any) {
+    return request.get({ url: '/marketing.marketing_competitor/detail', params })
+}
\ No newline at end of file
diff --git a/src/install/directives/type.ts b/src/install/directives/type.ts
index 767a2ec..fff3432 100644
--- a/src/install/directives/type.ts
+++ b/src/install/directives/type.ts
@@ -7,7 +7,6 @@
 
 export default {
   mounted: async (el: HTMLElement, binding: any) => {
-    console.log(el, "el");
     var inputElements = el.getElementsByTagName("input")[0];
     var { value } = binding;
     inputElements.addEventListener("input", function (event) {
diff --git a/src/views/financial_borrow_money/index.vue b/src/views/financial_borrow_money/index.vue
index 67ff4da..5b4450e 100644
--- a/src/views/financial_borrow_money/index.vue
+++ b/src/views/financial_borrow_money/index.vue
@@ -44,7 +44,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="单据编号" prop="code" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="单据编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="所在部门" prop="dept_name" show-overflow-tooltip />
                     <el-table-column label="费用类别" prop="cost_type_text" show-overflow-tooltip />
                     <el-table-column label="支付方式" prop="pay_type_text" show-overflow-tooltip />
diff --git a/src/views/marketing_bid_evaluation/detail.vue b/src/views/marketing_bid_evaluation/detail.vue
index b136342..a1361a4 100644
--- a/src/views/marketing_bid_evaluation/detail.vue
+++ b/src/views/marketing_bid_evaluation/detail.vue
@@ -6,16 +6,17 @@
                 <el-descriptions :column="3" border>
                     <el-descriptions-item v-for="(item, index) in tableData" :key="index" :label="item.label"
                         label-align="left" align="left" label-class-name="my-label">
-                        {{ formData[item.value] }}
+                        {{ item.value.includes(".") ? formData[item.value.split(".")[0]][item.value.split(".")[1]] :
+                            formData[item.value] }}
                     </el-descriptions-item>
                 </el-descriptions>
                 <el-descriptions :column="1" border>
                     <el-descriptions-item label="工程概况" label-align="left" align="left" label-class-name="my-label">
-                        {{ formData.project_overview }}
+                        {{ formData.business_opportunity.project_overview }}
                     </el-descriptions-item>
-                    <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
+                    <!-- <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">
                         {{ formData.remark }}
-                    </el-descriptions-item>
+                    </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>
@@ -49,55 +50,55 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const tableData = ref([
     {
         label: "业务机会",
-        value: "business_opportunity_name"
+        value: "business_opportunity.project_name"
     },
     {
         label: "项目名称",
-        value: "project_name"
+        value: "business_opportunity.project_name"
     },
     {
         label: "项目前期编号",
-        value: "project_code"
+        value: "business_opportunity.project_code"
     },
     {
         label: "建设单位",
-        value: "construct_company_name"
+        value: "business_opportunity.construct_company_name"
     },
     {
         label: "建设管理单位",
-        value: "management_company"
+        value: "business_opportunity.management_company"
     },
     {
         label: "业务性质",
-        value: "business_nature_text"
+        value: "business_opportunity.business_nature_text"
     },
     {
         label: "行业性质",
-        value: "industry_nature_text"
+        value: "business_opportunity.industry_nature_text"
     },
     {
         label: "消息来源",
-        value: "info_sources_text"
+        value: "business_opportunity.info_sources_text"
     },
     {
         label: "资金来源",
-        value: "fund_sources_text"
+        value: "business_opportunity.fund_sources_text"
     },
     {
         label: "建设区域",
-        value: "const_area_text"
+        value: "business_opportunity.const_area_text"
     },
     {
         label: "项目地点",
-        value: "project_address"
+        value: "business_opportunity.project_address"
     },
     {
         label: "工程总投资",
-        value: "total_investment"
+        value: "business_opportunity.total_investment"
     },
     {
         label: "建安投资额",
-        value: "jianan_investment"
+        value: "business_opportunity.jianan_investment"
     },
 
     {
@@ -106,7 +107,7 @@ const tableData = ref([
     },
     {
         label: "投标性质",
-        value: "bid__nature_text"
+        value: "bid_nature_text"
     },
     {
         label: "投标项目编号",
@@ -160,19 +161,19 @@ const tableData = ref([
     },
     {
         label: "负责人",
-        value: "head_name"
+        value: "business_opportunity.head_name"
     },
     {
         label: "负责部门",
-        value: "dept_name"
+        value: "business_opportunity.dept_name"
     },
     {
         label: "分管领导",
-        value: "leader_name"
+        value: "business_opportunity.leader_name"
     },
     {
         label: "联系人信息",
-        value: "contacts"
+        value: "business_opportunity.contacts"
     },
 ]
 )
diff --git a/src/views/marketing_bid_evaluation/edit.vue b/src/views/marketing_bid_evaluation/edit.vue
index 47a7d7b..3461e12 100644
--- a/src/views/marketing_bid_evaluation/edit.vue
+++ b/src/views/marketing_bid_evaluation/edit.vue
@@ -7,75 +7,87 @@
                     <template #header>基本信息</template>
                     <el-row>
                         <el-col :span="8">
-                            <el-form-item label="业务机会" prop="business_opportunity_name">
-                                <el-input v-model="formData.business_opportunity_name" clearable placeholder="点击选择业务机会"
-                                    @click="showDialog = true" readonly />
+                            <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.project_name" clearable placeholder="系统自动获取" disabled />
+                                <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.project_code" clearable placeholder="系统自动获取" disabled />
+                                <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.construct_company_name" clearable placeholder="系统自动获取"
-                                    disabled />
+                                <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.management_company" clearable placeholder="系统自动获取" disabled />
+                                <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.industry_nature_text" clearable placeholder="系统自动获取" disabled />
+                                <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_nature_text" clearable placeholder="系统自动获取" disabled />
+                                <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.const_area_text" clearable placeholder="系统自动获取" disabled />
+                                <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.project_address" clearable placeholder="系统自动获取" disabled />
+                                <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.info_sources_text" clearable placeholder="系统自动获取" disabled />
+                                <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.fund_sources_text" clearable placeholder="系统自动获取" disabled />
+                                <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.total_investment" clearable placeholder="系统自动获取" disabled />
+                                <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.jianan_investment" clearable placeholder="系统自动获取" disabled />
+                                <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.project_overview" clearable placeholder="系统自动获取" disabled />
+                                <el-input v-model="formData.business_opportunity.project_overview" clearable
+                                    placeholder="系统自动获取" disabled />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
@@ -87,8 +99,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
-                            <el-form-item label="投标性质" prop="bid__nature">
-                                <el-select class=' flex-1' v-model="formData.bid__nature">
+                            <el-form-item label="投标性质" prop="bid_nature">
+                                <el-select class=' flex-1' v-model="formData.bid_nature">
                                     <el-option v-for="(item, index) in  dictData.bid_nature " :key="index"
                                         :label="item.name" :value="parseInt(item.value)"></el-option>
                                 </el-select>
@@ -173,13 +185,13 @@
                     <el-row>
                         <el-col :span="8">
                             <el-form-item label="负责人">
-                                <el-input v-model="formData.head_name" clearable placeholder="点击选择负责人" readonly
-                                    @click="userclick('head')" />
+                                <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.dept" placeholder="请选择部门" class="flex-1">
+                                <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>
@@ -187,13 +199,14 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="分管领导">
-                                <el-input v-model="formData.leader_name" clearable placeholder="请输入分管领导"
-                                    @click="userclick('leader')" readonly />
+                                <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.contacts" clearable placeholder="请输入联系人信息" />
+                                <el-input v-model="formData.business_opportunity.contacts" clearable
+                                    placeholder="请输入联系人信息" />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -258,7 +271,7 @@ const formData = reactive({
     business_opportunity_id: '',
     business_opportunity_name: '',
     bid_type: '',
-    bid__nature: '',
+    bid_nature: '',
     bid_code: '',
     bid_margin: '',
     bid_amount: '',
@@ -272,14 +285,16 @@ const formData = reactive({
     bid_agency_contacts: '',
     bid_agency_telephone: '',
     annex: [],
+    business_opportunity: {}
 })
 
 
 const customEvent = (e) => {
     formData.business_opportunity_id = e.id
     formData.business_opportunity_name = e.project_name
-    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 })
+    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
 }
 
@@ -313,7 +328,7 @@ const formRules = reactive<any>({
         message: '请输入招标方式',
         trigger: ['blur']
     }],
-    bid__nature: [{
+    bid_nature: [{
         required: true,
         message: '请输入投标性质',
         trigger: ['blur']
diff --git a/src/views/marketing_bid_evaluation/index.vue b/src/views/marketing_bid_evaluation/index.vue
index 6ccf59c..b0fc60b 100644
--- a/src/views/marketing_bid_evaluation/index.vue
+++ b/src/views/marketing_bid_evaluation/index.vue
@@ -35,16 +35,19 @@
                 删除
             </el-button>
             <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange" border>
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="业务机会" prop="business_opportunity_name" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="建设单位" prop="construct_company_name" show-overflow-tooltip />
-                    <el-table-column label="工程总投资" prop="total_investment" show-overflow-tooltip />
-                    <el-table-column label="投标日期" prop="bid_date" show-overflow-tooltip />
-                    <el-table-column label="投标状态" prop="status_text" show-overflow-tooltip />
-                    <el-table-column label="建安投资额" prop="jianan_investment" show-overflow-tooltip />
-                    <el-table-column label="流程状态" prop="approve_status_text" 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_name"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="建设单位"
+                        prop="business_opportunity.construct_company_name" show-overflow-tooltip />
+                    <el-table-column label="工程总投资" prop="business_opportunity.total_investment" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="投标日期" prop="bid_date" show-overflow-tooltip />
+                    <el-table-column label="投标状态" prop="business_opportunity.status_text" show-overflow-tooltip />
+                    <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">
                         <template #default="{ row }">
@@ -60,6 +63,10 @@
                                 @click="handleDetail(row)">
                                 详情
                             </el-button>
+                            <el-button v-perms="['marketing.marketing_bid_evaluation/detail']" link
+                                @click="handleDetail(row)">
+                                报名登记
+                            </el-button>
 
                         </template>
                     </el-table-column>
diff --git a/src/views/marketing_bid_info/edit.vue b/src/views/marketing_bid_info/edit.vue
new file mode 100644
index 0000000..2015f5b
--- /dev/null
+++ b/src/views/marketing_bid_info/edit.vue
@@ -0,0 +1,230 @@
+<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>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="marketingBidInfoEdit">
+import type { FormInstance } from 'element-plus'
+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'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑市场经营--投标管理--投标信息' : '新增市场经营--投标管理--投标信息'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    bid_evaluation_id: '',
+    margin_end_date: '',
+    expected_return_date: '',
+    service_charge: '',
+    publish_website: '',
+    general_manager: '',
+    bid_quotation: '',
+    bid_rate: '',
+    bid_head: '',
+    technology_head: '',
+    business_head: '',
+    other_user: '',
+    remark: '',
+    annex: '',
+    bid_status: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    bid_evaluation_id: [{
+        required: true,
+        message: '请输入投标审查id',
+        trigger: ['blur']
+    }],
+    margin_end_date: [{
+        required: true,
+        message: '请输入保证金递交截止日期',
+        trigger: ['blur']
+    }],
+    expected_return_date: [{
+        required: true,
+        message: '请输入预计归还日期',
+        trigger: ['blur']
+    }],
+    service_charge: [{
+        required: true,
+        message: '请输入中标服务费',
+        trigger: ['blur']
+    }],
+    publish_website: [{
+        required: true,
+        message: '请输入发布网址',
+        trigger: ['blur']
+    }],
+    general_manager: [{
+        required: true,
+        message: '请输入拟派总监/经理',
+        trigger: ['blur']
+    }],
+    bid_quotation: [{
+        required: true,
+        message: '请输入拟投标报价',
+        trigger: ['blur']
+    }],
+    bid_rate: [{
+        required: true,
+        message: '请输入拟投标费率',
+        trigger: ['blur']
+    }],
+    bid_head: [{
+        required: true,
+        message: '请输入投标负责人',
+        trigger: ['blur']
+    }],
+    technology_head: [{
+        required: true,
+        message: '请输入技术标负责人',
+        trigger: ['blur']
+    }],
+    business_head: [{
+        required: true,
+        message: '请输入商务标负责人',
+        trigger: ['blur']
+    }],
+    other_user: [{
+        required: true,
+        message: '请输入其他拟派人员',
+        trigger: ['blur']
+    }],
+    remark: [{
+        required: true,
+        message: '请输入备注',
+        trigger: ['blur']
+    }],
+    bid_status: [{
+        required: true,
+        message: '请输入状态 0-未开标 1-已中标 2-未中标',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiMarketingBidInfoDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiMarketingBidInfoEdit(data) 
+        : await apiMarketingBidInfoAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/marketing_bid_info/index.vue b/src/views/marketing_bid_info/index.vue
new file mode 100644
index 0000000..91a4928
--- /dev/null
+++ b/src/views/marketing_bid_info/index.vue
@@ -0,0 +1,147 @@
+<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-item>
+                <el-form-item label="拟派总监/经理" prop="general_manager">
+                    <el-input class="w-[280px]" v-model="queryParams.general_manager" clearable placeholder="请输入拟派总监/经理" />
+                </el-form-item>
+                <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>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['marketing.marketing_bid_info/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <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 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 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">
+                        <template #default="{ 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>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </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 { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    bid_evaluation_id: '',
+    general_manager: '',
+    bid_head: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiMarketingBidInfoLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiMarketingBidInfoDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/marketing_bid_result/edit.vue b/src/views/marketing_bid_result/edit.vue
new file mode 100644
index 0000000..f249fd2
--- /dev/null
+++ b/src/views/marketing_bid_result/edit.vue
@@ -0,0 +1,187 @@
+<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>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<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 type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑市场经营--投标管理--投标结果' : '新增市场经营--投标管理--投标结果'
+})
+
+// 表单数据
+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: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    bid_info_id: [{
+        required: true,
+        message: '请输入投标信息id',
+        trigger: ['blur']
+    }],
+    bid_result: [{
+        required: true,
+        message: '请输入投标结果 0-中标 1-不中标',
+        trigger: ['blur']
+    }],
+    quotation: [{
+        required: true,
+        message: '请输入中标报价',
+        trigger: ['blur']
+    }],
+    bid_open_date: [{
+        required: true,
+        message: '请输入开标日期',
+        trigger: ['blur']
+    }],
+    bid_open_address: [{
+        required: true,
+        message: '请输入开标地点',
+        trigger: ['blur']
+    }],
+    our_quotation: [{
+        required: true,
+        message: '请输入我方报价',
+        trigger: ['blur']
+    }],
+    rate: [{
+        required: true,
+        message: '请输入中标费率',
+        trigger: ['blur']
+    }],
+    month: [{
+        required: true,
+        message: '请输入投标人月数',
+        trigger: ['blur']
+    }],
+    manager: [{
+        required: true,
+        message: '请输入中标总监/经理',
+        trigger: ['blur']
+    }],
+    bid_result_analysis: [{
+        required: true,
+        message: '请输入投标结果分析',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiMarketingBidResultDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiMarketingBidResultEdit(data)
+        : await apiMarketingBidResultAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/marketing_bid_result/index.vue b/src/views/marketing_bid_result/index.vue
new file mode 100644
index 0000000..f8d8b12
--- /dev/null
+++ b/src/views/marketing_bid_result/index.vue
@@ -0,0 +1,147 @@
+<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-item>
+                <el-form-item label="开标地点" prop="bid_open_address">
+                    <el-input class="w-[280px]" v-model="queryParams.bid_open_address" clearable placeholder="请输入开标地点" />
+                </el-form-item>
+                <el-form-item label="中标总监/经理" prop="manager">
+                    <el-input class="w-[280px]" v-model="queryParams.manager" clearable placeholder="请输入中标总监/经理" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['marketing.marketing_bid_result/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <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="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="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">
+                        <template #default="{ 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>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </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 feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    bid_info_id: '',
+    bid_result: '',
+    bid_open_address: '',
+    manager: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiMarketingBidResultLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiMarketingBidResultDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/marketing_competitor/edit.vue b/src/views/marketing_competitor/edit.vue
new file mode 100644
index 0000000..baf6272
--- /dev/null
+++ b/src/views/marketing_competitor/edit.vue
@@ -0,0 +1,203 @@
+<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="单位名称" 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-form-item>
+                <el-form-item label="法人代表" prop="legal_representative">
+                    <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>
+                <el-form-item label="员工人数" prop="employee_num">
+                    <el-input v-model="formData.employee_num" clearable placeholder="请输入员工人数" />
+                </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-input v-model="formData.address" clearable placeholder="请输入单位地址" />
+                </el-form-item>
+                <el-form-item label="企业网址" prop="website">
+                    <el-input v-model="formData.website" clearable placeholder="请输入企业网址" />
+                </el-form-item>
+                <el-form-item label="企业资质" prop="qualifications">
+                    <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>
+                <el-form-item label="竞争优势" prop="competitive_edge">
+                    <el-input v-model="formData.competitive_edge" clearable placeholder="请输入竞争优势" />
+                </el-form-item>
+                <el-form-item label="附件" prop="annex">
+                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="marketingCompetitorEdit">
+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'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑市场经营--投标管理--竞争对手' : '新增市场经营--投标管理--竞争对手'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    company_name: '',
+    company_type: '',
+    legal_representative: '',
+    creation_date: '',
+    employee_num: '',
+    telephone: '',
+    address: '',
+    website: '',
+    qualifications: '',
+    business_scope: '',
+    competitive_edge: '',
+    annex: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    company_name: [{
+        required: true,
+        message: '请输入单位名称',
+        trigger: ['blur']
+    }],
+    company_type: [{
+        required: true,
+        message: '请输入企业类型',
+        trigger: ['blur']
+    }],
+    legal_representative: [{
+        required: true,
+        message: '请输入法人代表',
+        trigger: ['blur']
+    }],
+    creation_date: [{
+        required: true,
+        message: '请输入成立日期',
+        trigger: ['blur']
+    }],
+    employee_num: [{
+        required: true,
+        message: '请输入员工人数',
+        trigger: ['blur']
+    }],
+    telephone: [{
+        required: true,
+        message: '请输入联系电话',
+        trigger: ['blur']
+    }],
+    address: [{
+        required: true,
+        message: '请输入单位地址',
+        trigger: ['blur']
+    }],
+    website: [{
+        required: true,
+        message: '请输入企业网址',
+        trigger: ['blur']
+    }],
+    qualifications: [{
+        required: true,
+        message: '请输入企业资质',
+        trigger: ['blur']
+    }],
+    business_scope: [{
+        required: true,
+        message: '请输入经营范围',
+        trigger: ['blur']
+    }],
+    competitive_edge: [{
+        required: true,
+        message: '请输入竞争优势',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiMarketingCompetitorDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiMarketingCompetitorEdit(data) 
+        : await apiMarketingCompetitorAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/marketing_competitor/index.vue b/src/views/marketing_competitor/index.vue
new file mode 100644
index 0000000..5817a64
--- /dev/null
+++ b/src/views/marketing_competitor/index.vue
@@ -0,0 +1,148 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <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-form-item>
+                <el-form-item label="法人代表" prop="legal_representative">
+                    <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="请输入单位地址" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['marketing.marketing_competitor/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <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="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">
+                        <template #default="{ 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>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </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 feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    company_name: '',
+    company_type: '',
+    legal_representative: '',
+    address: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiMarketingCompetitorLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiMarketingCompetitorDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+