拆分详情增加

jero-web/src/components/SplitDetailTable/index.vue

@@ -13,8 +13,19 @@
         @change="tableOnChange"
       >
         <span slot="showContent" slot-scope="text, record">
-          <a class="content-show" href="javascript:;" :title="record.iterms_conditions" @click="showContent">{{record.iterms_conditions}}</a>
+          <a-tooltip placement="top">
+            <template  slot="title">
+              <span 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">
            <a v-for="(ol,index) in OperationList"
               @click="OperationClick(ol,record)">
@@ -92,6 +103,12 @@
         orderByField: ''
       }
     },
+    watch:{
+      menuId(oldValue,newValue){
+        // console.log('oldnew',oldValue,newValue)
+        this.getTableList()
+      }
+    },
     mounted() {
       eventBUs.$on('searchQuery', search => {
         Object.keys(search).forEach(res => {
@@ -140,15 +157,9 @@
               })
               if(res.db_field_name=='iterms_conditions'){
                 this.columns[index].width='35%'
-              }
-              if (res.click) {
                 this.columns[index].scopedSlots = {
                   customRender: 'showContent'
                 }
-              } else {
-                this.columns[index].scopedSlots = {
-                  customRender: 'detailText'
-                }
               }
             })
             // console.log('columns',this.columns)
@@ -167,6 +178,7 @@
                 scopedSlots: { customRender: 'operation' }
               })
             }
+
           }
         })
       },
@@ -245,15 +257,7 @@
     height: calc(100% - 100px);
     overflow: auto;
     .content-show{
-      width: 500px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 3;
-      -webkit-box-orient: vertical;
-      height: 60px;
-      line-height: 20px;
-      white-space: pre-wrap;
+      /*text-align: center;*/
     }
   }