From 658f8fd43e332232a36ff3e5f4f5e3333179e78a Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Sat, 2 Apr 2022 16:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E8=AF=A6=E6=83=85=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E6=82=AC=E5=81=9C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/SplitDetailTable/index.vue | 38 +++++++++++++------
 .../splitting/modules/SplitAddForm.vue        |  8 +++-
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue
index c93f144c0..b36a8a66b 100644
--- a/jero-web/src/components/SplitDetailTable/index.vue
+++ b/jero-web/src/components/SplitDetailTable/index.vue
@@ -13,20 +13,14 @@
         @change="tableOnChange"
       >
         <span slot="showContent" slot-scope="text, record">
-          <a-tooltip placement="top">
-            <template  slot="title">
-              <span v-html="record.iterms_conditions"></span>
-
+          <a-tooltip placement="top" class="item-content-tooltip" >
+            <template  slot="title" class="item-content-title">
+              <span class="item-content-show" v-html="record.iterms_conditions"></span>
             </template>
             <span class="content-show" href="javascript:;" @click="showContent">{{record.iterms_conditions&&record.iterms_conditions!=='null'?record.iterms_conditions.replace(/<.*?>/ig, ' ') : ''}}</span>
           </a-tooltip>
         </span>
-
-<!--        <span slot="showContent" slot-scope="text, record">-->
-
-<!--          <span class="content-show" href="javascript:;" :title="record.iterms_conditions" @click="showContent">{{record.iterms_conditions?record.iterms_conditions.replace(/<.*?>/ig, ' ') : '1111'}}</span>-->
-<!--        </span>-->
-        <span slot="operation" slot-scope="record">
+        <span slot="operation" slot-scope="record" class="operate">
            <a v-for="(ol,index) in OperationList"
               @click="OperationClick(ol,record)">
               <span class="text">
@@ -245,7 +239,7 @@
     }
   }
 </script>
-<style>
+<style lang="less">
   .table .ant-table-column-title {
     font-weight: bold;
   }
@@ -253,6 +247,28 @@
   .ant-table td {
     white-space: nowrap;
   }
+  .split-detail-wrap{
+    .table{
+      .ant-table-row-cell-break-word{
+        span{
+          display: block;
+          width: inherit;
+
+        }
+        .content-show{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .text{
+          display: inline-block;
+        }
+      }
+    }
+    .operate{
+      display: flex;
+    }
+  }
 </style>
 <style lang="less" scoped>
   .box {
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index 76f0d8de5..bf1f6474c 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -265,7 +265,7 @@
               </a-form>
               <div class="split-form-footer">
                 <a-button type="primary" class="footer-btn-save" @click="splitSave">{{$t('preservation')}}</a-button>
-                <a-button type="primary" @click="splitCancel">{{$t('cancel')}}</a-button>
+                <a-button @click="splitCancel">{{$t('cancel')}}</a-button>
               </div>
             </a-spin>
 <!--            图片预览-->
@@ -1113,6 +1113,12 @@
     .split-form-footer{
       margin-top: 20px;
       text-align: center;
+      position: fixed;
+      bottom:0px;
+      right: 0;
+      width: 900px;
+      padding-bottom:10px;
+      background: #FFFFFF;
       .footer-btn-save{
         margin-right: 20px;
       }