From ea13ef7fa3f2069972a6add1a4c1a969fab3b7f9 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Thu, 21 Sep 2023 16:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E6=8A=95=E6=A0=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9D=BF=E5=9D=97=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/earlyStage/bidInfoVO.js           |    4 +-
 .../src/api/earlyStage/bidWinningVO.js        |   61 +
 .../bid/options/PreQualificationPage.vue      |  188 ++-
 .../bid/options/TenderAnnouncementPage.vue    | 1148 ++++++++---------
 .../views/project/bid/options/bidBasePage.vue |  224 +++-
 .../project/bid/options/candidatePage.vue     |  907 +++++++------
 .../project/bid/options/winningResultPage.vue |  697 ++++------
 .../src/views/project/report/index.vue        |  269 ++--
 8 files changed, 1847 insertions(+), 1651 deletions(-)
 create mode 100644 jwtech-admin-page/src/api/earlyStage/bidWinningVO.js

diff --git a/jwtech-admin-page/src/api/earlyStage/bidInfoVO.js b/jwtech-admin-page/src/api/earlyStage/bidInfoVO.js
index f796195c..9c701726 100644
--- a/jwtech-admin-page/src/api/earlyStage/bidInfoVO.js
+++ b/jwtech-admin-page/src/api/earlyStage/bidInfoVO.js
@@ -20,7 +20,7 @@ export function getBidInfo(id) {
 // 查询招标计划基本信息详细及明细表
 export function getBidInfoVO(id) {
   return request({
-    url: '/earlyStage/bidInfo/listVO' + id,
+    url: '/earlyStage/bidInfo/listVO/' + id,
     method: 'get'
   })
 }
@@ -46,7 +46,7 @@ export function updateBidInfoVO(data) {
 // 删除招标计划基本信息及详细信息
 export function delBidInfoVO(id) {
   return request({
-    url: '/earlyStage/bidInfo/delVO' + id,
+    url: '/earlyStage/bidInfo/delVO/' + id,
     method: 'delete'
   })
 }
diff --git a/jwtech-admin-page/src/api/earlyStage/bidWinningVO.js b/jwtech-admin-page/src/api/earlyStage/bidWinningVO.js
new file mode 100644
index 00000000..9d86f938
--- /dev/null
+++ b/jwtech-admin-page/src/api/earlyStage/bidWinningVO.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询中标候选人公示基本信息列表
+export function listBidWinning(query) {
+  return request({
+    url: '/earlyStage/bidWinning/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询中标候选人公示基本信息详细
+export function getBidWinning(id) {
+  return request({
+    url: '/earlyStage/bidWinning/' + id,
+    method: 'get'
+  })
+}
+
+// 查询中标候选人公示基本信息及候选人表
+export function getBidWinningVO(id) {
+  return request({
+    url: '/earlyStage/bidWinning/listVO/' + id,
+    method: 'get'
+  })
+}
+
+// 新增中标候选人公示基本信息及候选人表
+export function addBidWinningVO(data) {
+  return request({
+    url: '/earlyStage/bidWinning/addVO',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改中标候选人公示基本信息及候选人表
+export function updateBidWinningVO(data) {
+  return request({
+    url: '/earlyStage/bidWinning/editVO',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除中标候选人公示基本信息及候选人表
+export function delBidWinningVO(id) {
+  return request({
+    url: '/earlyStage/bidWinning/delVO/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出中标候选人公示基本信息
+export function exportBidWinning(query) {
+  return request({
+    url: '/earlyStage/bidWinning/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue b/jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue
index 1b19d35e..8d15783b 100644
--- a/jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue
@@ -115,12 +115,28 @@
         label="公告内容附件"
         align="center"
         prop="noticeAtttachment"
-      />
-
+        width="180"
+      >
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in JSON.parse(scope.row.noticeAtttachment)"
+            :key="item + index"
+          >
+            <i class="el-icon-document"></i>
+            {{ item.name }}
+            <i
+              class="el-icon-download"
+              @click="downloadFile(scope)"
+              style="cursor: pointer"
+            ></i>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="180"
       >
         <template slot-scope="scope">
           <el-button
@@ -152,8 +168,14 @@
     />
 
     <!-- 添加或修改资格预审公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+      @close="close"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
         <el-form-item label="招标项目名称" prop="bidProjectName">
           <el-input
             v-model="form.bidProjectName"
@@ -164,7 +186,7 @@
           <el-date-picker
             clearable
             size="small"
-            style="width: 200px"
+            style="width: 100%"
             v-model="form.fileGainTime"
             type="date"
             value-format="yyyy-MM-dd"
@@ -176,7 +198,7 @@
           <el-date-picker
             clearable
             size="small"
-            style="width: 200px"
+            style="width: 100%"
             v-model="form.reportTime"
             type="date"
             value-format="yyyy-MM-dd"
@@ -185,28 +207,30 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="公告内容附件" prop="noticeAtttachment">
-          <el-input
+          <!-- <el-input
             v-model="form.noticeAtttachment"
             placeholder="请输入公告内容附件"
-          />
-        </el-form-item>
-        <el-form-item label="项目编码" prop="projectCode">
-          <el-input v-model="form.projectCode" placeholder="请输入项目编码" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="proNo">
-          <el-input v-model="form.proNo" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUid">
-          <el-input v-model="form.createUid" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="更新人" prop="updateUid">
-          <el-input v-model="form.updateUid" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="数源部门" prop="owerDept">
-          <el-input v-model="form.owerDept" placeholder="请输入数源部门" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          /> -->
+          <el-upload
+            class="upload-demo"
+            action="http://127.0.0.1/thinking/common/upload"
+            :headers="headers"
+            :on-preview="handleNoticePreview"
+            :on-remove="handleNoticeRemove"
+            :before-remove="beforeNoticeRemove"
+            multiple
+            :on-exceed="handleNoticeExceed"
+            :on-success="submitNoticeUpload"
+            :file-list="noticeFileList"
+          >
+            <el-button size="small" type="primary" plain>
+              <i class="el-icon-upload el-icon--right"></i>
+              点击上传
+            </el-button>
+            <div slot="tip" class="el-upload__tip">
+              支持jpg/png/pdf/word/excel文件等，不超过100M
+            </div>
+          </el-upload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -226,6 +250,8 @@ import {
   updateBidPrequ,
   exportBidPrequ,
 } from "@/api/earlyStage/bidPrequ";
+import { getToken } from "@/utils/auth";
+import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "BidPrequ",
@@ -274,6 +300,12 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 公告附件
+      noticeFileList: [],
+      // 请求头
+      headers: {
+        jianwei: "jwtech " + getToken(),
+      },
     };
   },
   created() {
@@ -297,11 +329,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
       this.form = {
@@ -320,6 +347,7 @@ export default {
         remark: null,
       };
       this.resetForm("form");
+      this.noticeFileList = [];
     },
     // 查询表单重置
     resetQueryForm() {
@@ -362,16 +390,19 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
       this.open = true;
       this.title = "添加资格预审公告";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       const id = row.id || this.ids;
       getBidPrequ(id).then((response) => {
         this.form = response.data;
+        // 公告附件信息
+        console.log("response.data", response.data);
+        if (response.data.noticeAtttachment) {
+          this.noticeFileList = JSON.parse(response.data.noticeAtttachment);
+        }
         this.open = true;
         this.title = "修改资格预审公告";
       });
@@ -379,6 +410,8 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
+        // 公告附件
+        this.form.noticeAtttachment = JSON.stringify(this.noticeFileList);
         if (valid) {
           if (this.form.id != null) {
             updateBidPrequ(this.form).then((response) => {
@@ -401,6 +434,14 @@ export default {
         }
       });
     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    // 关闭弹窗
+    close() {
+      this.reset();
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -422,28 +463,67 @@ export default {
         this.$message.warning("请选择要删除的数据！！");
       }
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      let message = "是否确认导出所有的数据项?";
-      if (this.ids) {
-        message = "是否确认导出选中的数据项?";
-        queryParams.ids = this.ids;
-      }
-      this.$confirm(message, "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportBidPrequ(queryParams);
-        })
-        .then((response) => {
-          this.downloadFile(response, true, response.msg);
-          // this.download(response.msg);
-        })
-        .catch(function () {});
+
+    submitNoticeUpload(_, fileList) {
+      console.log("fileList", fileList);
+      this.noticeFileList.push({
+        name: fileList.name,
+        fileName: fileList.response.fileName,
+        url: fileList.response.url,
+        uid: fileList.uid,
+      });
+    },
+    handleNoticeRemove(file, fileList) {
+      // console.log(file, fileList);
+      let index = this.noticeFileList.findIndex(
+        (item) => item.uid === file.uid
+      );
+      // 删除文件
+      this.noticeFileList.splice(index, 1);
+    },
+    // 表格中下载
+    downloadFile(scope) {
+      // console.log(scope);
+      let file = JSON.parse(scope.row.noticeAtttachment)[0];
+      this.handleNoticePreview(file);
+    },
+    // 点击预览下载文件
+    handleNoticePreview(file) {
+      // console.log(file);
+      getFileStream({ fileName: file.fileName }).then((res) => {
+        const blob = new Blob([res], {
+          // type类型后端返回来的数据中会有，根据自己实际进行修改
+          // 表格下载为 application/xlsx，压缩包为 application/zip等，
+          type: "application/xlsx",
+        }); //excel,pdf等
+        const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象
+        const a = document.createElement("a"); //创建a标签
+        a.style.display = "none";
+        a.href = href; // 指定下载链接
+        a.download = file.name; //指定下载文件名
+        a.click(); //触发下载
+        URL.revokeObjectURL(a.href); //释放URL对象
+      });
+    },
+    handleNoticeExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    beforeNoticeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
     },
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep {
+  .el-dialog {
+    margin-top: 2vh !important;
+    height: 90%;
+    overflow-y: auto;
+  }
+}
+</style>
diff --git a/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue b/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
index 40117892..2c76f49e 100644
--- a/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
@@ -7,15 +7,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="投资项目代码" prop="investProjectCode">
-        <el-input
-          v-model="queryParams.data.investProjectCode"
-          placeholder="请输入投资项目代码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="投资项目名称" prop="investProjectName">
         <el-input
           v-model="queryParams.data.investProjectName"
@@ -79,300 +70,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="资金来源构成" prop="fundingSourceConstitute">
-        <el-input
-          v-model="queryParams.data.fundingSourceConstitute"
-          placeholder="请输入资金来源构成"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标范围及规模" prop="bidScope">
-        <el-input
-          v-model="queryParams.data.bidScope"
-          placeholder="请输入招标范围及规模"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标内容" prop="bidContent">
-        <el-input
-          v-model="queryParams.data.bidContent"
-          placeholder="请输入招标内容"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工期" prop="deliveryTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.deliveryTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择工期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="最高投标限价" prop="maxPriceBid">
-        <el-input
-          v-model="queryParams.data.maxPriceBid"
-          placeholder="请输入最高投标限价"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否接受联合体投标" prop="isConsortiumInvestment">
-        <el-select
-          v-model="queryParams.data.isConsortiumInvestment"
-          placeholder="请选择是否接受联合体投标"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="dict in isConsortiumInvestmentOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="投标资格能力要求" prop="bidCapabilityRequirements">
-        <el-input
-          v-model="queryParams.data.bidCapabilityRequirements"
-          placeholder="请输入投标资格能力要求"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否采用电子招标投标方式" prop="isElectronicBidding">
-        <el-select
-          v-model="queryParams.data.isElectronicBidding"
-          placeholder="请选择是否采用电子招标投标方式"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="dict in isElectronicBiddingOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="获取招标文件的方式" prop="gainBidFileMethod">
-        <el-input
-          v-model="queryParams.data.gainBidFileMethod"
-          placeholder="请输入获取招标文件的方式"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="获取招标文件开始时间" prop="gainFileStartTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.gainFileStartTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择获取招标文件开始时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="获取招标文件截止时间" prop="gainFileEndTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.gainFileEndTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择获取招标文件截止时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="递交投标文件截止时间" prop="deliveryEndTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.deliveryEndTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择递交投标文件截止时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="投标文件递交方式" prop="bidDeliveryFileMethod">
-        <el-input
-          v-model="queryParams.data.bidDeliveryFileMethod"
-          placeholder="请输入投标文件递交方式"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开标方式" prop="bidOpeningMethod">
-        <el-input
-          v-model="queryParams.data.bidOpeningMethod"
-          placeholder="请输入开标方式"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开标时间及地点" prop="bidTimeLocation">
-        <el-input
-          v-model="queryParams.data.bidTimeLocation"
-          placeholder="请输入开标时间及地点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公告发布媒介" prop="announcementReleaseMedia">
-        <el-input
-          v-model="queryParams.data.announcementReleaseMedia"
-          placeholder="请输入公告发布媒介"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标人" prop="tendererName">
-        <el-input
-          v-model="queryParams.data.tendererName"
-          placeholder="请输入招标人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="办公地址" prop="officeAddress">
-        <el-input
-          v-model="queryParams.data.officeAddress"
-          placeholder="请输入办公地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标人联系人" prop="bidderContacts">
-        <el-input
-          v-model="queryParams.data.bidderContacts"
-          placeholder="请输入招标人联系人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="contactsPhone">
-        <el-input
-          v-model="queryParams.data.contactsPhone"
-          placeholder="请输入联系电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标代理机构" prop="biddingAgency">
-        <el-input
-          v-model="queryParams.data.biddingAgency"
-          placeholder="请输入招标代理机构"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标代理机构办公地址" prop="agencyOfficeAddress">
-        <el-input
-          v-model="queryParams.data.agencyOfficeAddress"
-          placeholder="请输入招标代理机构办公地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标代理联系人" prop="bidAgencyContacts">
-        <el-input
-          v-model="queryParams.data.bidAgencyContacts"
-          placeholder="请输入招标代理联系人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标代理联系人联系电话" prop="agencyPhone">
-        <el-input
-          v-model="queryParams.data.agencyPhone"
-          placeholder="请输入招标代理联系人联系电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标监督机构" prop="tenderingSupervisionAgency">
-        <el-input
-          v-model="queryParams.data.tenderingSupervisionAgency"
-          placeholder="请输入招标监督机构"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="supervisionPhone">
-        <el-input
-          v-model="queryParams.data.supervisionPhone"
-          placeholder="请输入联系电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发布责任人" prop="releaseResponsiblePerson">
-        <el-input
-          v-model="queryParams.data.releaseResponsiblePerson"
-          placeholder="请输入发布责任人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="其他依法应当载明的内容" prop="otherLawContents">
-        <el-input
-          v-model="queryParams.data.otherLawContents"
-          placeholder="请输入其他依法应当载明的内容"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="附件" prop="attachment">
-        <el-input
-          v-model="queryParams.data.attachment"
-          placeholder="请输入附件"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目编码" prop="projectCode">
-        <el-input
-          v-model="queryParams.data.projectCode"
-          placeholder="请输入项目编码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item>
         <el-button
           type="cyan"
@@ -420,16 +118,6 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['earlyStage:bidNotice:export']"
-          >导出</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -448,37 +136,63 @@
         label="投资项目代码"
         align="center"
         prop="investProjectCode"
+        width="180"
       />
       <el-table-column
         label="投资项目名称"
         align="center"
         prop="investProjectName"
+        width="180"
       />
       <el-table-column
         label="招标项目名称"
         align="center"
         prop="bidProjectName"
+        width="180"
+      />
+      <el-table-column label="标段" align="center" prop="lotName" width="180" />
+      <el-table-column
+        label="公告性质"
+        align="center"
+        prop="noticeNature"
+        width="180"
       />
-      <el-table-column label="标段" align="center" prop="lotName" />
-      <el-table-column label="公告性质" align="center" prop="noticeNature" />
       <el-table-column
         label="资格审查方式"
         align="center"
         prop="reviewQualificationMethod"
+        width="180"
       />
       <el-table-column
         label="招标项目地点"
         align="center"
         prop="bidProjectLocation"
+        width="180"
+      />
+      <el-table-column
+        label="资金来源"
+        align="center"
+        prop="fundingSource"
+        width="180"
       />
-      <el-table-column label="资金来源" align="center" prop="fundingSource" />
       <el-table-column
         label="资金来源构成"
         align="center"
         prop="fundingSourceConstitute"
+        width="180"
+      />
+      <el-table-column
+        label="招标范围及规模"
+        align="center"
+        prop="bidScope"
+        width="180"
+      />
+      <el-table-column
+        label="招标内容"
+        align="center"
+        prop="bidContent"
+        width="180"
       />
-      <el-table-column label="招标范围及规模" align="center" prop="bidScope" />
-      <el-table-column label="招标内容" align="center" prop="bidContent" />
       <el-table-column
         label="工期"
         align="center"
@@ -495,22 +209,26 @@
         align="center"
         prop="isConsortiumInvestment"
         :formatter="isConsortiumInvestmentFormat"
+        width="180"
       />
       <el-table-column
         label="投标资格能力要求"
         align="center"
         prop="bidCapabilityRequirements"
+        width="180"
       />
       <el-table-column
         label="是否采用电子招标投标方式"
         align="center"
         prop="isElectronicBidding"
         :formatter="isElectronicBiddingFormat"
+        width="180"
       />
       <el-table-column
         label="获取招标文件的方式"
         align="center"
         prop="gainBidFileMethod"
+        width="180"
       />
       <el-table-column
         label="获取招标文件开始时间"
@@ -548,77 +266,131 @@
         label="投标文件递交方式"
         align="center"
         prop="bidDeliveryFileMethod"
+        width="180"
       />
       <el-table-column
         label="开标方式"
         align="center"
         prop="bidOpeningMethod"
+        width="180"
       />
       <el-table-column
         label="开标时间及地点"
         align="center"
         prop="bidTimeLocation"
+        width="180"
       />
       <el-table-column
         label="公告发布媒介"
         align="center"
         prop="announcementReleaseMedia"
+        width="180"
+      />
+      <el-table-column
+        label="招标人"
+        align="center"
+        prop="tendererName"
+        width="180"
+      />
+      <el-table-column
+        label="办公地址"
+        align="center"
+        prop="officeAddress"
+        width="180"
       />
-      <el-table-column label="招标人" align="center" prop="tendererName" />
-      <el-table-column label="办公地址" align="center" prop="officeAddress" />
       <el-table-column
         label="招标人联系人"
         align="center"
         prop="bidderContacts"
+        width="180"
+      />
+      <el-table-column
+        label="联系电话"
+        align="center"
+        prop="contactsPhone"
+        width="180"
       />
-      <el-table-column label="联系电话" align="center" prop="contactsPhone" />
       <el-table-column
         label="招标代理机构"
         align="center"
         prop="biddingAgency"
+        width="180"
       />
       <el-table-column
         label="招标代理机构办公地址"
         align="center"
         prop="agencyOfficeAddress"
+        width="180"
       />
       <el-table-column
         label="招标代理联系人"
         align="center"
         prop="bidAgencyContacts"
+        width="180"
       />
       <el-table-column
         label="招标代理联系人联系电话"
         align="center"
         prop="agencyPhone"
+        width="180"
       />
       <el-table-column
         label="招标监督机构"
         align="center"
         prop="tenderingSupervisionAgency"
+        width="180"
       />
       <el-table-column
         label="联系电话"
         align="center"
         prop="supervisionPhone"
+        width="180"
       />
       <el-table-column
         label="发布责任人"
         align="center"
         prop="releaseResponsiblePerson"
+        width="180"
       />
       <el-table-column
         label="其他依法应当载明的内容"
         align="center"
         prop="otherLawContents"
+        width="180"
+      />
+      <el-table-column
+        label="附件"
+        align="center"
+        prop="attachment"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in JSON.parse(scope.row.attachment)"
+            :key="item + index"
+          >
+            <i class="el-icon-document"></i>
+            {{ item.name }}
+            <i
+              class="el-icon-download"
+              @click="downloadFile(scope)"
+              style="cursor: pointer"
+            ></i>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="项目编码"
+        align="center"
+        prop="projectCode"
+        width="180"
       />
-      <el-table-column label="附件" align="center" prop="attachment" />
-      <el-table-column label="项目编码" align="center" prop="projectCode" />
 
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="180"
       >
         <template slot-scope="scope">
           <el-button
@@ -650,251 +422,391 @@
     />
 
     <!-- 添加或修改招标公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="投资项目代码" prop="investProjectCode">
-          <el-input
-            v-model="form.investProjectCode"
-            placeholder="请输入投资项目代码"
-          />
-        </el-form-item>
-        <el-form-item label="投资项目名称" prop="investProjectName">
-          <el-input
-            v-model="form.investProjectName"
-            placeholder="请输入投资项目名称"
-          />
-        </el-form-item>
-        <el-form-item label="招标项目名称" prop="bidProjectName">
-          <el-input
-            v-model="form.bidProjectName"
-            placeholder="请输入招标项目名称"
-          />
-        </el-form-item>
-        <el-form-item label="标段" prop="lotName">
-          <el-input v-model="form.lotName" placeholder="请输入标段" />
-        </el-form-item>
-        <el-form-item label="公告性质" prop="noticeNature">
-          <el-input v-model="form.noticeNature" placeholder="请输入公告性质" />
-        </el-form-item>
-        <el-form-item label="资格审查方式" prop="reviewQualificationMethod">
-          <el-input
-            v-model="form.reviewQualificationMethod"
-            placeholder="请输入资格审查方式"
-          />
-        </el-form-item>
-        <el-form-item label="招标项目地点" prop="bidProjectLocation">
-          <el-input
-            v-model="form.bidProjectLocation"
-            placeholder="请输入招标项目地点"
-          />
-        </el-form-item>
-        <el-form-item label="资金来源" prop="fundingSource">
-          <el-input v-model="form.fundingSource" placeholder="请输入资金来源" />
-        </el-form-item>
-        <el-form-item label="资金来源构成" prop="fundingSourceConstitute">
-          <el-input
-            v-model="form.fundingSourceConstitute"
-            placeholder="请输入资金来源构成"
-          />
-        </el-form-item>
-        <el-form-item label="招标范围及规模" prop="bidScope">
-          <el-input
-            v-model="form.bidScope"
-            placeholder="请输入招标范围及规模"
-          />
-        </el-form-item>
-        <el-form-item label="招标内容" prop="bidContent">
-          <el-input v-model="form.bidContent" placeholder="请输入招标内容" />
-        </el-form-item>
-        <el-form-item label="工期" prop="deliveryTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.deliveryTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择工期"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="最高投标限价" prop="maxPriceBid">
-          <el-input
-            v-model="form.maxPriceBid"
-            placeholder="请输入最高投标限价"
-          />
-        </el-form-item>
-        <el-form-item label="是否接受联合体投标" prop="isConsortiumInvestment">
-          <el-select
-            v-model="form.isConsortiumInvestment"
-            placeholder="请选择是否接受联合体投标"
-          >
-            <el-option
-              v-for="dict in isConsortiumInvestmentOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="投标资格能力要求" prop="bidCapabilityRequirements">
-          <el-input
-            v-model="form.bidCapabilityRequirements"
-            placeholder="请输入投标资格能力要求"
-          />
-        </el-form-item>
-        <el-form-item
-          label="是否采用电子招标投标方式"
-          prop="isElectronicBidding"
-        >
-          <el-select
-            v-model="form.isElectronicBidding"
-            placeholder="请选择是否采用电子招标投标方式"
-          >
-            <el-option
-              v-for="dict in isElectronicBiddingOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="获取招标文件的方式" prop="gainBidFileMethod">
-          <el-input
-            v-model="form.gainBidFileMethod"
-            placeholder="请输入获取招标文件的方式"
-          />
-        </el-form-item>
-        <el-form-item label="获取招标文件开始时间" prop="gainFileStartTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.gainFileStartTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择获取招标文件开始时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="获取招标文件截止时间" prop="gainFileEndTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.gainFileEndTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择获取招标文件截止时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="递交投标文件截止时间" prop="deliveryEndTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.deliveryEndTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择递交投标文件截止时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="投标文件递交方式" prop="bidDeliveryFileMethod">
-          <el-input
-            v-model="form.bidDeliveryFileMethod"
-            placeholder="请输入投标文件递交方式"
-          />
-        </el-form-item>
-        <el-form-item label="开标方式" prop="bidOpeningMethod">
-          <el-input
-            v-model="form.bidOpeningMethod"
-            placeholder="请输入开标方式"
-          />
-        </el-form-item>
-        <el-form-item label="开标时间及地点" prop="bidTimeLocation">
-          <el-input
-            v-model="form.bidTimeLocation"
-            placeholder="请输入开标时间及地点"
-          />
-        </el-form-item>
-        <el-form-item label="公告发布媒介" prop="announcementReleaseMedia">
-          <el-input
-            v-model="form.announcementReleaseMedia"
-            placeholder="请输入公告发布媒介"
-          />
-        </el-form-item>
-        <el-form-item label="招标人" prop="tendererName">
-          <el-input v-model="form.tendererName" placeholder="请输入招标人" />
-        </el-form-item>
-        <el-form-item label="办公地址" prop="officeAddress">
-          <el-input v-model="form.officeAddress" placeholder="请输入办公地址" />
-        </el-form-item>
-        <el-form-item label="招标人联系人" prop="bidderContacts">
-          <el-input
-            v-model="form.bidderContacts"
-            placeholder="请输入招标人联系人"
-          />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactsPhone">
-          <el-input v-model="form.contactsPhone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="招标代理机构" prop="biddingAgency">
-          <el-input
-            v-model="form.biddingAgency"
-            placeholder="请输入招标代理机构"
-          />
-        </el-form-item>
-        <el-form-item label="招标代理机构办公地址" prop="agencyOfficeAddress">
-          <el-input
-            v-model="form.agencyOfficeAddress"
-            placeholder="请输入招标代理机构办公地址"
-          />
-        </el-form-item>
-        <el-form-item label="招标代理联系人" prop="bidAgencyContacts">
-          <el-input
-            v-model="form.bidAgencyContacts"
-            placeholder="请输入招标代理联系人"
-          />
-        </el-form-item>
-        <el-form-item label="招标代理联系人联系电话" prop="agencyPhone">
-          <el-input
-            v-model="form.agencyPhone"
-            placeholder="请输入招标代理联系人联系电话"
-          />
-        </el-form-item>
-        <el-form-item label="招标监督机构" prop="tenderingSupervisionAgency">
-          <el-input
-            v-model="form.tenderingSupervisionAgency"
-            placeholder="请输入招标监督机构"
-          />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="supervisionPhone">
-          <el-input
-            v-model="form.supervisionPhone"
-            placeholder="请输入联系电话"
-          />
-        </el-form-item>
-        <el-form-item label="发布责任人" prop="releaseResponsiblePerson">
-          <el-input
-            v-model="form.releaseResponsiblePerson"
-            placeholder="请输入发布责任人"
-          />
-        </el-form-item>
-        <el-form-item label="其他依法应当载明的内容" prop="otherLawContents">
-          <el-input
-            v-model="form.otherLawContents"
-            placeholder="请输入其他依法应当载明的内容"
-          />
-        </el-form-item>
-        <el-form-item label="附件" prop="attachment">
-          <el-input v-model="form.attachment" placeholder="请输入附件" />
-        </el-form-item>
-        <el-form-item label="项目编码" prop="projectCode">
-          <el-input v-model="form.projectCode" placeholder="请输入项目编码" />
-        </el-form-item>
-      </el-form>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1500px"
+      append-to-body
+      @close="close"
+    >
+      <el-row :gutter="15">
+        <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+          <el-col :span="8">
+            <el-form-item label="投资项目代码" prop="investProjectCode">
+              <el-input
+                v-model="form.investProjectCode"
+                placeholder="请输入投资项目代码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="投资项目名称" prop="investProjectName">
+              <el-input
+                v-model="form.investProjectName"
+                placeholder="请输入投资项目名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="招标项目名称" prop="bidProjectName">
+              <el-input
+                v-model="form.bidProjectName"
+                placeholder="请输入招标项目名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="标段" prop="lotName">
+              <el-input v-model="form.lotName" placeholder="请输入标段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公告性质" prop="noticeNature">
+              <el-input
+                v-model="form.noticeNature"
+                placeholder="请输入公告性质"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="资格审查方式" prop="reviewQualificationMethod">
+              <el-input
+                v-model="form.reviewQualificationMethod"
+                placeholder="请输入资格审查方式"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="招标项目地点" prop="bidProjectLocation">
+              <el-input
+                v-model="form.bidProjectLocation"
+                placeholder="请输入招标项目地点"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="资金来源" prop="fundingSource">
+              <el-input
+                v-model="form.fundingSource"
+                placeholder="请输入资金来源"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="资金来源构成" prop="fundingSourceConstitute">
+              <el-input
+                v-model="form.fundingSourceConstitute"
+                placeholder="请输入资金来源构成"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="招标范围及规模" prop="bidScope">
+              <el-input
+                v-model="form.bidScope"
+                placeholder="请输入招标范围及规模"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="招标内容" prop="bidContent">
+              <el-input
+                v-model="form.bidContent"
+                placeholder="请输入招标内容"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工期" prop="deliveryTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.deliveryTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择工期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="最高投标限价" prop="maxPriceBid">
+              <el-input
+                v-model="form.maxPriceBid"
+                placeholder="请输入最高投标限价"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="是否接受联合体投标"
+              prop="isConsortiumInvestment"
+            >
+              <el-select
+                v-model="form.isConsortiumInvestment"
+                placeholder="请选择是否接受联合体投标"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in isConsortiumInvestmentOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="投标资格能力要求"
+              prop="bidCapabilityRequirements"
+            >
+              <el-input
+                v-model="form.bidCapabilityRequirements"
+                placeholder="请输入投标资格能力要求"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="是否采用电子招标投标方式"
+              prop="isElectronicBidding"
+            >
+              <el-select
+                v-model="form.isElectronicBidding"
+                placeholder="请选择是否采用电子招标投标方式"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in isElectronicBiddingOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="获取招标文件的方式" prop="gainBidFileMethod">
+              <el-input
+                v-model="form.gainBidFileMethod"
+                placeholder="请输入获取招标文件的方式"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="获取招标文件开始时间" prop="gainFileStartTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.gainFileStartTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择获取招标文件开始时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="获取招标文件截止时间" prop="gainFileEndTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.gainFileEndTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择获取招标文件截止时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="递交投标文件截止时间" prop="deliveryEndTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.deliveryEndTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择递交投标文件截止时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="投标文件递交方式" prop="bidDeliveryFileMethod">
+              <el-input
+                v-model="form.bidDeliveryFileMethod"
+                placeholder="请输入投标文件递交方式"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开标方式" prop="bidOpeningMethod">
+              <el-input
+                v-model="form.bidOpeningMethod"
+                placeholder="请输入开标方式"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开标时间及地点" prop="bidTimeLocation">
+              <el-input
+                v-model="form.bidTimeLocation"
+                placeholder="请输入开标时间及地点"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公告发布媒介" prop="announcementReleaseMedia">
+              <el-input
+                v-model="form.announcementReleaseMedia"
+                placeholder="请输入公告发布媒介"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="招标人" prop="tendererName">
+              <el-input
+                v-model="form.tendererName"
+                placeholder="请输入招标人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="办公地址" prop="officeAddress">
+              <el-input
+                v-model="form.officeAddress"
+                placeholder="请输入办公地址"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="招标人联系人" prop="bidderContacts">
+              <el-input
+                v-model="form.bidderContacts"
+                placeholder="请输入招标人联系人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系电话" prop="contactsPhone">
+              <el-input
+                v-model="form.contactsPhone"
+                placeholder="请输入联系电话"
+              />
+            </el-form-item>
+            <el-col :span="8"> </el-col>
+            <el-form-item label="招标代理机构" prop="biddingAgency">
+              <el-input
+                v-model="form.biddingAgency"
+                placeholder="请输入招标代理机构"
+              />
+            </el-form-item>
+            <el-col :span="8"> </el-col>
+            <el-form-item
+              label="招标代理机构办公地址"
+              prop="agencyOfficeAddress"
+            >
+              <el-input
+                v-model="form.agencyOfficeAddress"
+                placeholder="请输入招标代理机构办公地址"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="招标代理联系人" prop="bidAgencyContacts">
+              <el-input
+                v-model="form.bidAgencyContacts"
+                placeholder="请输入招标代理联系人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="招标代理联系人联系电话" prop="agencyPhone">
+              <el-input
+                v-model="form.agencyPhone"
+                placeholder="请输入招标代理联系人联系电话"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="招标监督机构"
+              prop="tenderingSupervisionAgency"
+            >
+              <el-input
+                v-model="form.tenderingSupervisionAgency"
+                placeholder="请输入招标监督机构"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系电话" prop="supervisionPhone">
+              <el-input
+                v-model="form.supervisionPhone"
+                placeholder="请输入联系电话"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发布责任人" prop="releaseResponsiblePerson">
+              <el-input
+                v-model="form.releaseResponsiblePerson"
+                placeholder="请输入发布责任人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="其他依法应当载明的内容"
+              prop="otherLawContents"
+            >
+              <el-input
+                v-model="form.otherLawContents"
+                placeholder="请输入其他依法应当载明的内容"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="附件" prop="attachment">
+              <!-- <el-input v-model="form.attachment" placeholder="请输入附件" /> -->
+              <el-upload
+                class="upload-demo"
+                action="http://127.0.0.1/thinking/common/upload"
+                :headers="headers"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :before-remove="beforeRemove"
+                multiple
+                :on-exceed="handleExceed"
+                :on-success="submitUpload"
+                :file-list="fileList"
+              >
+                <el-button size="small" type="primary" plain>
+                  <i class="el-icon-upload el-icon--right"></i>
+                  点击上传
+                </el-button>
+                <div slot="tip" class="el-upload__tip">
+                  支持jpg/png/pdf/word/excel文件等，不超过100M
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目编码" prop="projectCode">
+              <el-input
+                v-model="form.projectCode"
+                placeholder="请输入项目编码"
+              />
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -912,6 +824,8 @@ import {
   updateBidNotice,
   exportBidNotice,
 } from "@/api/earlyStage/bidNotice";
+import { getToken } from "@/utils/auth";
+import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "BidNotice",
@@ -997,6 +911,12 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 附件
+      fileList: [],
+      // 请求头
+      headers: {
+        jianwei: "jwtech " + getToken(),
+      },
     };
   },
   created() {
@@ -1095,6 +1015,7 @@ export default {
         owerDept: null,
         remark: null,
       };
+      this.fileList = [];
       this.resetForm("form");
     },
     // 查询表单重置
@@ -1181,6 +1102,9 @@ export default {
       const id = row.id || this.ids;
       getBidNotice(id).then((response) => {
         this.form = response.data;
+        if (response.data.attachment) {
+          this.fileList = JSON.parse(response.data.attachment);
+        }
         this.open = true;
         this.title = "修改招标公告";
       });
@@ -1188,6 +1112,8 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
+        // 附件
+        this.form.attachment = JSON.stringify(this.fileList);
         if (valid) {
           if (this.form.id != null) {
             updateBidNotice(this.form).then((response) => {
@@ -1210,6 +1136,14 @@ export default {
         }
       });
     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    // 关闭弹窗
+    close() {
+      this.reset();
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -1231,28 +1165,64 @@ export default {
         this.$message.warning("请选择要删除的数据！！");
       }
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      let message = "是否确认导出所有的数据项?";
-      if (this.ids) {
-        message = "是否确认导出选中的数据项?";
-        queryParams.ids = this.ids;
-      }
-      this.$confirm(message, "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportBidNotice(queryParams);
-        })
-        .then((response) => {
-          this.downloadFile(response, true, response.msg);
-          // this.download(response.msg);
-        })
-        .catch(function () {});
+    submitUpload(_, fileList) {
+      console.log("fileList", fileList);
+      this.fileList.push({
+        name: fileList.name,
+        fileName: fileList.response.fileName,
+        url: fileList.response.url,
+        uid: fileList.uid,
+      });
+    },
+    handleRemove(file, fileList) {
+      // console.log(file, fileList);
+      let index = this.fileList.findIndex((item) => item.uid === file.uid);
+      // 删除文件
+      this.fileList.splice(index, 1);
+    },
+    // 表格中下载
+    downloadFile(scope) {
+      // console.log(scope);
+      let file = JSON.parse(scope.row.attachment)[0];
+      this.handlePreview(file);
+    },
+    // 点击预览下载文件
+    handlePreview(file) {
+      // console.log(file);
+      getFileStream({ fileName: file.fileName }).then((res) => {
+        const blob = new Blob([res], {
+          // type类型后端返回来的数据中会有，根据自己实际进行修改
+          // 表格下载为 application/xlsx，压缩包为 application/zip等，
+          type: "application/xlsx",
+        }); //excel,pdf等
+        const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象
+        const a = document.createElement("a"); //创建a标签
+        a.style.display = "none";
+        a.href = href; // 指定下载链接
+        a.download = file.name; //指定下载文件名
+        a.click(); //触发下载
+        URL.revokeObjectURL(a.href); //释放URL对象
+      });
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
     },
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep {
+  .el-dialog {
+    margin-top: 2vh !important;
+    height: 90%;
+    overflow-y: auto;
+  }
+}
+</style>
diff --git a/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue b/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
index 63ac2de2..7a343799 100644
--- a/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
@@ -97,13 +97,25 @@
         align="center"
         prop="isConsolidatedBidding"
         :formatter="isConsolidatedBiddingFormat"
+        width="180"
+      />
+      <el-table-column
+        label="招标性质"
+        align="center"
+        prop="bidNature"
+        width="180"
+      />
+      <el-table-column
+        label="招标计划名称"
+        align="center"
+        prop="bidPlanName"
+        width="180"
       />
-      <el-table-column label="招标性质" align="center" prop="bidNature" />
-      <el-table-column label="招标计划名称" align="center" prop="bidPlanName" />
       <el-table-column
         label="招标计划发布人"
         align="center"
         prop="bidPlanPerson"
+        width="180"
       />
       <el-table-column
         label="发布时间"
@@ -115,12 +127,40 @@
           <span>{{ parseTime(scope.row.reportTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="招标人名称" align="center" prop="tendererName" />
+      <el-table-column
+        label="招标人名称"
+        align="center"
+        prop="tendererName"
+        width="180"
+      />
       <el-table-column
         label="招标人统一社会信用代码"
         align="center"
         prop="socialCreditCode"
+        width="180"
       />
+
+      <el-table-column
+        label="附件"
+        align="center"
+        prop="bidAttachment"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in JSON.parse(scope.row.bidAttachment)"
+            :key="item + index"
+          >
+            <i class="el-icon-document"></i>
+            {{ item.name }}
+            <i
+              class="el-icon-download"
+              @click="downloadFile(scope)"
+              style="cursor: pointer"
+            ></i>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -167,23 +207,28 @@
     />
 
     <!-- 添加或修改招标计划基本信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="90%"
+      append-to-body
+      @close="close"
+    >
       <!-- 招标计划基本信息 -->
-      <el-divider content-position="left" class="divider"
-        >招标计划基本信息</el-divider
-      >
+      <el-divider content-position="left"> 招标计划基本信息 </el-divider>
       <el-row :gutter="15">
         <el-form
           ref="baseForm"
           :model="baseForm"
           :rules="rules"
-          label-width="150px"
+          label-width="170px"
         >
           <el-col :span="12">
             <el-form-item label="是否合并招标" prop="isConsolidatedBidding">
               <el-select
                 v-model="baseForm.isConsolidatedBidding"
                 placeholder="请选择是否合并招标"
+                style="width: 100%"
               >
                 <el-option
                   v-for="dict in isConsolidatedBiddingOptions"
@@ -223,7 +268,7 @@
               <el-date-picker
                 clearable
                 size="small"
-                style="width: 200px"
+                style="width: 100%"
                 v-model="baseForm.reportTime"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -258,10 +303,30 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="附件" prop="bidAttachment">
-              <el-input
+              <!-- <el-input
                 v-model="baseForm.bidAttachment"
                 placeholder="请输入附件"
-              />
+              /> -->
+              <el-upload
+                class="upload-demo"
+                action="http://127.0.0.1/thinking/common/upload"
+                :headers="headers"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :before-remove="beforeRemove"
+                multiple
+                :on-exceed="handleExceed"
+                :on-success="submitUpload"
+                :file-list="fileList"
+              >
+                <el-button size="small" type="primary" plain>
+                  <i class="el-icon-upload el-icon--right"></i>
+                  点击上传
+                </el-button>
+                <div slot="tip" class="el-upload__tip">
+                  支持jpg/png/pdf/word/excel文件等，不超过100M
+                </div>
+              </el-upload>
             </el-form-item>
           </el-col>
         </el-form>
@@ -269,7 +334,7 @@
       <!-- 计划明细内容 -->
       <el-divider content-position="left">计划明细内容</el-divider>
       <el-row :gutter="15">
-        <el-form ref="detailsForm" :model="detailsForm" label-width="150px">
+        <el-form ref="detailsForm" :model="detailsForm" label-width="170px">
           <el-col :span="12">
             <el-form-item label="招标项目名称" prop="bidProjectName">
               <el-input
@@ -279,14 +344,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              label="是否依法必招项目(0:否，1：是)"
-              prop="isMustProject"
-            >
-              <el-input
+            <el-form-item label="是否依法必招项目" prop="isMustProject">
+              <el-select
                 v-model="detailsForm.isMustProject"
-                placeholder="请输入是否依法必招项目(0:否，1：是)"
-              />
+                placeholder="请输入是否依法必招项目"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in isMustProject"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -302,8 +372,14 @@
               <el-select
                 v-model="detailsForm.bidType"
                 placeholder="请选择招标项目类型"
+                style="width: 100%"
               >
-                <el-option label="请选择字典生成" value="" />
+                <el-option
+                  v-for="dict in bidType"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -347,7 +423,7 @@
               <el-date-picker
                 clearable
                 size="small"
-                style="width: 200px"
+                style="width: 100%"
                 v-model="detailsForm.bidNoticeTime"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -372,14 +448,6 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="招标计划ID" prop="bidId">
-              <el-input
-                v-model="detailsForm.bidId"
-                placeholder="请输入招标计划ID"
-              />
-            </el-form-item>
-          </el-col>
         </el-form>
       </el-row>
 
@@ -400,6 +468,8 @@ import {
   addBidInfoVO,
   updateBidInfoVO,
 } from "@/api/earlyStage/bidInfoVO";
+import { getToken } from "@/utils/auth";
+import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "BidInfo",
@@ -426,6 +496,10 @@ export default {
       open: false,
       // 是否合并招标字典
       isConsolidatedBiddingOptions: [],
+      // 是否依法必招项目字典
+      isMustProject: [],
+      // 招标项目类型字典
+      bidType: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -478,12 +552,23 @@ export default {
       detailsForm: {},
       // 表单校验
       rules: {},
+      // 附件
+      fileList: [],
+      // 请求头
+      headers: {
+        jianwei: "jwtech " + getToken(),
+      },
     };
   },
   created() {
     this.getList();
-    this.getDicts("yes_no").then((response) => {
+    this.getDicts("whether").then((response) => {
+      // console.log("444444", response);
       this.isConsolidatedBiddingOptions = response.data;
+      this.isMustProject = response.data;
+    });
+    this.getDicts("Bid_type").then((response) => {
+      this.bidType = response.data;
     });
   },
   // 父组件  利用axios请求得到的值  传送到子组件，要监听，否则初始渲染时为空
@@ -511,11 +596,6 @@ export default {
         row.isConsolidatedBidding
       );
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
       this.baseForm = {
@@ -561,7 +641,7 @@ export default {
         owerDept: null,
         remark: null,
       };
-
+      this.fileList = [];
       this.resetForm("baseForm");
       this.resetForm("detailsForm");
     },
@@ -610,17 +690,21 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
       this.open = true;
       this.title = "添加招标计划基本信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       const id = row.id || this.ids;
       getBidInfoVO(id).then((response) => {
-        // this.baseForm = response.data;
-        console.log("666666666666", response);
+        // console.log("666666666666", response);
+        this.baseForm = response.data.specialProjectBidInfo;
+        if (response.data.specialProjectBidInfo.bidAttachment) {
+          this.fileList = JSON.parse(
+            response.data.specialProjectBidInfo.bidAttachment
+          );
+        }
+        this.detailsForm = response.data.projectBidDetails;
         this.open = true;
         this.title = "修改招标计划基本信息";
       });
@@ -629,6 +713,8 @@ export default {
     submitForm() {
       this.$refs["baseForm"].validate((valid) => {
         this.$refs["detailsForm"].validate((valid2) => {
+          // 附件
+          this.baseForm.bidAttachment = JSON.stringify(this.fileList);
           if (valid && valid2) {
             if (this.baseForm.id != null || this.detailsForm.id != null) {
               updateBidInfoVO({
@@ -659,6 +745,14 @@ export default {
         });
       });
     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    // 关闭弹窗
+    close() {
+      this.reset();
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -680,6 +774,56 @@ export default {
         this.$message.warning("请选择要删除的数据！！");
       }
     },
+
+    submitUpload(_, fileList) {
+      console.log("fileList", fileList);
+      this.fileList.push({
+        name: fileList.name,
+        fileName: fileList.response.fileName,
+        url: fileList.response.url,
+        uid: fileList.uid,
+      });
+    },
+    handleRemove(file, fileList) {
+      // console.log(file, fileList);
+      let index = this.fileList.findIndex((item) => item.uid === file.uid);
+      // 删除文件
+      this.fileList.splice(index, 1);
+    },
+    // 表格中下载
+    downloadFile(scope) {
+      // console.log(scope);
+      let file = JSON.parse(scope.row.bidAttachment)[0];
+      this.handlePreview(file);
+    },
+    // 点击预览下载文件
+    handlePreview(file) {
+      // console.log(file);
+      getFileStream({ fileName: file.fileName }).then((res) => {
+        const blob = new Blob([res], {
+          // type类型后端返回来的数据中会有，根据自己实际进行修改
+          // 表格下载为 application/xlsx，压缩包为 application/zip等，
+          type: "application/xlsx",
+        }); //excel,pdf等
+        const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象
+        const a = document.createElement("a"); //创建a标签
+        a.style.display = "none";
+        a.href = href; // 指定下载链接
+        a.download = file.name; //指定下载文件名
+        a.click(); //触发下载
+        URL.revokeObjectURL(a.href); //释放URL对象
+      });
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
   },
 };
 </script>
diff --git a/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue b/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
index 40ec1860..e6a9ab34 100644
--- a/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
@@ -7,192 +7,54 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="中标候选人名称" prop="winningCandidateName">
+      <el-form-item label="投资项目代码" prop="investProjectCode">
         <el-input
-          v-model="queryParams.data.winningCandidateName"
-          placeholder="请输入中标候选人名称"
+          v-model="queryParams.data.investProjectCode"
+          placeholder="请输入投资项目代码"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="中标候选人代码" prop="winningCandidateCode">
+      <el-form-item label="投资项目名称" prop="investProjectName">
         <el-input
-          v-model="queryParams.data.winningCandidateCode"
-          placeholder="请输入中标候选人代码"
+          v-model="queryParams.data.investProjectName"
+          placeholder="请输入投资项目名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="排名" prop="ranking">
+      <el-form-item label="招标项目名称" prop="bidProjectName">
         <el-input
-          v-model="queryParams.data.ranking"
-          placeholder="请输入排名"
+          v-model="queryParams.data.bidProjectName"
+          placeholder="请输入招标项目名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="投标报价" prop="bidQuotation">
-        <el-input
-          v-model="queryParams.data.bidQuotation"
-          placeholder="请输入投标报价"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="费率" prop="rate">
-        <el-input
-          v-model="queryParams.data.rate"
-          placeholder="请输入费率"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="质量" prop="quality">
-        <el-input
-          v-model="queryParams.data.quality"
-          placeholder="请输入质量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工期" prop="deliveryTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.deliveryTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择工期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item
-        label="中标候选人响应招标文件的资格能力条件"
-        prop="bidCapabilityConditions"
-      >
-        <el-input
-          v-model="queryParams.data.bidCapabilityConditions"
-          placeholder="请输入中标候选人响应招标文件的资格能力条件"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="评标情况" prop="evaluationSituation">
-        <el-input
-          v-model="queryParams.data.evaluationSituation"
-          placeholder="请输入评标情况"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="拟派项目负责人姓名" prop="projectLeader">
-        <el-input
-          v-model="queryParams.data.projectLeader"
-          placeholder="请输入拟派项目负责人姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item
-        label="拟派项目负责人执业资格"
-        prop="projectLeaderQualification"
-      >
-        <el-input
-          v-model="queryParams.data.projectLeaderQualification"
-          placeholder="请输入拟派项目负责人执业资格"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公示ID" prop="noticeId">
-        <el-input
-          v-model="queryParams.data.noticeId"
-          placeholder="请输入公示ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目编号" prop="proNo">
-        <el-input
-          v-model="queryParams.data.proNo"
-          placeholder="请输入项目编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createUid">
-        <el-input
-          v-model="queryParams.data.createUid"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.createTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updateUid">
-        <el-input
-          v-model="queryParams.data.updateUid"
-          placeholder="请输入更新人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.updateTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择更新时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="数源部门" prop="owerDept">
+
+      <el-form-item label="公示名称" prop="noticeName">
         <el-input
-          v-model="queryParams.data.owerDept"
-          placeholder="请输入数源部门"
+          v-model="queryParams.data.noticeName"
+          placeholder="请输入公示名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
+
+      <el-form-item label="招标人" prop="tendererName">
         <el-input
-          v-model="queryParams.data.remark"
-          placeholder="请输入备注"
+          v-model="queryParams.data.tendererName"
+          placeholder="请输入招标人"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item>
         <el-button
           type="cyan"
@@ -214,7 +76,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['earlyStage:bidWinner:add']"
+          v-hasPermi="['earlyStage:bidWinning:add']"
           >新增</el-button
         >
       </el-col>
@@ -225,7 +87,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['earlyStage:bidWinner:edit']"
+          v-hasPermi="['earlyStage:bidWinning:edit']"
           >修改</el-button
         >
       </el-col>
@@ -236,20 +98,10 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['earlyStage:bidWinner:remove']"
+          v-hasPermi="['earlyStage:bidWinning:remove']"
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['earlyStage:bidWinner:export']"
-          >导出</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -258,86 +110,125 @@
 
     <el-table
       v-loading="loading"
-      :data="bidWinnerList"
+      :data="bidWinningList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center" />
 
       <el-table-column
-        label="中标候选人名称"
+        label="投资项目代码"
+        align="center"
+        prop="investProjectCode"
+        width="180"
+      />
+      <el-table-column
+        label="投资项目名称"
         align="center"
-        prop="winningCandidateName"
+        prop="investProjectName"
+        width="180"
       />
       <el-table-column
-        label="中标候选人代码"
+        label="招标项目名称"
         align="center"
-        prop="winningCandidateCode"
+        prop="bidProjectName"
+        width="180"
       />
-      <el-table-column label="排名" align="center" prop="ranking" />
-      <el-table-column label="投标报价" align="center" prop="bidQuotation" />
-      <el-table-column label="费率" align="center" prop="rate" />
-      <el-table-column label="质量" align="center" prop="quality" />
+      <el-table-column label="标段" align="center" prop="lotName" width="180" />
       <el-table-column
-        label="工期"
+        label="公示名称"
         align="center"
-        prop="deliveryTime"
+        prop="noticeName"
+        width="180"
+      />
+      <el-table-column
+        label="开标日期"
+        align="center"
+        prop="bidOpenDate"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deliveryTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.bidOpenDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="中标候选人响应招标文件的资格能力条件"
+        label="评标情况"
         align="center"
-        prop="bidCapabilityConditions"
+        prop="evaluationSituation"
+        width="180"
       />
       <el-table-column
-        label="评标情况"
+        label="招标人"
         align="center"
-        prop="evaluationSituation"
+        prop="tendererName"
+        width="180"
       />
       <el-table-column
-        label="拟派项目负责人姓名"
+        label="办公地址"
         align="center"
-        prop="projectLeader"
+        prop="officeAddress"
+        width="180"
       />
       <el-table-column
-        label="拟派项目负责人执业资格"
+        label="招标人联系人"
         align="center"
-        prop="projectLeaderQualification"
+        prop="bidderContacts"
+        width="180"
       />
-      <el-table-column label="公示ID" align="center" prop="noticeId" />
-      <el-table-column label="项目编号" align="center" prop="proNo" />
-      <el-table-column label="创建人" align="center" prop="createUid" />
       <el-table-column
-        label="创建时间"
+        label="联系电话"
         align="center"
-        prop="createTime"
+        prop="contactsPhone"
+        width="180"
+      />
+      <el-table-column
+        label="招标投标监督部门"
+        align="center"
+        prop="tenderingSupervisionDept"
+        width="180"
+      />
+      <el-table-column
+        label="联系电话"
+        align="center"
+        prop="deptPhone"
+        width="180"
+      />
+      <el-table-column
+        label="联系地址"
+        align="center"
+        prop="deptAddress"
+        width="180"
+      />
+      <el-table-column
+        label="公示开始时间"
+        align="center"
+        prop="publicityStartTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+          <span>{{
+            parseTime(scope.row.publicityStartTime, "{y}-{m}-{d}")
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updateUid" />
       <el-table-column
-        label="更新时间"
+        label="公示结束日期"
         align="center"
-        prop="updateTime"
+        prop="publicityEndTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
+          <span>{{
+            parseTime(scope.row.publicityEndTime, "{y}-{m}-{d}")
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="数源部门" align="center" prop="owerDept" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="公示ID" align="center" prop="noticeId" />
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="180"
       >
         <template slot-scope="scope">
           <el-button
@@ -345,7 +236,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['earlyStage:bidWinner:edit']"
+            v-hasPermi="['earlyStage:bidWinning:edit']"
             >修改</el-button
           >
           <el-button
@@ -353,7 +244,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['earlyStage:bidWinner:remove']"
+            v-hasPermi="['earlyStage:bidWinning:remove']"
             >删除</el-button
           >
         </template>
@@ -368,94 +259,298 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改中标候选人对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="中标候选人名称" prop="winningCandidateName">
-          <el-input
-            v-model="form.winningCandidateName"
-            placeholder="请输入中标候选人名称"
-          />
-        </el-form-item>
-        <el-form-item label="中标候选人代码" prop="winningCandidateCode">
-          <el-input
-            v-model="form.winningCandidateCode"
-            placeholder="请输入中标候选人代码"
-          />
-        </el-form-item>
-        <el-form-item label="排名" prop="ranking">
-          <el-input v-model="form.ranking" placeholder="请输入排名" />
-        </el-form-item>
-        <el-form-item label="投标报价" prop="bidQuotation">
-          <el-input v-model="form.bidQuotation" placeholder="请输入投标报价" />
-        </el-form-item>
-        <el-form-item label="费率" prop="rate">
-          <el-input v-model="form.rate" placeholder="请输入费率" />
-        </el-form-item>
-        <el-form-item label="质量" prop="quality">
-          <el-input v-model="form.quality" placeholder="请输入质量" />
-        </el-form-item>
-        <el-form-item label="工期" prop="deliveryTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.deliveryTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择工期"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item
-          label="中标候选人响应招标文件的资格能力条件"
-          prop="bidCapabilityConditions"
+    <!-- 添加或修改中标候选人公示基本信息对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="90%"
+      append-to-body
+      @close="close"
+    >
+      <!-- 公示基本信息表 -->
+      <el-divider content-position="left"> 公示基本信息表 </el-divider>
+      <el-row :gutter="15">
+        <el-form
+          ref="publicityForm"
+          :model="publicityForm"
+          :rules="rules"
+          label-width="150px"
         >
-          <el-input
-            v-model="form.bidCapabilityConditions"
-            placeholder="请输入中标候选人响应招标文件的资格能力条件"
-          />
-        </el-form-item>
-        <el-form-item label="评标情况" prop="evaluationSituation">
-          <el-input
-            v-model="form.evaluationSituation"
-            placeholder="请输入评标情况"
-          />
-        </el-form-item>
-        <el-form-item label="拟派项目负责人姓名" prop="projectLeader">
-          <el-input
-            v-model="form.projectLeader"
-            placeholder="请输入拟派项目负责人姓名"
-          />
-        </el-form-item>
-        <el-form-item
-          label="拟派项目负责人执业资格"
-          prop="projectLeaderQualification"
+          <el-col :span="12">
+            <el-form-item label="投资项目代码" prop="investProjectCode">
+              <el-input
+                v-model="publicityForm.investProjectCode"
+                placeholder="请输入投资项目代码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="投资项目名称" prop="investProjectName">
+              <el-input
+                v-model="publicityForm.investProjectName"
+                placeholder="请输入投资项目名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="招标项目名称" prop="bidProjectName">
+              <el-input
+                v-model="publicityForm.bidProjectName"
+                placeholder="请输入招标项目名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标段" prop="lotName">
+              <el-input
+                v-model="publicityForm.lotName"
+                placeholder="请输入标段"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公示名称" prop="noticeName">
+              <el-input
+                v-model="publicityForm.noticeName"
+                placeholder="请输入公示名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开标日期" prop="bidOpenDate">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="publicityForm.bidOpenDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择开标日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评标情况" prop="evaluationSituation">
+              <el-input
+                v-model="publicityForm.evaluationSituation"
+                placeholder="请输入评标情况"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="招标人" prop="tendererName">
+              <el-input
+                v-model="publicityForm.tendererName"
+                placeholder="请输入招标人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="办公地址" prop="officeAddress">
+              <el-input
+                v-model="publicityForm.officeAddress"
+                placeholder="请输入办公地址"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="招标人联系人" prop="bidderContacts">
+              <el-input
+                v-model="publicityForm.bidderContacts"
+                placeholder="请输入招标人联系人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="contactsPhone">
+              <el-input
+                v-model="publicityForm.contactsPhone"
+                placeholder="请输入联系电话"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="招标投标监督部门"
+              prop="tenderingSupervisionDept"
+            >
+              <el-input
+                v-model="publicityForm.tenderingSupervisionDept"
+                placeholder="请输入招标投标监督部门"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="deptPhone">
+              <el-input
+                v-model="publicityForm.deptPhone"
+                placeholder="请输入联系电话"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系地址" prop="deptAddress">
+              <el-input
+                v-model="publicityForm.deptAddress"
+                placeholder="请输入联系地址"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公示开始时间" prop="publicityStartTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="publicityForm.publicityStartTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择公示开始时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公示结束日期" prop="publicityEndTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="publicityForm.publicityEndTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择公示结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目编码" prop="projectCode">
+              <el-input
+                v-model="publicityForm.projectCode"
+                placeholder="请输入项目编码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="附件地址" prop="attachmentAddress">
+              <el-input
+                v-model="publicityForm.attachmentAddress"
+                placeholder="请输入附件地址"
+              />
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <!-- 中标候选人表 -->
+      <el-divider content-position="left"> 中标候选人表 </el-divider>
+      <el-row :gutter="15">
+        <el-form
+          ref="candidateForm"
+          :model="candidateForm"
+          :rules="rules"
+          label-width="180px"
         >
-          <el-input
-            v-model="form.projectLeaderQualification"
-            placeholder="请输入拟派项目负责人执业资格"
-          />
-        </el-form-item>
-        <el-form-item label="公示ID" prop="noticeId">
-          <el-input v-model="form.noticeId" placeholder="请输入公示ID" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="proNo">
-          <el-input v-model="form.proNo" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUid">
-          <el-input v-model="form.createUid" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="更新人" prop="updateUid">
-          <el-input v-model="form.updateUid" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="数源部门" prop="owerDept">
-          <el-input v-model="form.owerDept" placeholder="请输入数源部门" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
+          <el-col :span="12">
+            <el-form-item label="中标候选人名称" prop="winningCandidateName">
+              <el-input
+                v-model="candidateForm.winningCandidateName"
+                placeholder="请输入中标候选人名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中标候选人代码" prop="winningCandidateCode">
+              <el-input
+                v-model="candidateForm.winningCandidateCode"
+                placeholder="请输入中标候选人代码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="排名" prop="ranking">
+              <el-input
+                v-model="candidateForm.ranking"
+                placeholder="请输入排名"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="投标报价" prop="bidQuotation">
+              <el-input
+                v-model="candidateForm.bidQuotation"
+                placeholder="请输入投标报价"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="费率" prop="rate">
+              <el-input v-model="candidateForm.rate" placeholder="请输入费率" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质量" prop="quality">
+              <el-input
+                v-model="candidateForm.quality"
+                placeholder="请输入质量"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工期" prop="deliveryTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="candidateForm.deliveryTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择工期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="中标候选人响应招标文件的资格能力条件"
+              prop="bidCapabilityConditions"
+            >
+              <el-input
+                v-model="candidateForm.bidCapabilityConditions"
+                placeholder="请输入中标候选人响应招标文件的资格能力条件"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评标情况" prop="evaluationSituation">
+              <el-input
+                v-model="candidateForm.evaluationSituation"
+                placeholder="请输入评标情况"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="拟派项目负责人姓名" prop="projectLeader">
+              <el-input
+                v-model="candidateForm.projectLeader"
+                placeholder="请输入拟派项目负责人姓名"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="拟派项目负责人执业资格"
+              prop="projectLeaderQualification"
+            >
+              <el-input
+                v-model="candidateForm.projectLeaderQualification"
+                placeholder="请输入拟派项目负责人执业资格"
+              />
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -466,16 +561,16 @@
 
 <script>
 import {
-  listBidWinner,
-  getBidWinner,
-  delBidWinner,
-  addBidWinner,
-  updateBidWinner,
-  exportBidWinner,
-} from "@/api/earlyStage/bidWinner";
+  listBidWinning,
+  getBidWinning,
+  getBidWinningVO,
+  delBidWinningVO,
+  addBidWinningVO,
+  updateBidWinningVO,
+} from "@/api/earlyStage/bidWinningVO";
 
 export default {
-  name: "BidWinner",
+  name: "BidWinning",
   props: ["proNo"],
   data() {
     return {
@@ -491,8 +586,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 中标候选人表格数据
-      bidWinnerList: [],
+      // 中标候选人公示基本信息表格数据
+      bidWinningList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -503,18 +598,25 @@ export default {
         pageSize: 10,
         ids: null,
         data: {
-          winningCandidateName: null,
-          winningCandidateCode: null,
-          ranking: null,
-          bidQuotation: null,
-          rate: null,
-          quality: null,
-          deliveryTime: null,
-          bidCapabilityConditions: null,
+          investProjectCode: null,
+          investProjectName: null,
+          bidProjectName: null,
+          lotName: null,
+          noticeName: null,
+          bidOpenDate: null,
           evaluationSituation: null,
-          projectLeader: null,
-          projectLeaderQualification: null,
+          tendererName: null,
+          officeAddress: null,
+          bidderContacts: null,
+          contactsPhone: null,
+          tenderingSupervisionDept: null,
+          deptPhone: null,
+          deptAddress: null,
+          publicityStartTime: null,
+          publicityEndTime: null,
           noticeId: null,
+          projectCode: null,
+          attachmentAddress: null,
           proNo: null,
           createUid: null,
           createTime: null,
@@ -524,8 +626,10 @@ export default {
           remark: null,
         },
       },
-      // 表单参数
-      form: {},
+      // 公式基础信息表单参数
+      publicityForm: {},
+      // 候选人信息表
+      candidateForm: {},
       // 表单校验
       rules: {},
     };
@@ -541,24 +645,48 @@ export default {
     },
   },
   methods: {
-    /** 查询中标候选人列表 */
+    /** 查询中标候选人公示基本信息列表 */
     getList() {
       this.loading = true;
       this.queryParams.data.proNo = this.proNo;
-      listBidWinner(this.queryParams).then((response) => {
-        this.bidWinnerList = response.records;
+      listBidWinning(this.queryParams).then((response) => {
+        this.bidWinningList = response.records;
         this.total = response.total;
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
-      this.form = {
+      this.publicityForm = {
+        id: null,
+        investProjectCode: null,
+        investProjectName: null,
+        bidProjectName: null,
+        lotName: null,
+        noticeName: null,
+        bidOpenDate: null,
+        evaluationSituation: null,
+        tendererName: null,
+        officeAddress: null,
+        bidderContacts: null,
+        contactsPhone: null,
+        tenderingSupervisionDept: null,
+        deptPhone: null,
+        deptAddress: null,
+        publicityStartTime: null,
+        publicityEndTime: null,
+        noticeId: null,
+        projectCode: null,
+        attachmentAddress: null,
+        proNo: null,
+        createUid: null,
+        createTime: null,
+        updateUid: null,
+        updateTime: null,
+        owerDept: null,
+        remark: null,
+      };
+      this.candidateForm = {
         id: null,
         winningCandidateName: null,
         winningCandidateCode: null,
@@ -580,7 +708,8 @@ export default {
         owerDept: null,
         remark: null,
       };
-      this.resetForm("form");
+      this.resetForm("publicityForm");
+      this.resetForm("candidateForm");
     },
     // 查询表单重置
     resetQueryForm() {
@@ -589,18 +718,25 @@ export default {
         pageSize: 10,
         data: {
           id: null,
-          winningCandidateName: null,
-          winningCandidateCode: null,
-          ranking: null,
-          bidQuotation: null,
-          rate: null,
-          quality: null,
-          deliveryTime: null,
-          bidCapabilityConditions: null,
+          investProjectCode: null,
+          investProjectName: null,
+          bidProjectName: null,
+          lotName: null,
+          noticeName: null,
+          bidOpenDate: null,
           evaluationSituation: null,
-          projectLeader: null,
-          projectLeaderQualification: null,
+          tendererName: null,
+          officeAddress: null,
+          bidderContacts: null,
+          contactsPhone: null,
+          tenderingSupervisionDept: null,
+          deptPhone: null,
+          deptAddress: null,
+          publicityStartTime: null,
+          publicityEndTime: null,
           noticeId: null,
+          projectCode: null,
+          attachmentAddress: null,
           proNo: null,
           createUid: null,
           createTime: null,
@@ -632,43 +768,64 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加中标候选人";
+      this.title = "添加中标候选人公示基本信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getBidWinner(id).then((response) => {
-        this.form = response.data;
+      getBidWinningVO(id).then((response) => {
+        this.publicityForm = response.data.projectBidWining;
+        this.candidateForm = response.data.projectBidWinner;
         this.open = true;
-        this.title = "修改中标候选人";
+        this.title = "修改中标候选人公示基本信息";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBidWinner(this.form).then((response) => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
-            });
-          } else {
-            this.form.proNo = this.proNo;
-            addBidWinner(this.form).then((response) => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
-            });
+      this.$refs["publicityForm"].validate((valid) => {
+        this.$refs["candidateForm"].validate((valid2) => {
+          if (valid && valid2) {
+            if (
+              this.publicityForm.id != null ||
+              this.candidateForm.id != null
+            ) {
+              updateBidWinningVO({
+                projectBidWining: this.publicityForm,
+                projectBidWinner: this.candidateForm,
+              }).then((response) => {
+                if (response.code === 200) {
+                  this.msgSuccess("修改成功");
+                  this.open = false;
+                  this.getList();
+                }
+              });
+            } else {
+              this.publicityForm.proNo = this.proNo;
+              this.candidateForm.proNo = this.proNo;
+              addBidWinningVO({
+                projectBidWining: this.publicityForm,
+                projectBidWinner: this.candidateForm,
+              }).then((response) => {
+                if (response.code === 200) {
+                  this.msgSuccess("新增成功");
+                  this.open = false;
+                  this.getList();
+                }
+              });
+            }
           }
-        }
+        });
       });
     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    // 关闭弹窗
+    close() {
+      this.reset();
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -679,7 +836,7 @@ export default {
           type: "warning",
         })
           .then(function () {
-            return delBidWinner(ids);
+            return delBidWinningVO(ids);
           })
           .then(() => {
             this.getList();
@@ -690,28 +847,22 @@ export default {
         this.$message.warning("请选择要删除的数据！！");
       }
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      let message = "是否确认导出所有的数据项?";
-      if (this.ids) {
-        message = "是否确认导出选中的数据项?";
-        queryParams.ids = this.ids;
-      }
-      this.$confirm(message, "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportBidWinner(queryParams);
-        })
-        .then((response) => {
-          this.downloadFile(response, true, response.msg);
-          // this.download(response.msg);
-        })
-        .catch(function () {});
-    },
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep {
+  .el-dialog {
+    margin-top: 2vh !important;
+    height: 90%;
+    overflow-y: auto;
+  }
+  .el-divider {
+    height: 4px;
+  }
+  .el-divider__text {
+    font-weight: 700;
+    font-size: 20px;
+  }
+}
+</style>
diff --git a/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue b/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue
index 755b7589..31775d05 100644
--- a/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue
@@ -43,31 +43,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公示名称" prop="noticeName">
+      <el-form-item label="公告名称" prop="noticeName">
         <el-input
           v-model="queryParams.data.noticeName"
-          placeholder="请输入公示名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开标日期" prop="bidOpenDate">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.bidOpenDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开标日期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="评标情况" prop="evaluationSituation">
-        <el-input
-          v-model="queryParams.data.evaluationSituation"
-          placeholder="请输入评标情况"
+          placeholder="请输入公告名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -82,180 +61,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="办公地址" prop="officeAddress">
-        <el-input
-          v-model="queryParams.data.officeAddress"
-          placeholder="请输入办公地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标人联系人" prop="bidderContacts">
-        <el-input
-          v-model="queryParams.data.bidderContacts"
-          placeholder="请输入招标人联系人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="contactsPhone">
-        <el-input
-          v-model="queryParams.data.contactsPhone"
-          placeholder="请输入联系电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="招标投标监督部门" prop="tenderingSupervisionDept">
-        <el-input
-          v-model="queryParams.data.tenderingSupervisionDept"
-          placeholder="请输入招标投标监督部门"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="deptPhone">
-        <el-input
-          v-model="queryParams.data.deptPhone"
-          placeholder="请输入联系电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系地址" prop="deptAddress">
-        <el-input
-          v-model="queryParams.data.deptAddress"
-          placeholder="请输入联系地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公示开始时间" prop="publicityStartTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.publicityStartTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择公示开始时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="公示结束日期" prop="publicityEndTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.publicityEndTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择公示结束日期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="公示ID" prop="noticeId">
-        <el-input
-          v-model="queryParams.data.noticeId"
-          placeholder="请输入公示ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目编码" prop="projectCode">
-        <el-input
-          v-model="queryParams.data.projectCode"
-          placeholder="请输入项目编码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="附件地址" prop="attachmentAddress">
-        <el-input
-          v-model="queryParams.data.attachmentAddress"
-          placeholder="请输入附件地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目编号" prop="proNo">
-        <el-input
-          v-model="queryParams.data.proNo"
-          placeholder="请输入项目编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createUid">
-        <el-input
-          v-model="queryParams.data.createUid"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.createTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updateUid">
-        <el-input
-          v-model="queryParams.data.updateUid"
-          placeholder="请输入更新人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.updateTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择更新时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="数源部门" prop="owerDept">
-        <el-input
-          v-model="queryParams.data.owerDept"
-          placeholder="请输入数源部门"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.data.remark"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item>
         <el-button
           type="cyan"
@@ -277,7 +83,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['earlyStage:bidWinning:add']"
+          v-hasPermi="['earlyStage:bidResult:add']"
           >新增</el-button
         >
       </el-col>
@@ -288,7 +94,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['earlyStage:bidWinning:edit']"
+          v-hasPermi="['earlyStage:bidResult:edit']"
           >修改</el-button
         >
       </el-col>
@@ -299,20 +105,10 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['earlyStage:bidWinning:remove']"
+          v-hasPermi="['earlyStage:bidResult:remove']"
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['earlyStage:bidWinning:export']"
-          >导出</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -321,7 +117,7 @@
 
     <el-table
       v-loading="loading"
-      :data="bidWinningList"
+      :data="bidResultList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
@@ -331,109 +127,90 @@
         label="投资项目代码"
         align="center"
         prop="investProjectCode"
+        width="180"
       />
       <el-table-column
         label="投资项目名称"
         align="center"
         prop="investProjectName"
+        width="180"
       />
       <el-table-column
         label="招标项目名称"
         align="center"
         prop="bidProjectName"
+        width="180"
       />
-      <el-table-column label="标段" align="center" prop="lotName" />
-      <el-table-column label="公示名称" align="center" prop="noticeName" />
+      <el-table-column label="标段" align="center" prop="lotName" width="180" />
       <el-table-column
-        label="开标日期"
+        label="公告名称"
         align="center"
-        prop="bidOpenDate"
+        prop="noticeName"
         width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.bidOpenDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+      />
+      <el-table-column
+        label="招标人"
+        align="center"
+        prop="tendererName"
+        width="180"
+      />
       <el-table-column
-        label="评标情况"
+        label="招标代理"
         align="center"
-        prop="evaluationSituation"
+        prop="biddingAgency"
+        width="180"
       />
-      <el-table-column label="招标人" align="center" prop="tendererName" />
-      <el-table-column label="办公地址" align="center" prop="officeAddress" />
       <el-table-column
-        label="招标人联系人"
+        label="中标人"
         align="center"
-        prop="bidderContacts"
+        prop="successfulBidder"
+        width="180"
       />
-      <el-table-column label="联系电话" align="center" prop="contactsPhone" />
       <el-table-column
-        label="招标投标监督部门"
+        label="中标价"
         align="center"
-        prop="tenderingSupervisionDept"
+        prop="bidWinningPrice"
+        width="180"
       />
-      <el-table-column label="联系电话" align="center" prop="deptPhone" />
-      <el-table-column label="联系地址" align="center" prop="deptAddress" />
+      <el-table-column label="费率" align="center" prop="rate" width="180" />
       <el-table-column
-        label="公示开始时间"
+        label="工期"
         align="center"
-        prop="publicityStartTime"
+        prop="deliveryTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.publicityStartTime, "{y}-{m}-{d}")
-          }}</span>
+          <span>{{ parseTime(scope.row.deliveryTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="项目负责人" align="center" prop="projectLeader" />
       <el-table-column
-        label="公示结束日期"
+        label="中标日期"
         align="center"
-        prop="publicityEndTime"
+        prop="bidWinningTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.publicityEndTime, "{y}-{m}-{d}")
-          }}</span>
+          <span>{{ parseTime(scope.row.bidWinningTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="公示ID" align="center" prop="noticeId" />
-      <el-table-column label="项目编码" align="center" prop="projectCode" />
       <el-table-column
         label="附件地址"
         align="center"
         prop="attachmentAddress"
-      />
-      <el-table-column label="项目编号" align="center" prop="proNo" />
-      <el-table-column label="创建人" align="center" prop="createUid" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
         width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updateUid" />
+      />
       <el-table-column
-        label="更新时间"
+        label="项目编码"
         align="center"
-        prop="updateTime"
+        prop="projectCode"
         width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="数源部门" align="center" prop="owerDept" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      />
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="180"
       >
         <template slot-scope="scope">
           <el-button
@@ -441,7 +218,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['earlyStage:bidWinning:edit']"
+            v-hasPermi="['earlyStage:bidResult:edit']"
             >修改</el-button
           >
           <el-button
@@ -449,7 +226,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['earlyStage:bidWinning:remove']"
+            v-hasPermi="['earlyStage:bidResult:remove']"
             >删除</el-button
           >
         </template>
@@ -464,130 +241,139 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改中标候选人公示基本信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="投资项目代码" prop="investProjectCode">
-          <el-input
-            v-model="form.investProjectCode"
-            placeholder="请输入投资项目代码"
-          />
-        </el-form-item>
-        <el-form-item label="投资项目名称" prop="investProjectName">
-          <el-input
-            v-model="form.investProjectName"
-            placeholder="请输入投资项目名称"
-          />
-        </el-form-item>
-        <el-form-item label="招标项目名称" prop="bidProjectName">
-          <el-input
-            v-model="form.bidProjectName"
-            placeholder="请输入招标项目名称"
-          />
-        </el-form-item>
-        <el-form-item label="标段" prop="lotName">
-          <el-input v-model="form.lotName" placeholder="请输入标段" />
-        </el-form-item>
-        <el-form-item label="公示名称" prop="noticeName">
-          <el-input v-model="form.noticeName" placeholder="请输入公示名称" />
-        </el-form-item>
-        <el-form-item label="开标日期" prop="bidOpenDate">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.bidOpenDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开标日期"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="评标情况" prop="evaluationSituation">
-          <el-input
-            v-model="form.evaluationSituation"
-            placeholder="请输入评标情况"
-          />
-        </el-form-item>
-        <el-form-item label="招标人" prop="tendererName">
-          <el-input v-model="form.tendererName" placeholder="请输入招标人" />
-        </el-form-item>
-        <el-form-item label="办公地址" prop="officeAddress">
-          <el-input v-model="form.officeAddress" placeholder="请输入办公地址" />
-        </el-form-item>
-        <el-form-item label="招标人联系人" prop="bidderContacts">
-          <el-input
-            v-model="form.bidderContacts"
-            placeholder="请输入招标人联系人"
-          />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactsPhone">
-          <el-input v-model="form.contactsPhone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="招标投标监督部门" prop="tenderingSupervisionDept">
-          <el-input
-            v-model="form.tenderingSupervisionDept"
-            placeholder="请输入招标投标监督部门"
-          />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="deptPhone">
-          <el-input v-model="form.deptPhone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="联系地址" prop="deptAddress">
-          <el-input v-model="form.deptAddress" placeholder="请输入联系地址" />
-        </el-form-item>
-        <el-form-item label="公示开始时间" prop="publicityStartTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.publicityStartTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择公示开始时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="公示结束日期" prop="publicityEndTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.publicityEndTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择公示结束日期"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="公示ID" prop="noticeId">
-          <el-input v-model="form.noticeId" placeholder="请输入公示ID" />
-        </el-form-item>
-        <el-form-item label="项目编码" prop="projectCode">
-          <el-input v-model="form.projectCode" placeholder="请输入项目编码" />
-        </el-form-item>
-        <el-form-item label="附件地址" prop="attachmentAddress">
-          <el-input
-            v-model="form.attachmentAddress"
-            placeholder="请输入附件地址"
-          />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="proNo">
-          <el-input v-model="form.proNo" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUid">
-          <el-input v-model="form.createUid" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="更新人" prop="updateUid">
-          <el-input v-model="form.updateUid" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="数源部门" prop="owerDept">
-          <el-input v-model="form.owerDept" placeholder="请输入数源部门" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
+    <!-- 添加或修改中标结果对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
+      <el-row :gutter="15">
+        <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+          <el-col :span="12">
+            <el-form-item label="投资项目代码" prop="investProjectCode">
+              <el-input
+                v-model="form.investProjectCode"
+                placeholder="请输入投资项目代码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="投资项目名称" prop="investProjectName">
+              <el-input
+                v-model="form.investProjectName"
+                placeholder="请输入投资项目名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="招标项目名称" prop="bidProjectName">
+              <el-input
+                v-model="form.bidProjectName"
+                placeholder="请输入招标项目名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标段" prop="lotName">
+              <el-input v-model="form.lotName" placeholder="请输入标段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公告名称" prop="noticeName">
+              <el-input
+                v-model="form.noticeName"
+                placeholder="请输入公告名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="招标人" prop="tendererName">
+              <el-input
+                v-model="form.tendererName"
+                placeholder="请输入招标人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="招标代理" prop="biddingAgency">
+              <el-input
+                v-model="form.biddingAgency"
+                placeholder="请输入招标代理"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中标人" prop="successfulBidder">
+              <el-input
+                v-model="form.successfulBidder"
+                placeholder="请输入中标人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中标价" prop="bidWinningPrice">
+              <el-input
+                v-model="form.bidWinningPrice"
+                placeholder="请输入中标价"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="费率" prop="rate">
+              <el-input v-model="form.rate" placeholder="请输入费率" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工期" prop="deliveryTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.deliveryTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择工期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目负责人" prop="projectLeader">
+              <el-input
+                v-model="form.projectLeader"
+                placeholder="请输入项目负责人"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="中标日期" prop="bidWinningTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.bidWinningTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择中标日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="附件地址" prop="attachmentAddress">
+              <el-input
+                v-model="form.attachmentAddress"
+                placeholder="请输入附件地址"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目编码" prop="projectCode">
+              <el-input
+                v-model="form.projectCode"
+                placeholder="请输入项目编码"
+              />
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -598,16 +384,16 @@
 
 <script>
 import {
-  listBidWinning,
-  getBidWinning,
-  delBidWinning,
-  addBidWinning,
-  updateBidWinning,
-  exportBidWinning,
-} from "@/api/earlyStage/bidWinning";
+  listBidResult,
+  getBidResult,
+  delBidResult,
+  addBidResult,
+  updateBidResult,
+  exportBidResult,
+} from "@/api/earlyStage/bidResult";
 
 export default {
-  name: "BidWinning",
+  name: "BidResult",
   props: ["proNo"],
   data() {
     return {
@@ -623,8 +409,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 中标候选人公示基本信息表格数据
-      bidWinningList: [],
+      // 中标结果表格数据
+      bidResultList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -640,20 +426,16 @@ export default {
           bidProjectName: null,
           lotName: null,
           noticeName: null,
-          bidOpenDate: null,
-          evaluationSituation: null,
           tendererName: null,
-          officeAddress: null,
-          bidderContacts: null,
-          contactsPhone: null,
-          tenderingSupervisionDept: null,
-          deptPhone: null,
-          deptAddress: null,
-          publicityStartTime: null,
-          publicityEndTime: null,
-          noticeId: null,
-          projectCode: null,
+          biddingAgency: null,
+          successfulBidder: null,
+          bidWinningPrice: null,
+          rate: null,
+          deliveryTime: null,
+          projectLeader: null,
+          bidWinningTime: null,
           attachmentAddress: null,
+          projectCode: null,
           proNo: null,
           createUid: null,
           createTime: null,
@@ -680,12 +462,12 @@ export default {
     },
   },
   methods: {
-    /** 查询中标候选人公示基本信息列表 */
+    /** 查询中标结果列表 */
     getList() {
       this.loading = true;
       this.queryParams.data.proNo = this.proNo;
-      listBidWinning(this.queryParams).then((response) => {
-        this.bidWinningList = response.records;
+      listBidResult(this.queryParams).then((response) => {
+        this.bidResultList = response.records;
         this.total = response.total;
         this.loading = false;
       });
@@ -704,20 +486,16 @@ export default {
         bidProjectName: null,
         lotName: null,
         noticeName: null,
-        bidOpenDate: null,
-        evaluationSituation: null,
         tendererName: null,
-        officeAddress: null,
-        bidderContacts: null,
-        contactsPhone: null,
-        tenderingSupervisionDept: null,
-        deptPhone: null,
-        deptAddress: null,
-        publicityStartTime: null,
-        publicityEndTime: null,
-        noticeId: null,
-        projectCode: null,
+        biddingAgency: null,
+        successfulBidder: null,
+        bidWinningPrice: null,
+        rate: null,
+        deliveryTime: null,
+        projectLeader: null,
+        bidWinningTime: null,
         attachmentAddress: null,
+        projectCode: null,
         proNo: null,
         createUid: null,
         createTime: null,
@@ -740,20 +518,16 @@ export default {
           bidProjectName: null,
           lotName: null,
           noticeName: null,
-          bidOpenDate: null,
-          evaluationSituation: null,
           tendererName: null,
-          officeAddress: null,
-          bidderContacts: null,
-          contactsPhone: null,
-          tenderingSupervisionDept: null,
-          deptPhone: null,
-          deptAddress: null,
-          publicityStartTime: null,
-          publicityEndTime: null,
-          noticeId: null,
-          projectCode: null,
+          biddingAgency: null,
+          successfulBidder: null,
+          bidWinningPrice: null,
+          rate: null,
+          deliveryTime: null,
+          projectLeader: null,
+          bidWinningTime: null,
           attachmentAddress: null,
+          projectCode: null,
           proNo: null,
           createUid: null,
           createTime: null,
@@ -785,16 +559,16 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加中标候选人公示基本信息";
+      this.title = "添加中标结果";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getBidWinning(id).then((response) => {
+      getBidResult(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改中标候选人公示基本信息";
+        this.title = "修改中标结果";
       });
     },
     /** 提交按钮 */
@@ -802,7 +576,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateBidWinning(this.form).then((response) => {
+            updateBidResult(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
@@ -811,7 +585,7 @@ export default {
             });
           } else {
             this.form.proNo = this.proNo;
-            addBidWinning(this.form).then((response) => {
+            addBidResult(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
@@ -832,7 +606,7 @@ export default {
           type: "warning",
         })
           .then(function () {
-            return delBidWinning(ids);
+            return delBidResult(ids);
           })
           .then(() => {
             this.getList();
@@ -843,28 +617,15 @@ export default {
         this.$message.warning("请选择要删除的数据！！");
       }
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      let message = "是否确认导出所有的数据项?";
-      if (this.ids) {
-        message = "是否确认导出选中的数据项?";
-        queryParams.ids = this.ids;
-      }
-      this.$confirm(message, "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportBidWinning(queryParams);
-        })
-        .then((response) => {
-          this.downloadFile(response, true, response.msg);
-          // this.download(response.msg);
-        })
-        .catch(function () {});
-    },
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep {
+  .el-dialog {
+    margin-top: 2vh !important;
+    height: 90%;
+    overflow-y: auto;
+  }
+}
+</style>
diff --git a/jwtech-admin-page/src/views/project/report/index.vue b/jwtech-admin-page/src/views/project/report/index.vue
index 49c190ba..e8c199f0 100644
--- a/jwtech-admin-page/src/views/project/report/index.vue
+++ b/jwtech-admin-page/src/views/project/report/index.vue
@@ -1,17 +1,15 @@
 <template>
   <div class="app-container">
-
     <!-- 面包屑 -->
     <el-breadcrumb separator="/" style="margin-bottom: 20px">
       <el-breadcrumb-item
         v-for="(item, index) in routeList"
         :key="item + index"
         :to="{ path: item.path }"
-      >{{ item.routeName }}</el-breadcrumb-item
+        >{{ item.routeName }}</el-breadcrumb-item
       >
     </el-breadcrumb>
 
-
     <el-row :gutter="20" v-show="showSearch">
       <el-col :span="22">
         <!-- 搜索条件 -->
@@ -49,27 +47,19 @@
 
           <el-form-item>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
+              >重置</el-button
             >
           </el-form-item>
-
         </el-form>
       </el-col>
       <el-col :span="2">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="handleAdd"
-        >新增研究报告</el-button
+        <el-button size="mini" type="primary" @click="handleAdd"
+          >新增研究报告</el-button
         >
       </el-col>
     </el-row>
 
-
-
-
     <el-row :gutter="10" class="mb8">
-
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -78,7 +68,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['earlyStage:feasibility:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,22 +79,45 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['earlyStage:feasibility:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-
-
-<!--    列表-->
-    <el-table v-loading="loading" :data="feasibilityList" @selection-change="handleSelectionChange">
+    <!--    列表-->
+    <el-table
+      v-loading="loading"
+      :data="feasibilityList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50" align="center"/>
-
-      <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="项目类型" align="center" prop="projectType" :formatter="projectTypeFormat"/>
+      <el-table-column label="序号" type="index" width="50" align="center" />
+
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="projectName"
+        :formatter="projectNameFormat"
+        width="180"
+      />
+      <el-table-column
+        label="项目类型"
+        align="center"
+        prop="projectType"
+        :formatter="projectTypeFormat"
+        width="180"
+      />
       <el-table-column label="编制单位" align="center" prop="compilingUnit" />
-      <el-table-column label="可行性研究报告文件" align="center" prop="feasibilityReportFile" >
+      <el-table-column
+        label="可行性研究报告文件"
+        align="center"
+        prop="feasibilityReportFile"
+        width="180"
+      >
         <template slot-scope="scope">
           <div
             v-for="(item, index) in JSON.parse(scope.row.feasibilityReportFile)"
@@ -114,10 +128,17 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="可行性研究报告相关附件" align="center" prop="feasibilityReportAttachment" >
+      <el-table-column
+        label="可行性研究报告相关附件"
+        align="center"
+        prop="feasibilityReportAttachment"
+        width="180"
+      >
         <template slot-scope="scope">
           <div
-            v-for="(item, index) in JSON.parse(scope.row.feasibilityReportAttachment)"
+            v-for="(item, index) in JSON.parse(
+              scope.row.feasibilityReportAttachment
+            )"
             :key="item + index"
           >
             <i class="el-icon-document"></i>
@@ -126,14 +147,23 @@
         </template>
       </el-table-column>
 
-
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="180"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -141,29 +171,28 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['earlyStage:feasibility:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['earlyStage:feasibility:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
-
-
-
     <!-- 添加或修改可行性研究报告对话框 -->
     <el-dialog
       :title="title"
@@ -185,9 +214,9 @@
               >
                 <el-option
                   v-for="dict in projectNameOptions"
-                  :key="dict.proNo"
-                  :label="dict.projectName+'['+dict.projectCode+']'"
-                  :value="dict.projectName+'['+dict.projectCode+']'"
+                  :key="dict.projectName + dict.id"
+                  :label="dict.projectName + '[' + dict.projectCode + ']'"
+                  :value="dict.projectName + '[' + dict.projectCode + ']'"
                   @click.native="getId(dict)"
                 />
               </el-select>
@@ -229,7 +258,7 @@
             </el-form-item>
           </el-col>
 
-<!--          <el-col :span="12">
+          <!--          <el-col :span="12">
             <el-form-item label="项目编码" prop="projectCode">
               <el-select
                 v-model="form.projectCode"
@@ -275,7 +304,6 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择上报时间"
-
               >
               </el-date-picker>
             </el-form-item>
@@ -290,7 +318,6 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择审批时间"
-
               >
               </el-date-picker>
             </el-form-item>
@@ -340,7 +367,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="可行性研究报告相关附件" prop="opinionAttachment">
+            <el-form-item
+              label="可行性研究报告相关附件"
+              prop="opinionAttachment"
+            >
               <!-- <el-input
                 v-model="form.opinionAttachment"
                 placeholder="请输入意见附件"
@@ -378,7 +408,14 @@
 </template>
 
 <script>
-import { listFeasibility, getFeasibility, delFeasibility, addFeasibility, updateFeasibility, exportFeasibility } from "@/api/earlyStage/feasibility";
+import {
+  listFeasibility,
+  getFeasibility,
+  delFeasibility,
+  addFeasibility,
+  updateFeasibility,
+  exportFeasibility,
+} from "@/api/earlyStage/feasibility";
 import {
   listProposal,
   getProposal,
@@ -386,10 +423,10 @@ import {
   addProposal,
   updateProposal,
   exportProposal,
-  getProjectCode
+  getProjectCode,
 } from "@/api/earlyStage/proposal";
-import {getProjectinfo, listProjectinfo} from "@/api/earlyStage/projectinfo";
-import {getFileStream} from "@/api/system/upload";
+import { getProjectinfo, listProjectinfo } from "@/api/earlyStage/projectinfo";
+import { getFileStream } from "@/api/system/upload";
 import { getToken } from "@/utils/auth";
 
 export default {
@@ -397,7 +434,7 @@ export default {
   data() {
     return {
       //附件
-      attachmentList:[],
+      attachmentList: [],
       // 文件
       fileList: [],
       // 请求头
@@ -405,12 +442,9 @@ export default {
         jianwei: "jwtech " + getToken(),
       },
       //项目名称
-      projectNameOptions:[],
+      projectNameOptions: [],
       //是否
-      IS:[
-        "是",
-        "否"
-      ],
+      IS: ["是", "否"],
       // 面包屑，路由信息
       routeList: [
         {
@@ -442,8 +476,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        ids:null,
-        data:{
+        ids: null,
+        data: {
           projectName: null,
           projectType: null,
           compilingUnit: null,
@@ -463,23 +497,18 @@ export default {
           updateUid: null,
           updateTime: null,
           owerDept: null,
-          remark: null
+          remark: null,
         },
-        cv:{}
-
+        cv: {},
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
-      projectType:"",
+      rules: {},
+      projectType: "",
       proNo: "",
-      proCodeList:[],
+      proCodeList: [],
       // projectCode: "",
-
-
-
     };
   },
   created() {
@@ -489,31 +518,31 @@ export default {
     });
   },
   methods: {
-    clear(){
+    clear() {
       this.fileList = [];
       this.attachmentList = [];
       this.proCodeList = [];
     },
-    getId(res){
-
+    getId(res) {
       // console.log(res.projectType)
       this.form.projectType = res.projectType;
       this.form.projectCode = res.projectCode;
-
-
     },
     // 规划类型字典翻译
     projectTypeFormat(row, column) {
       return this.selectDictLabel(this.projectTypeOptions, row.projectType);
     },
+    projectNameFormat(row) {
+      return row.projectName.slice(0, row.projectName.indexOf("["));
+    },
     /** 查询可行性研究报告列表 */
     getList() {
       this.loading = true;
       this.queryParams.params = {
         orderBy: "create_time",
-        sort:"desc"
+        sort: "desc",
       };
-      listFeasibility(this.queryParams).then(response => {
+      listFeasibility(this.queryParams).then((response) => {
         this.feasibilityList = response.records;
         this.total = response.total;
         this.loading = false;
@@ -547,7 +576,7 @@ export default {
         updateUid: null,
         updateTime: null,
         owerDept: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -556,7 +585,7 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        data:{
+        data: {
           id: null,
           projectName: null,
           projectType: null,
@@ -577,17 +606,16 @@ export default {
           updateUid: null,
           updateTime: null,
           owerDept: null,
-          remark: null
+          remark: null,
         },
         cv: {},
-
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.cv.name="projectName"
-      this.queryParams.cv.type="like"
+      this.queryParams.cv.name = "projectName";
+      this.queryParams.cv.type = "like";
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -598,9 +626,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -608,32 +636,32 @@ export default {
       this.form = {};
       this.fileList = [];
       this.attachmentList = [];
+
+      listProposal(this.queryParams).then((response) => {
+        this.projectNameOptions = response.records;
+      });
       this.open = true;
       this.title = "添加可行性研究报告";
-      listProposal(this.queryParams).then((response)=>{
-        this.projectNameOptions = response.records;
-      })
-
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      this.open = true;
-      this.title = "修改可行性研究报告";
 
       // listProjectinfo(this.queryParams).then((response)=>{
       //   this.projectNameOptions = response.records;
       // })
 
-      const id = row.id || this.ids
-      getFeasibility(id).then(response => {
+      const id = row.id || this.ids;
+      getFeasibility(id).then((response) => {
         this.form = response.data;
         // 附件信息
         if (response.data.feasibilityReportFile) {
           this.fileList = JSON.parse(response.data.feasibilityReportFile);
         }
         if (response.data.feasibilityReportAttachment) {
-          this.attachmentList = JSON.parse(response.data.feasibilityReportAttachment);
+          this.attachmentList = JSON.parse(
+            response.data.feasibilityReportAttachment
+          );
         }
 
         // getProjectCode(response.data.proNo).then((response)=>{
@@ -641,26 +669,24 @@ export default {
         //   this.proCodeList = response.data;
         //   // console.log(this.proCodeList)
         // })
-        listProposal(this.queryParams).then((response)=>{
+        listProposal(this.queryParams).then((response) => {
           this.projectNameOptions = response.records;
-        })
-
-
+        });
+        this.open = true;
+        this.title = "修改可行性研究报告";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         // 附件
         this.form.feasibilityReportFile = JSON.stringify(this.fileList);
-        this.form.feasibilityReportAttachment = JSON.stringify(this.attachmentList);
+        this.form.feasibilityReportAttachment = JSON.stringify(
+          this.attachmentList
+        );
         if (valid) {
           if (this.form.id != null) {
-
-
-            this.form.projectName=this.form.projectName.slice(0, this.form.projectName.indexOf('['));
-
-            updateFeasibility(this.form).then(response => {
+            updateFeasibility(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
@@ -668,10 +694,13 @@ export default {
               }
             });
           } else {
-            this.form.proNo=this.proNo;
+            this.form.proNo = this.proNo;
             // this.form.projectType = this.projectType;
-            this.form.projectName=this.form.projectName.slice(0, this.form.projectName.indexOf('['));
-            addFeasibility(this.form).then(response => {
+            this.form.projectName = this.form.projectName.slice(
+              0,
+              this.form.projectName.indexOf("[")
+            );
+            addFeasibility(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
@@ -685,21 +714,23 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      if(ids){
+      if (ids) {
         this.$confirm("是否删除选中的数据？", "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delFeasibility(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(function() {});
-      }else{
+          type: "warning",
+        })
+          .then(function () {
+            return delFeasibility(ids);
+          })
+          .then(() => {
+            this.getList();
+            this.msgSuccess("删除成功");
+          })
+          .catch(function () {});
+      } else {
         this.$message.warning("请选择要删除的数据！！");
       }
-
     },
     // 点击预览下载文件
     handleFilePreview(file) {
@@ -721,9 +752,7 @@ export default {
     },
     handleFileRemove(file, fileList) {
       // console.log(file, fileList);
-      let index = this.fileList.findIndex(
-        (item) => item.uid === file.uid
-      );
+      let index = this.fileList.findIndex((item) => item.uid === file.uid);
       // 删除文件
       this.fileList.splice(index, 1);
     },
@@ -793,6 +822,6 @@ export default {
         // fileList: fileList,
       });
     },
-  }
+  },
 };
 </script>