From 6af83a4d3803d7f9fd9c31f18e32519e99e441b6 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Tue, 30 Jan 2024 10:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/project/bid/index.vue           |  4 +--
 .../project/bid/options/candidatePage.vue     | 25 ++++++++++++++++---
 .../src/views/project/proposal/index.vue      |  6 ++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/jwtech-admin-page/src/views/project/bid/index.vue b/jwtech-admin-page/src/views/project/bid/index.vue
index 9b8daee2..d6ba568d 100644
--- a/jwtech-admin-page/src/views/project/bid/index.vue
+++ b/jwtech-admin-page/src/views/project/bid/index.vue
@@ -21,7 +21,7 @@
         >
           <el-form-item label="项目名称" prop="projectName">
             <el-input
-              v-model="queryParams.cv.value"
+              v-model="proQueryParams.cv.value"
               placeholder="请输入项目名称"
               clearable
               size="small"
@@ -55,7 +55,7 @@
           <el-form-item label="行政区划" prop="adcd">
             <el-cascader
               :options="areasOptions"
-              v-model="queryParams.data.adcd"
+              v-model="proQueryParams.data.adcd"
               :props="areasOptionProps"
               placeholder="请选择行政区划"
               clearable
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 886e94a8..3e454eec 100644
--- a/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
@@ -661,10 +661,11 @@
             <template slot="label"> 开标日期 </template>
             {{ this.infoMsg.bidOpenDate }}
           </el-descriptions-item>
-          <el-descriptions-item>
+          <el-descriptions-item span="2">
             <template slot="label"> 评标情况 </template>
-            <!-- <div v-html="infoMsg.evaluationSituation"></div> -->
-            {{ this.infoMsg.evaluationSituation }}
+            <div class="fuwenben" v-html="infoMsg.evaluationSituation"></div>
+            <!-- <div v-pre>{{ this.infoMsg.evaluationSituation }}</div> -->
+            <!-- {{ this.infoMsg.evaluationSituation }} -->
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 招标人 </template>
@@ -1359,6 +1360,24 @@ export default {
   .el-dialog {
     margin-top: 2vh !important;
   }
+  .fuwenben {
+    table {
+      border-top: 1px solid #ccc;
+      border-left: 1px solid #ccc;
+      border-collapse: collapse;
+      border-spacing: 0;
+    }
+    table td,
+    table th {
+      border-bottom: 1px solid #ccc;
+      border-right: 1px solid #ccc;
+      padding: 3px 5px;
+    }
+    table th {
+      border-bottom: 2px solid #ccc;
+      text-align: center;
+    }
+  }
 }
 </style>
 <style src="@wangeditor/editor/dist/css/style.css"></style>
diff --git a/jwtech-admin-page/src/views/project/proposal/index.vue b/jwtech-admin-page/src/views/project/proposal/index.vue
index aeb0ccf6..f457e801 100644
--- a/jwtech-admin-page/src/views/project/proposal/index.vue
+++ b/jwtech-admin-page/src/views/project/proposal/index.vue
@@ -16,7 +16,7 @@
         <el-form :model="queryParams" :inline="true" label-width="68px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
-              v-model="queryParams.cv.value"
+              v-model="queryParams.data.projectName"
               placeholder="请输入项目名称"
               clearable
               size="small"
@@ -873,8 +873,8 @@ export default {
 
     /** 搜索按钮操作 */
     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();
     },