From c88dc92ce104aa6139467b0c308c674265b5a605 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Tue, 30 Jan 2024 13:42:07 +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

---
 .../bid/options/TenderAnnouncementPage.vue    | 96 +++++++++++++++++--
 .../views/project/bid/options/bidBasePage.vue |  6 +-
 .../project/bid/options/projectContract.vue   | 30 +++---
 .../src/views/project/preDesign/index.vue     |  4 +-
 4 files changed, 110 insertions(+), 26 deletions(-)

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 ad703d2d..92ad99cb 100644
--- a/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
@@ -386,7 +386,7 @@
       @close="close"
       :close-on-click-modal="false"
     >
-      <el-row :gutter="15">
+      <el-row :gutter="15" v-if="open">
         <el-form ref="form" :model="form" :rules="rules" label-width="180px">
           <el-col :span="24">
             <el-form-item label="招标项目名称" prop="bidProjectName">
@@ -503,12 +503,27 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="招标内容" prop="bidContent">
-              <el-input
+              <!-- <el-input
                 type="textarea"
                 :rows="4"
                 v-model="form.bidContent"
                 placeholder="请输入招标内容"
-              />
+              /> -->
+              <div style="border: 1px solid #ccc">
+                <Toolbar
+                  style="border-bottom: 1px solid #ccc"
+                  :editor="editor"
+                  :defaultConfig="toolbarConfig"
+                  :mode="mode"
+                />
+                <Editor
+                  style="height: 300px; overflow-y: hidden"
+                  v-model="form.bidContent"
+                  :defaultConfig="editorConfig"
+                  :mode="mode"
+                  @onCreated="onCreated"
+                />
+              </div>
             </el-form-item>
           </el-col>
 
@@ -523,6 +538,21 @@
                 v-model="form.bidCapabilityRequirements"
                 placeholder="请输入投标资格能力要求"
               />
+              <!-- <div style="border: 1px solid #ccc">
+                <Toolbar
+                  style="border-bottom: 1px solid #ccc"
+                  :editor="editor2"
+                  :defaultConfig="toolbarConfig"
+                  :mode="mode"
+                />
+                <Editor
+                  style="height: 300px; overflow-y: hidden"
+                  v-model="form.bidCapabilityRequirements"
+                  :defaultConfig="editorConfig2"
+                  :mode="mode"
+                  @onCreated="onCreated"
+                />
+              </div> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -852,11 +882,17 @@
           </el-descriptions-item>
           <el-descriptions-item span="2">
             <template slot="label"> 招标内容 </template>
-            {{ this.tenderMsg.bidContent }}
+            <div class="fuwenben" v-html="tenderMsg.bidContent"></div>
+            <!-- {{ this.tenderMsg.bidContent }} -->
           </el-descriptions-item>
           <el-descriptions-item span="2">
             <template slot="label"> 投标资格能力要求 </template>
-            {{ this.tenderMsg.bidCapabilityRequirements }}
+            <div
+              class="fuwenben"
+              v-html="tenderMsg.bidCapabilityRequirements"
+            ></div>
+
+            <!-- {{ this.tenderMsg.bidCapabilityRequirements }} -->
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 是否接受联合体投标 </template>
@@ -977,12 +1013,29 @@ import {
 import { listProposal } from "@/api/earlyStage/proposal";
 import { getToken } from "@/utils/auth";
 import { getFileStream } from "@/api/system/upload";
+import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 
 export default {
   name: "BidNotice",
   props: ["proNo", "projectCode", "projectName"],
+  components: { Editor, Toolbar },
   data() {
     return {
+      editor: null,
+      editor2: null,
+      toolbarConfig: {},
+      editorConfig: {
+        placeholder: "请输入招标内容",
+        // MENU_CONF: {
+        //   uploadImage: {
+        //     server: "thinking/common/upload",
+        //     headers: { jianwei: "jwtech " + getToken() },
+        //   },
+        // },
+      },
+      editorConfig2: { placeholder: "请输入投标资格能力要求" },
+      mode: "default", // or 'simple'
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -1131,12 +1184,14 @@ export default {
             trigger: "blur",
           },
         ],
-        bidScope: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        bidScope: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
         bidContent: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         bidCapabilityRequirements: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         gainBidFileMethod: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
@@ -1178,7 +1233,7 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         otherLawContents: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
       },
       // 附件
@@ -1210,6 +1265,10 @@ export default {
     },
   },
   methods: {
+    onCreated(editor) {
+      this.editor = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
+      this.editor2 = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
+    },
     chooseProject(data) {
       // console.log(444, data);
       this.form.projectCode = data.projectCode;
@@ -1552,5 +1611,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/bid/options/bidBasePage.vue b/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
index 1fdf0629..95e52da6 100644
--- a/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
@@ -1144,7 +1144,9 @@ export default {
         socialCreditCode: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        remarkf: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        remark: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
         bidProjectName: [
           { required: true, message: "请选择招标项目名称", trigger: "blur" },
         ],
@@ -1163,7 +1165,7 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectOverview: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         estimatedContractPrice: [
           // { required: true, message: "请输入预估发包价", trigger: "blur" },
diff --git a/jwtech-admin-page/src/views/project/bid/options/projectContract.vue b/jwtech-admin-page/src/views/project/bid/options/projectContract.vue
index e75c1096..0d6b6e0b 100644
--- a/jwtech-admin-page/src/views/project/bid/options/projectContract.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/projectContract.vue
@@ -465,14 +465,6 @@
               </el-input>
             </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
@@ -487,19 +479,31 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
+            <el-form-item label="质量要求" prop="qualityRequirement">
+              <el-input
+                v-model="form.qualityRequirement"
+                placeholder="请输入质量要求"
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
             <el-form-item label="合同主要内容" prop="contractContent">
               <el-input
                 v-model="form.contractContent"
                 placeholder="请输入合同主要内容"
+                type="textarea"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="其他内容" prop="otherContent">
               <el-input
                 v-model="form.otherContent"
                 placeholder="请输入其他内容"
+                type="textarea"
               />
             </el-form-item>
           </el-col>
@@ -819,13 +823,13 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         qualityRequirement: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         contractContent: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         otherContent: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         bidProjectName: [
           { required: true, message: "请选择招标项目名称", trigger: "blur" },
diff --git a/jwtech-admin-page/src/views/project/preDesign/index.vue b/jwtech-admin-page/src/views/project/preDesign/index.vue
index 377490d4..8447043a 100644
--- a/jwtech-admin-page/src/views/project/preDesign/index.vue
+++ b/jwtech-admin-page/src/views/project/preDesign/index.vue
@@ -608,10 +608,10 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         briefIntroduction: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         projectLandSituation: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
       },
       // 初步设计概算报告