From 48376d187bdaf4885c7545046de0e254d6ac7353 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Mon, 29 Jan 2024 10:03:01 +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

---
 jwtech-admin-page/package.json                |  2 +
 .../options/marginAccount.vue                 | 31 ++++++++++----
 .../project/bid/options/candidatePage.vue     | 41 +++++++++++++++++--
 3 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/jwtech-admin-page/package.json b/jwtech-admin-page/package.json
index b640e55b..dfa953c7 100644
--- a/jwtech-admin-page/package.json
+++ b/jwtech-admin-page/package.json
@@ -42,6 +42,8 @@
   "dependencies": {
     "@antv/x6": "^1.28.1",
     "@riophae/vue-treeselect": "0.4.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^1.0.2",
     "axios": "0.18.1",
     "clipboard": "2.0.4",
     "core-js": "3.6.5",
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue
index 9db8fa46..f4114743 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue
@@ -9,7 +9,7 @@
     >
       <el-form-item label="收取方式" prop="incomeExpenditureMethods">
         <el-select
-          v-model="queryParams.data.incomeExpenditureMethods"
+          v-model="queryParams.cv.value"
           placeholder="请选择收取方式"
           clearable
           size="small"
@@ -674,7 +674,7 @@ export default {
           differentiatedDepositAmount: null,
           amountPayable: null,
           paidAmount: null,
-          incomeExpenditureMethods: [],
+          incomeExpenditureMethods: null,
           depositBankSalaryDeposit: null,
           salaryDepositBankAccount: null,
           cashAmount: null,
@@ -701,12 +701,13 @@ export default {
           proNo: null,
           owerDept: null,
         },
+        cv: {},
         // 排序方式
         params: {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
       },
       // 表单参数
@@ -819,10 +820,16 @@ export default {
     },
     // 收取方式字典翻译
     incomeExpenditureMethodsFormat(row, column) {
-      return this.selectDictLabel(
-        this.incomeExpenditureMethodsOptions,
-        row.incomeExpenditureMethods
-      );
+      if (row.incomeExpenditureMethods?.length > 0) {
+        let res = "";
+        row.incomeExpenditureMethods.forEach((item) => {
+          res =
+            res +
+            "、" +
+            this.selectDictLabel(this.incomeExpenditureMethodsOptions, item);
+        });
+        return res.substr(1);
+      }
     },
     /** 查询工资保证金账户管理列表 */
     getList() {
@@ -919,11 +926,21 @@ export default {
           owerDept: null,
           remark: null,
         },
+        cv: {},
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.cv.name = "incomeExpenditureMethods";
+      this.queryParams.cv.type = "like";
       this.queryParams.pageNum = 1;
       this.getList();
     },
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 9eec0371..2f69acdd 100644
--- a/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
@@ -341,12 +341,28 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="评标情况" prop="evaluationSituation">
-              <el-input
+              <!-- <el-input
                 v-model="publicityForm.evaluationSituation"
                 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="publicityForm.evaluationSituation"
+                  :default-value="333"
+                  :defaultConfig="editorConfig"
+                  :mode="mode"
+                  @onCreated="onCreated"
+                />
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -646,6 +662,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 评标情况 </template>
+            <!-- <div v-html="infoMsg.evaluationSituation"></div> -->
             {{ this.infoMsg.evaluationSituation }}
           </el-descriptions-item>
           <el-descriptions-item>
@@ -790,12 +807,19 @@ 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: "BidWinning",
   props: ["proNo"],
+  components: { Editor, Toolbar },
   data() {
     return {
+      editor: null,
+      toolbarConfig: {},
+      editorConfig: { placeholder: "请输入评标情况" },
+      mode: "default", // or 'simple'
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -937,6 +961,11 @@ export default {
   created() {
     this.getList();
   },
+  // beforeDestroy() {
+  //   const editor = this.editor;
+  //   if (editor == null) return;
+  //   editor.destroy(); // 组件销毁时，及时销毁编辑器
+  // },
   // 父组件  利用axios请求得到的值  传送到子组件，要监听，否则初始渲染时为空
   watch: {
     proNo: function (n, o) {
@@ -945,6 +974,9 @@ export default {
     },
   },
   methods: {
+    onCreated(editor) {
+      this.editor = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
+    },
     chooseProject(data) {
       // console.log(444, data);
       this.publicityForm.projectCode = data.projectCode;
@@ -980,7 +1012,7 @@ export default {
         lotName: null,
         noticeName: null,
         bidOpenDate: null,
-        evaluationSituation: null,
+        evaluationSituation: "",
         tendererName: null,
         officeAddress: null,
         bidderContacts: null,
@@ -1280,6 +1312,7 @@ export default {
   }
 }
 </style>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
 <!-- <style lang="scss" scoped>
 ::v-deep {
   .el-dialog {