From dd30e3e457eb85922fec9427584b200406371ce0 Mon Sep 17 00:00:00 2001
From: zhuangxinwei <1152856986@qq.com>
Date: Fri, 30 Sep 2022 16:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localTool/standAutoSplit/pages/itemSplitInfo.vue     | 9 +++++----
 .../processCenter/pages/creatProcess/bzzqyj/step3.vue    | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index e72d17826..d8a54e3c2 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -86,10 +86,11 @@
               :resizable="false"
               align="center">
               <template slot-scope="scope">
-                <el-tooltip placement="top">
-                  <div slot="content">{{scope.row.itermsConditions}}</div>
-                  <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
-                </el-tooltip>
+                <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
+<!--                <el-tooltip placement="top">-->
+<!--                  <div slot="content">{{scope.row.itermsConditions}}</div>-->
+<!--                  <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>-->
+<!--                </el-tooltip>-->
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" :resizable="false" fixed="right">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 05a24a848..94f1ae745 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -317,7 +317,7 @@
                 title="查看修改前内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
@@ -423,7 +423,7 @@
             },
             itermsConditionsOpen (row) {
                 this.itermsConditionsFlag = true
-                this.itermsConditionsTitle = row
+                this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             optionsChange (data) {
                 for  (let a = 0; a < this.options.length; a++) {