From 5d4a47beec01369a16a9b2c0a9daa8a080e2e106 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Wed, 6 Dec 2023 11:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/project/bid/options/biddingFile.vue | 611 +++++++-----
 .../src/views/project/bid/options/index.vue   |  16 +-
 .../project/bid/options/projectContract.vue   | 933 ++++++++++++++++++
 .../src/views/project/plan/options/index.vue  |   2 +-
 .../src/views/project/special/index.vue       |  57 ++
 .../project/special/options/basePage.vue      | 103 +-
 .../views/project/special/options/index.vue   |   2 +-
 7 files changed, 1429 insertions(+), 295 deletions(-)
 create mode 100644 jwtech-admin-page/src/views/project/bid/options/projectContract.vue

diff --git a/jwtech-admin-page/src/views/project/bid/options/biddingFile.vue b/jwtech-admin-page/src/views/project/bid/options/biddingFile.vue
index 23831744..e842e8ce 100644
--- a/jwtech-admin-page/src/views/project/bid/options/biddingFile.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/biddingFile.vue
@@ -7,85 +7,29 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="招标项目名称" prop="bidProjectName">
+      <el-form-item
+        label="招标项目名称"
+        prop="bidProjectName"
+        label-width="96px"
+      >
         <el-input
           v-model="queryParams.data.bidProjectName"
           placeholder="请输入招标项目名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标段名称" prop="loftName">
-        <el-input
-          v-model="queryParams.data.loftName"
-          placeholder="请输入标段名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="性质" prop="nature">
-        <el-input
-          v-model="queryParams.data.nature"
-          placeholder="请输入性质"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否延期开标" prop="isDelay">
-        <el-input
-          v-model="queryParams.data.isDelay"
-          placeholder="请输入是否延期开标"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开标时间" prop="bidOpenTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.bidOpenTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开标时间"
         >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="开标方式" prop="bidOpenMethod">
-        <el-input
-          v-model="queryParams.data.bidOpenMethod"
-          placeholder="请输入开标方式"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件发布人" prop="filePulish">
-        <el-input
-          v-model="queryParams.data.filePulish"
-          placeholder="请输入文件发布人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件发布时间" prop="filePulishTime">
-        <el-date-picker
-          clearable
-          size="small"
-          style="width: 200px"
-          v-model="queryParams.filePulishTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择文件发布时间"
-        >
-        </el-date-picker>
+          <el-button
+            type="primary"
+            slot="append"
+            icon="el-icon-search"
+            size="small"
+            @click="handleQuery"
+          ></el-button>
+        </el-input>
       </el-form-item>
-      <el-form-item label="项目编码" prop="proCode">
+
+      <!-- <el-form-item label="项目编码" prop="proCode">
         <el-input
           v-model="queryParams.data.proCode"
           placeholder="请输入项目编码"
@@ -93,7 +37,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="项目编号" prop="proNo">
         <el-input
           v-model="queryParams.data.proNo"
@@ -103,65 +47,15 @@
           @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>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -201,16 +95,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:contractFile:export']"
-          >导出</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -222,17 +106,46 @@
       :data="contractFileList"
       @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 type="selection" width="55" align="center" fixed />
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center"
+        fixed
+      />
 
       <el-table-column
         label="招标项目名称"
         align="center"
         prop="bidProjectName"
+        :formatter="projectNameFormat"
+        min-width="180"
+      />
+      <el-table-column
+        label="招标项目编码"
+        align="center"
+        prop="proCode"
+        min-width="120"
+      />
+      <el-table-column
+        label="标段名称"
+        align="center"
+        prop="loftName"
+        min-width="120"
+      />
+      <el-table-column
+        label="性质"
+        align="center"
+        prop="nature"
+        min-width="120"
+      />
+      <el-table-column
+        label="是否延期开标"
+        align="center"
+        prop="isDelay"
+        min-width="120"
       />
-      <el-table-column label="标段名称" align="center" prop="loftName" />
-      <el-table-column label="性质" align="center" prop="nature" />
-      <el-table-column label="是否延期开标" align="center" prop="isDelay" />
       <el-table-column
         label="开标时间"
         align="center"
@@ -243,8 +156,18 @@
           <span>{{ parseTime(scope.row.bidOpenTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="开标方式" align="center" prop="bidOpenMethod" />
-      <el-table-column label="文件发布人" align="center" prop="filePulish" />
+      <el-table-column
+        label="开标方式"
+        align="center"
+        prop="bidOpenMethod"
+        min-width="120"
+      />
+      <el-table-column
+        label="文件发布人"
+        align="center"
+        prop="filePulish"
+        min-width="120"
+      />
       <el-table-column
         label="文件发布时间"
         align="center"
@@ -259,39 +182,24 @@
         label="招标文件公示内容"
         align="center"
         prop="bidDocument"
+        min-width="150"
       />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="项目编码" align="center" prop="proCode" />
-      <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="创建时间"
-        align="center"
-        prop="updateTime"
-        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"
         class-name="small-padding fixed-width"
+        width="180"
+        fixed="right"
       >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="viewInfo(scope.row)"
+            >查看</el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -321,84 +229,197 @@
     />
 
     <!-- 添加或修改招标文件对话框 -->
-    <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="bidProjectName">
-          <el-input
-            v-model="form.bidProjectName"
-            placeholder="请输入招标项目名称"
-          />
-        </el-form-item>
-        <el-form-item label="标段名称" prop="loftName">
-          <el-input v-model="form.loftName" placeholder="请输入标段名称" />
-        </el-form-item>
-        <el-form-item label="性质" prop="nature">
-          <el-input v-model="form.nature" placeholder="请输入性质" />
-        </el-form-item>
-        <el-form-item label="是否延期开标" prop="isDelay">
-          <el-input v-model="form.isDelay" placeholder="请输入是否延期开标" />
-        </el-form-item>
-        <el-form-item label="开标时间" prop="bidOpenTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.bidOpenTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开标时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="开标方式" prop="bidOpenMethod">
-          <el-input v-model="form.bidOpenMethod" placeholder="请输入开标方式" />
-        </el-form-item>
-        <el-form-item label="文件发布人" prop="filePulish">
-          <el-input v-model="form.filePulish" placeholder="请输入文件发布人" />
-        </el-form-item>
-        <el-form-item label="文件发布时间" prop="filePulishTime">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.filePulishTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择文件发布时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="招标文件公示内容" prop="bidDocument">
-          <el-input
-            v-model="form.bidDocument"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="项目编码" prop="proCode">
-          <el-input v-model="form.proCode" 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>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1200px"
+      append-to-body
+    >
+      <el-row :gutter="15">
+        <el-form ref="form" :model="form" :rules="rules" label-width="128px">
+          <el-col :span="12">
+            <el-form-item label="招标项目名称" prop="bidProjectName">
+              <!-- <el-input
+                v-model="form.bidProjectName"
+                placeholder="请输入招标项目名称"
+              /> -->
+              <el-select
+                v-model="form.bidProjectName"
+                placeholder="招标项目名称"
+                filterable
+                clearable
+                size="small"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in bidProjectNameOptions"
+                  :key="dict.projectName + dict.id"
+                  :label="dict.projectName + '[' + dict.projectCode + ']'"
+                  :value="dict.projectName + '[' + dict.projectCode + ']'"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标段名称" prop="loftName">
+              <el-input v-model="form.loftName" placeholder="请输入标段名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="性质" prop="nature">
+              <el-input v-model="form.nature" placeholder="请输入性质" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否延期开标" prop="isDelay">
+              <el-input
+                v-model="form.isDelay"
+                placeholder="请输入是否延期开标"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开标时间" prop="bidOpenTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.bidOpenTime"
+                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="bidOpenMethod">
+              <el-input
+                v-model="form.bidOpenMethod"
+                placeholder="请输入开标方式"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文件发布人" prop="filePulish">
+              <el-input
+                v-model="form.filePulish"
+                placeholder="请输入文件发布人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文件发布时间" prop="filePulishTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.filePulishTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择文件发布时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="招标文件公示内容" prop="bidDocument">
+              <el-input
+                v-model="form.bidDocument"
+                type="textarea"
+                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>
       </div>
     </el-dialog>
+
+    <!--查看 -->
+    <el-dialog
+      :title="viewTitle"
+      :visible.sync="viewOpen"
+      width="1200px"
+      append-to-body
+      @close="closeView"
+      :close-on-click-modal="false"
+    >
+      <!-- 资格预审公告信息 -->
+      <div class="infoTitle">资格预审公告信息</div>
+      <div class="draLine"></div>
+      <div class="content">
+        <el-descriptions
+          class="margin-top"
+          :column="2"
+          border
+          :labelStyle="{
+            'text-align': 'left',
+            width: '180px',
+            height: '50px',
+          }"
+          :contentStyle="{}"
+        >
+          <el-descriptions-item span="2">
+            <template slot="label"> 招标项目名称 </template>
+            {{ this.viewTitle }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 标段名称 </template>
+            {{ this.biddingFileMsg.loftName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 性质 </template>
+            {{ this.biddingFileMsg.nature }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 是否延期开标 </template>
+            {{ this.biddingFileMsg.isDelay }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 开标时间 </template>
+            {{ this.biddingFileMsg.bidOpenTime }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 开标方式 </template>
+            {{ this.biddingFileMsg.bidOpenMethod }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 文件发布人 </template>
+            {{ this.biddingFileMsg.filePulish }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 文件发布时间 </template>
+            {{ this.biddingFileMsg.filePulishTime }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+
+      <!-- 资格预审公告信息 -->
+      <div class="infoTitle">相关附件</div>
+      <div class="draLine"></div>
+      <div class="content">
+        <el-descriptions
+          class="margin-top"
+          :column="2"
+          border
+          :labelStyle="{
+            'text-align': 'left',
+            width: '180px',
+            height: '50px',
+          }"
+          :contentStyle="{}"
+        >
+          <el-descriptions-item>
+            <template slot="label"> 招标文件公示内容 </template>
+            {{ this.biddingFileMsg.bidDocument }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -411,9 +432,11 @@ import {
   updateContractFile,
   exportContractFile,
 } from "@/api/earlyStage/contractFile";
+import { listProposal } from "@/api/earlyStage/proposal";
 
 export default {
   name: "ContractFile",
+  props: ["proNo"],
   data() {
     return {
       // 遮罩层
@@ -432,8 +455,10 @@ export default {
       contractFileList: [],
       // 弹出层标题
       title: "",
+      viewTitle: "",
       // 是否显示弹出层
       open: false,
+      viewOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -462,11 +487,21 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 项目建议书的项目，同一个项目，有不同的项目编码
+      bidProjectNameOptions: [],
+      biddingFileMsg: {},
     };
   },
   created() {
     this.getList();
   },
+  // 父组件  利用axios请求得到的值  传送到子组件，要监听，否则初始渲染时为空
+  watch: {
+    proNo: function (n, o) {
+      this.proNo = n;
+      this.getList();
+    },
+  },
   methods: {
     /** 查询招标文件列表 */
     getList() {
@@ -476,6 +511,16 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+      // 招标项目名称选项
+      listProposal({ data: { proNo: this.proNo } }).then((response) => {
+        // console.log("response55555555555", response);
+        this.bidProjectNameOptions = response.records;
+      });
+    },
+    projectNameFormat(row) {
+      if (row.bidProjectName) {
+        return row.bidProjectName.slice(0, row.bidProjectName.indexOf("["));
+      }
     },
     // 取消按钮
     cancel() {
@@ -562,6 +607,7 @@ export default {
       const id = row.id || this.ids;
       getContractFile(id).then((response) => {
         this.form = response.data;
+        // console.log("this.form", this.form);
         this.open = true;
         this.title = "修改招标文件";
       });
@@ -569,6 +615,11 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
+        // 项目编码
+        this.form.proCode = this.form.bidProjectName.slice(
+          this.form.bidProjectName.indexOf("[") + 1,
+          this.form.bidProjectName.indexOf("]")
+        );
         if (valid) {
           if (this.form.id != null) {
             updateContractFile(this.form).then((response) => {
@@ -579,6 +630,7 @@ export default {
               }
             });
           } else {
+            this.form.proNo = this.proNo;
             addContractFile(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
@@ -590,6 +642,20 @@ export default {
         }
       });
     },
+    // 查看信息
+    viewInfo(row) {
+      this.viewTitle = row.bidProjectName.slice(
+        0,
+        row.bidProjectName.indexOf("[")
+      );
+      this.biddingFileMsg = row;
+      console.log("biddingFileMsg", row);
+      this.viewOpen = true;
+    },
+    // 关闭弹窗
+    closeView() {
+      this.biddingFileMsg = {};
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -611,28 +677,47 @@ 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 exportContractFile(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: 500px;
+    // overflow-y: auto;
+    .content {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .margin-top {
+        width: 95%;
+        border-left: 1px solid #f0f0f0;
+        border-right: 1px solid #f0f0f0;
+      }
+    }
+  }
+  .el-dialog__title {
+    font-weight: 700;
+    font-size: 28px;
+  }
+  // .el-divider {
+  //   height: 4px;
+  //   color: #000;
+  // }
+  // .el-divider__text {
+  //   font-weight: 700;
+  //   font-size: 20px;
+  // }
+}
+.draLine {
+  width: 100%;
+  border: 2px solid #000;
+  margin: 10px 0 20px 0;
+}
+.infoTitle {
+  color: #000;
+  font-size: 20px;
+  font-weight: 700;
+}
+</style>
diff --git a/jwtech-admin-page/src/views/project/bid/options/index.vue b/jwtech-admin-page/src/views/project/bid/options/index.vue
index df28f3ef..970026f5 100644
--- a/jwtech-admin-page/src/views/project/bid/options/index.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/index.vue
@@ -26,7 +26,7 @@
     <el-tabs
       v-model="activeName"
       @tab-click="handleClick"
-      style="height: 750px; margin-bottom: 20px"
+      style="margin-bottom: 20px"
     >
       <el-tab-pane label="招标计划" name="bidBasePage">
         <bidBasePage
@@ -53,7 +53,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
-        label="招标公告"
+        label="招标文件"
         name="biddingFile"
         :disabled="!routeList[1].isEdit"
       >
@@ -62,13 +62,7 @@
           :projectName="formData.projectName"
         />
       </el-tab-pane>
-      <el-tab-pane
-        label="招标文件"
-        name="TenderFilePage"
-        :disabled="!routeList[1].isEdit"
-      >
-        招标文件
-      </el-tab-pane>
+
       <el-tab-pane
         label="中标候选人公示"
         name="candidatePage"
@@ -84,7 +78,7 @@
         <winningResultPage :proNo="formData.proNo" />
       </el-tab-pane>
       <el-tab-pane label="项目合同" name="con" :disabled="!routeList[1].isEdit">
-        项目合同
+        <projectContract :proNo="formData.proNo" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -96,6 +90,7 @@ import TenderAnnouncementPage from "./TenderAnnouncementPage.vue";
 import biddingFile from "./biddingFile.vue";
 import candidatePage from "./candidatePage.vue";
 import winningResultPage from "./winningResultPage.vue";
+import projectContract from "./projectContract.vue";
 import {
   listBidInfo,
   getBidInfo,
@@ -114,6 +109,7 @@ export default {
     biddingFile,
     candidatePage,
     winningResultPage,
+    projectContract,
   },
   data() {
     return {
diff --git a/jwtech-admin-page/src/views/project/bid/options/projectContract.vue b/jwtech-admin-page/src/views/project/bid/options/projectContract.vue
new file mode 100644
index 00000000..95ebfc72
--- /dev/null
+++ b/jwtech-admin-page/src/views/project/bid/options/projectContract.vue
@@ -0,0 +1,933 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item
+        label="招标项目名称"
+        prop="bidProjectName"
+        label-width="96px"
+      >
+        <el-input
+          v-model="queryParams.data.bidProjectName"
+          placeholder="请输入招标项目名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-button
+            type="primary"
+            slot="append"
+            icon="el-icon-search"
+            size="small"
+            @click="handleQuery"
+          ></el-button>
+        </el-input>
+      </el-form-item>
+
+      <!-- <el-form-item label="合同名称" prop="contractName">
+        <el-input
+          v-model="queryParams.data.contractName"
+          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>
+        <!-- <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        > -->
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['earlyStage:fulfillingNotice:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['earlyStage:fulfillingNotice:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['earlyStage:fulfillingNotice:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="fulfillingNoticeList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" fixed />
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center"
+        fixed
+      />
+
+      <el-table-column
+        label="招标项目名称"
+        align="center"
+        prop="bidProjectName"
+        min-width="180"
+        :formatter="projectNameFormat"
+      />
+      <el-table-column
+        label="标段名称"
+        align="center"
+        prop="loftName"
+        min-width="120"
+      />
+      <el-table-column
+        label="性质"
+        align="center"
+        prop="nature"
+        min-width="120"
+      />
+      <el-table-column
+        label="文件发布人"
+        align="center"
+        prop="filePulish"
+        min-width="120"
+      />
+      <el-table-column
+        label="公示发布时间"
+        align="center"
+        prop="noticeTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.noticeTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="合同名称"
+        align="center"
+        prop="contractName"
+        min-width="120"
+      />
+      <el-table-column
+        label="招标人名称"
+        align="center"
+        prop="biderName"
+        min-width="120"
+      />
+      <el-table-column
+        label="招标人统一信用代码"
+        align="center"
+        prop="biderCode"
+        min-width="120"
+      />
+      <el-table-column
+        label="中标人名称"
+        align="center"
+        prop="biderWinName"
+        min-width="120"
+      />
+      <el-table-column
+        label="中标人统一信用代码"
+        align="center"
+        prop="biderWinCode"
+        min-width="120"
+      />
+      <el-table-column
+        label="合同签订人或其委托人全称"
+        align="center"
+        prop="contractSignParty"
+        min-width="120"
+      />
+      <el-table-column
+        label="合同金额"
+        align="center"
+        prop="contractAmount"
+        min-width="120"
+      />
+      <el-table-column
+        label="合同单位(甲方)"
+        align="center"
+        prop="contractUnitFirst"
+        min-width="120"
+      />
+      <el-table-column
+        label="合同单位"
+        align="center"
+        prop="contractUnit"
+        min-width="120"
+      />
+      <el-table-column
+        label="合同期限"
+        align="center"
+        prop="contractPeriod"
+        min-width="120"
+      />
+      <el-table-column
+        label="质量要求"
+        align="center"
+        prop="qualityRequirement"
+        min-width="120"
+      />
+      <el-table-column
+        label="合同签署时间"
+        align="center"
+        prop="contractSignTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.contractSignTime, "{y}-{m}-{d}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="合同主要内容"
+        align="center"
+        prop="contractContent"
+        min-width="120"
+      />
+      <el-table-column
+        label="其他内容"
+        align="center"
+        prop="otherContent"
+        min-width="120"
+      />
+      <el-table-column
+        label="项目合同及履行公示内容"
+        align="center"
+        prop="contractNoticeContent"
+        min-width="120"
+      />
+
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="180"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="viewInfo(scope.row)"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['earlyStage:fulfillingNotice:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['earlyStage:fulfillingNotice:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改项目合同及履行公示详情对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1200px"
+      append-to-body
+    >
+      <el-row>
+        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+          <el-col :span="12">
+            <el-form-item label="招标项目名称" prop="bidProjectName">
+              <el-select
+                v-model="form.bidProjectName"
+                placeholder="请输入招标项目名称"
+                filterable
+                clearable
+                size="small"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in bidProjectNameOptions"
+                  :key="dict.projectName + dict.id"
+                  :label="dict.projectName + '[' + dict.projectCode + ']'"
+                  :value="dict.projectName + '[' + dict.projectCode + ']'"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标段名称" prop="loftName">
+              <el-input v-model="form.loftName" placeholder="请输入标段名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="性质" prop="nature">
+              <el-input v-model="form.nature" placeholder="请输入性质" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文件发布人" prop="filePulish">
+              <el-input
+                v-model="form.filePulish"
+                placeholder="请输入文件发布人"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公示发布时间" prop="noticeTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.noticeTime"
+                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="contractName">
+              <el-input
+                v-model="form.contractName"
+                placeholder="请输入合同名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="招标人名称" prop="biderName">
+              <el-input
+                v-model="form.biderName"
+                placeholder="请输入招标人名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="招标人统一信用代码" prop="biderCode">
+              <el-input
+                v-model="form.biderCode"
+                placeholder="请输入招标人统一信用代码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中标人名称" prop="biderWinName">
+              <el-input
+                v-model="form.biderWinName"
+                placeholder="请输入中标人名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中标人统一信用代码" prop="biderWinCode">
+              <el-input
+                v-model="form.biderWinCode"
+                placeholder="请输入中标人统一信用代码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item
+              label="合同签订人或其委托人全称"
+              prop="contractSignParty"
+            >
+              <el-input
+                v-model="form.contractSignParty"
+                placeholder="请输入合同签订人或其委托人全称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同金额" prop="contractAmount">
+              <el-input
+                v-model="form.contractAmount"
+                placeholder="请输入合同金额"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同单位(甲方)" prop="contractUnitFirst">
+              <el-input
+                v-model="form.contractUnitFirst"
+                placeholder="请输入合同单位(甲方)"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同单位" prop="contractUnit">
+              <el-input
+                v-model="form.contractUnit"
+                placeholder="请输入合同单位"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同期限" prop="contractPeriod">
+              <el-input
+                v-model="form.contractPeriod"
+                placeholder="请输入合同期限"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质量要求" prop="qualityRequirement">
+              <el-input
+                v-model="form.qualityRequirement"
+                placeholder="请输入质量要求"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同签署时间" prop="contractSignTime">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 100%"
+                v-model="form.contractSignTime"
+                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="contractContent">
+              <el-input
+                v-model="form.contractContent"
+                placeholder="请输入合同主要内容"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="其他内容" prop="otherContent">
+              <el-input
+                v-model="form.otherContent"
+                placeholder="请输入其他内容"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item
+              label="项目合同及履行公示内容"
+              prop="contractNoticeContent"
+            >
+              <el-input
+                v-model="form.contractNoticeContent"
+                type="textarea"
+                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>
+      </div>
+    </el-dialog>
+
+    <!--查看 -->
+    <el-dialog
+      :title="viewTitle"
+      :visible.sync="viewOpen"
+      width="1200px"
+      append-to-body
+      @close="closeView"
+      :close-on-click-modal="false"
+    >
+      <!-- 资格预审公告信息 -->
+      <div class="infoTitle">资格预审公告信息</div>
+      <div class="draLine"></div>
+      <div class="content">
+        <el-descriptions
+          class="margin-top"
+          :column="2"
+          border
+          :labelStyle="{
+            'text-align': 'left',
+            width: '180px',
+            height: '50px',
+          }"
+          :contentStyle="{}"
+        >
+          <el-descriptions-item span="2">
+            <template slot="label"> 招标项目名称 </template>
+            {{ this.viewTitle }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 标段名称 </template>
+            {{ this.projectContractMsg.loftName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 性质 </template>
+            {{ this.projectContractMsg.nature }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 文件发布人 </template>
+            {{ this.projectContractMsg.filePulish }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 公示发布时间 </template>
+            {{ this.projectContractMsg.noticeTime }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 合同名称 </template>
+            {{ this.projectContractMsg.contractName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 招标人名称 </template>
+            {{ this.projectContractMsg.biderName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 招标人统一信用代码 </template>
+            {{ this.projectContractMsg.biderCode }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 中标人名称 </template>
+            {{ this.projectContractMsg.biderWinName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 中标人统一信用代码 </template>
+            {{ this.projectContractMsg.biderWinCode }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 合同签订人或其委托人全称 </template>
+            {{ this.projectContractMsg.contractSignParty }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 合同金额 </template>
+            {{ this.projectContractMsg.contractAmount }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 合同单位(甲方) </template>
+            {{ this.projectContractMsg.contractUnitFirst }}
+          </el-descriptions-item>
+
+          <el-descriptions-item>
+            <template slot="label"> 合同单位 </template>
+            {{ this.projectContractMsg.contractUnit }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 合同期限 </template>
+            {{ this.projectContractMsg.contractPeriod }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 质量要求 </template>
+            {{ this.projectContractMsg.qualityRequirement }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 合同签署时间 </template>
+            {{ this.projectContractMsg.contractSignTime }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 合同主要内容 </template>
+            {{ this.projectContractMsg.contractContent }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 其他内容 </template>
+            {{ this.projectContractMsg.otherContent }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 项目合同及履行公示内容 </template>
+            {{ this.projectContractMsg.contractNoticeContent }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listFulfillingNotice,
+  getFulfillingNotice,
+  delFulfillingNotice,
+  addFulfillingNotice,
+  updateFulfillingNotice,
+  exportFulfillingNotice,
+} from "@/api/earlyStage/fulfillingNotice";
+import { listProposal } from "@/api/earlyStage/proposal";
+
+export default {
+  name: "FulfillingNotice",
+  props: ["proNo"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目合同及履行公示详情表格数据
+      fulfillingNoticeList: [],
+      // 弹出层标题
+      title: "",
+      viewTitle: "",
+      // 是否显示弹出层
+      open: false,
+      viewOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        data: {
+          bidProjectName: null,
+          loftName: null,
+          nature: null,
+          filePulish: null,
+          noticeTime: null,
+          contractName: null,
+          biderName: null,
+          biderCode: null,
+          biderWinName: null,
+          biderWinCode: null,
+          contractSignParty: null,
+          contractAmount: null,
+          contractUnitFirst: null,
+          contractUnit: null,
+          contractPeriod: null,
+          qualityRequirement: null,
+          contractSignTime: null,
+          contractContent: null,
+          otherContent: null,
+          contractNoticeContent: null,
+          proCode: null,
+          proNo: null,
+          createUid: null,
+          updateUid: null,
+          owerDept: null,
+        },
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 项目建议书的项目，同一个项目，有不同的项目编码
+      bidProjectNameOptions: [],
+      projectContractMsg: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  // 父组件  利用axios请求得到的值  传送到子组件，要监听，否则初始渲染时为空
+  watch: {
+    proNo: function (n, o) {
+      this.proNo = n;
+      this.getList();
+    },
+  },
+  methods: {
+    /** 查询项目合同及履行公示详情列表 */
+    getList() {
+      this.loading = true;
+      listFulfillingNotice(this.queryParams).then((response) => {
+        this.fulfillingNoticeList = response.records;
+        this.total = response.total;
+        this.loading = false;
+      });
+      // 招标项目名称选项
+      listProposal({ data: { proNo: this.proNo } }).then((response) => {
+        // console.log("response55555555555", response);
+        this.bidProjectNameOptions = response.records;
+      });
+    },
+    projectNameFormat(row) {
+      if (row.bidProjectName) {
+        return row.bidProjectName.slice(0, row.bidProjectName.indexOf("["));
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        bidProjectName: null,
+        loftName: null,
+        nature: null,
+        filePulish: null,
+        noticeTime: null,
+        contractName: null,
+        biderName: null,
+        biderCode: null,
+        biderWinName: null,
+        biderWinCode: null,
+        contractSignParty: null,
+        contractAmount: null,
+        contractUnitFirst: null,
+        contractUnit: null,
+        contractPeriod: null,
+        qualityRequirement: null,
+        contractSignTime: null,
+        contractContent: null,
+        otherContent: null,
+        contractNoticeContent: null,
+        remark: null,
+        proCode: null,
+        proNo: null,
+        createUid: null,
+        createTime: null,
+        updateUid: null,
+        updateTime: null,
+        owerDept: null,
+      };
+      this.resetForm("form");
+    },
+    // 查询表单重置
+    resetQueryForm() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        data: {
+          id: null,
+          bidProjectName: null,
+          loftName: null,
+          nature: null,
+          filePulish: null,
+          noticeTime: null,
+          contractName: null,
+          biderName: null,
+          biderCode: null,
+          biderWinName: null,
+          biderWinCode: null,
+          contractSignParty: null,
+          contractAmount: null,
+          contractUnitFirst: null,
+          contractUnit: null,
+          contractPeriod: null,
+          qualityRequirement: null,
+          contractSignTime: null,
+          contractContent: null,
+          otherContent: null,
+          contractNoticeContent: null,
+          remark: null,
+          proCode: null,
+          proNo: null,
+          createUid: null,
+          createTime: null,
+          updateUid: null,
+          updateTime: null,
+          owerDept: null,
+        },
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetQueryForm();
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加项目合同及履行公示详情";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getFulfillingNotice(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目合同及履行公示详情";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        // 项目编码
+        this.form.proCode = this.form.bidProjectName.slice(
+          this.form.bidProjectName.indexOf("[") + 1,
+          this.form.bidProjectName.indexOf("]")
+        );
+        if (valid) {
+          if (this.form.id != null) {
+            updateFulfillingNotice(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            this.form.proNo = this.proNo;
+            addFulfillingNotice(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    // 查看信息
+    viewInfo(row) {
+      this.viewTitle = row.bidProjectName.slice(
+        0,
+        row.bidProjectName.indexOf("[")
+      );
+      this.projectContractMsg = row;
+      console.log("projectContractMsg", row);
+      this.viewOpen = true;
+    },
+    // 关闭弹窗
+    closeView() {
+      this.projectContractMsg = {};
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      if (ids) {
+        this.$confirm("是否删除选中的数据？", "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(function () {
+            return delFulfillingNotice(ids);
+          })
+          .then(() => {
+            this.getList();
+            this.msgSuccess("删除成功");
+          })
+          .catch(function () {});
+      } else {
+        this.$message.warning("请选择要删除的数据！！");
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep {
+  .el-dialog {
+    // margin-top: 2vh !important;
+    // height: 500px;
+    // overflow-y: auto;
+    .content {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .margin-top {
+        width: 95%;
+        border-left: 1px solid #f0f0f0;
+        border-right: 1px solid #f0f0f0;
+      }
+    }
+  }
+  .el-dialog__title {
+    font-weight: 700;
+    font-size: 28px;
+  }
+  // .el-divider {
+  //   height: 4px;
+  //   color: #000;
+  // }
+  // .el-divider__text {
+  //   font-weight: 700;
+  //   font-size: 20px;
+  // }
+}
+.draLine {
+  width: 100%;
+  border: 2px solid #000;
+  margin: 10px 0 20px 0;
+}
+.infoTitle {
+  color: #000;
+  font-size: 20px;
+  font-weight: 700;
+}
+</style>
diff --git a/jwtech-admin-page/src/views/project/plan/options/index.vue b/jwtech-admin-page/src/views/project/plan/options/index.vue
index fce5f942..40a3402c 100644
--- a/jwtech-admin-page/src/views/project/plan/options/index.vue
+++ b/jwtech-admin-page/src/views/project/plan/options/index.vue
@@ -20,7 +20,7 @@
     <el-tabs
       v-model="activeName"
       @tab-click="handleClick"
-      style="height: 750px; margin-bottom: 20px"
+      style="margin-bottom: 20px"
     >
       <el-tab-pane label="计划基本信息" name="planBasePage">
         <planBasePage ref="basePage" />
diff --git a/jwtech-admin-page/src/views/project/special/index.vue b/jwtech-admin-page/src/views/project/special/index.vue
index 2a593de3..0206aedb 100644
--- a/jwtech-admin-page/src/views/project/special/index.vue
+++ b/jwtech-admin-page/src/views/project/special/index.vue
@@ -52,6 +52,20 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="规划所属区域" prop="adcd" label-width="120px">
+            <el-cascader
+              ref="qyCascader"
+              :options="areasOptions"
+              v-model="queryParams.data.adcd"
+              :props="areasOptionProps"
+              placeholder="请输入规划所属区域"
+              clearable
+              size="small"
+              style="width: 100%"
+              @change="handleQuery"
+            >
+            </el-cascader>
+          </el-form-item>
           <el-form-item>
             <!-- <el-button
               type="cyan"
@@ -228,12 +242,23 @@ import {
   updateProjectinfo,
   exportProjectinfo,
 } from "@/api/earlyStage/projectinfo";
+import { getAreasData } from "@/api/areas/index";
 
 // import { listProjectinfo, getProjectinfo, delProjectinfo, addProjectinfo, updateProjectinfo, exportProjectinfo } from "@/api/earlyStage/projectinfo";
 
 export default {
   data() {
     return {
+      areasOptionProps: {
+        emitPath: false,
+        checkStrictly: true, //选择任意一级
+        // lazy: true,
+        // lazyLoad: function qylazyLoad(node) {
+        //   // node.level = 5;
+        //   console.log("node", node.level);
+        // },
+      },
+      areasOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -278,12 +303,37 @@ export default {
     };
   },
   created() {
+    this.getTreeData();
     this.getList();
     this.getDicts("plan_type").then((response) => {
       this.projectTypeOptions = response.data;
     });
   },
   methods: {
+    getTreeData() {
+      getAreasData().then((items) => {
+        // console.log("getAreasData", items.data);
+        let res = [];
+        let getChildren = (res, pid) => {
+          for (const i of items.data) {
+            if (i.parentid === pid) {
+              const newItem = {
+                label: i.name,
+                value: i.id,
+                layer: i.layer,
+              };
+              if (i.layer != 3) newItem.children = [];
+              res.push(newItem);
+              getChildren(newItem.children, newItem.value);
+            }
+          }
+        };
+        getChildren(res, items.data[0].parentid);
+        console.log("areasOptions", res);
+        this.areasOptions = res;
+        // return res;
+      });
+    },
     onSubmit() {
       console.log("submit!");
     },
@@ -351,6 +401,13 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    // handleAreasQuery(value, a) {
+    //   // console.log(value, a);
+    //   const obj = this.$refs["qyCascader"].getCheckedNodes();
+    //   console.log("obj", obj);
+    //   // this.queryParams.layer=
+    //   // this.getList();
+    // },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetQueryForm();
diff --git a/jwtech-admin-page/src/views/project/special/options/basePage.vue b/jwtech-admin-page/src/views/project/special/options/basePage.vue
index 3d4631e7..531ab78b 100644
--- a/jwtech-admin-page/src/views/project/special/options/basePage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/basePage.vue
@@ -35,14 +35,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="规划所属区域"
-            prop="selectedOptions"
-            label-width="120px"
-          >
+          <el-form-item label="规划所属区域" prop="adcd" label-width="120px">
             <el-cascader
-              :options="options"
-              v-model="selectedOptions"
+              :options="areasOptions"
+              v-model="baseMsg.adcd"
+              :props="areasOptionProps"
               placeholder="请输入规划所属区域"
               clearable
               size="small"
@@ -170,7 +167,11 @@
   </div>
 </template>
 <script>
-import { listProjectinfo, addProjectinfo } from "@/api/earlyStage/projectinfo";
+import {
+  listProjectinfo,
+  addProjectinfo,
+  updateProjectinfo,
+} from "@/api/earlyStage/projectinfo";
 import { getAreasData } from "@/api/areas/index";
 import { v4 as uuidv4 } from "uuid";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
@@ -178,6 +179,10 @@ export default {
   props: ["formData"],
   data() {
     return {
+      areasOptionProps: {
+        emitPath: false,
+        checkStrictly: true, //选择任意一级
+      },
       // 表单基础信息
       baseMsg: {},
       // 规划类型字典
@@ -199,7 +204,7 @@ export default {
           sort: "desc",
         },
       },
-      options: regionData,
+      areasOptions: [],
       selectedOptions: [],
       rules: {
         projectName: [
@@ -208,7 +213,7 @@ export default {
         projectType: [
           { required: true, message: "请选择规划类型", trigger: "blur" },
         ],
-        selectedOptions: [
+        adcd: [
           { required: true, message: "请选择规划所属区域", trigger: "blur" },
         ],
         amount: [
@@ -226,10 +231,8 @@ export default {
     };
   },
   created() {
-    getAreasData().then((res) => {
-      console.log("getAreasData", res);
-    });
-    console.log("regionData", regionData);
+    this.getTreeData();
+    // console.log("regionData", regionData);
     if (this.$route.query.baseDataId) {
       this.getList();
     }
@@ -243,13 +246,58 @@ export default {
     // this.baseMsg = this.formData;
     // }
   },
-  // watch: {
-  //   "formData.id": function (n, o) {
-  //     // this.baseMsg = this.formData;
-  //     console.log("nnnnnnnnn", n);
-  //   },
-  // },
+  watch: {
+    areasOptions: function (n, o) {
+      this.areasOptions = n;
+      if (this.$route.query.baseDataId) {
+        this.getList();
+      }
+    },
+  },
   methods: {
+    // 获取某一项的所有父节点的label值 list为树形结构的数据 id为回显节点的标识
+    getParentsByValue(list, value) {
+      for (let i in list) {
+        if (list[i].value == value) {
+          //这里的list[i].value中的value根据你的需求可进行改变
+          //查询到就返回该数组对象的value
+          return [list[i].value];
+        }
+        if (list[i].children) {
+          let node = this.getParentsByValue(list[i].children, value);
+          if (node !== undefined) {
+            //查询到把父节把父节点加到数组前面
+            node.unshift(list[i].value);
+            console.log("node", node);
+            return node;
+          }
+        }
+      }
+    },
+
+    getTreeData() {
+      getAreasData().then((items) => {
+        // console.log("getAreasData", items.data);
+        let res = [];
+        let getChildren = (res, pid) => {
+          for (const i of items.data) {
+            if (i.parentid === pid) {
+              const newItem = {
+                label: i.name,
+                value: i.id,
+              };
+              if (i.layer != 3) newItem.children = [];
+              res.push(newItem);
+              getChildren(newItem.children, newItem.value);
+            }
+          }
+        };
+        getChildren(res, items.data[0].parentid);
+        console.log(66666666666, res);
+        this.areasOptions = res;
+        // return res;
+      });
+    },
     handleChange(value) {
       //value为省市区code数组
       if (value) {
@@ -257,6 +305,8 @@ export default {
         var provinceCode = codeToText[value[0]]; //code转为省
         var cityCode = codeToText[value[1]]; //市
         var orgion = codeToText[value[2]]; //区
+        // this.baseMsg.adcd = value[value.length - 1];
+        console.log("this.baseMsg.adcd", this.baseMsg.adcd);
         // this.form.province = provinceCode;
         // this.form.city = cityCode;
         // this.form.area = orgion;
@@ -269,6 +319,18 @@ export default {
       this.queryParams.data.id = this.$route.query.baseDataId;
       listProjectinfo(this.queryParams).then((response) => {
         this.baseMsg = response.records[0];
+        if (this.areasOptions.length > 0) {
+          this.baseMsg.adcd = this.getParentsByValue(
+            this.areasOptions,
+            this.baseMsg.adcd
+          );
+          // console.log(
+          //   "this.baseMsg.adcd ",
+          //   this.areasOptions,
+          //   this.baseMsg.adcd
+          // );
+        }
+
         console.log("formData in basePage", this.baseMsg);
       });
     },
@@ -280,6 +342,7 @@ export default {
       // 表单校验方法
       this.$refs.form.validate((valid) => {
         if (valid) {
+          // this.baseMsg.adcd = this.baseMsg.adcd[this.baseMsg.adcd.length - 1];
           if (this.baseMsg.id != null) {
             updateProjectinfo(this.baseMsg).then((response) => {
               if (response.code === 200) {
diff --git a/jwtech-admin-page/src/views/project/special/options/index.vue b/jwtech-admin-page/src/views/project/special/options/index.vue
index 3831d7d6..a2b90746 100644
--- a/jwtech-admin-page/src/views/project/special/options/index.vue
+++ b/jwtech-admin-page/src/views/project/special/options/index.vue
@@ -20,7 +20,7 @@
     <el-tabs
       v-model="activeName"
       @tab-click="handleClick"
-      style="height: 750px; margin-bottom: 20px"
+      style="margin-bottom: 20px"
     >
       <el-tab-pane label="专题基本信息" name="basePage">
         <basePage :formData="formData" ref="basePage" />