Merge branch 'feature/7月迭代-会员' of http://git.gicdev.com/gicmember/member into feature/7月迭代-会员

src/components/allCustomers/components/customerLog.vue

@@ -2,7 +2,7 @@
   <div style="padding:20px">
     <div class="logTop">
       <el-cascader
-        style="width:260px;"
+        style="width:260px;height:32px;margin-bottom:3px"
         placeholder="全部类型/全部事由"
         :options="options"
         filterable
@@ -22,19 +22,24 @@
       <el-table-column prop="operType" label="日志类型" min-width="166px" :formatter="(row, col, val) => val || '--'" />
       <el-table-column prop="operReason" label="事由" min-width="138px" :formatter="(row, col, val) => val || '--'" />
       <el-table-column prop="operContent" label="日志详情" min-width="301px" show-overflow-tooltip :formatter="(row, col, val) => val || '--'"/>
-      <el-table-column prop="operRemark" label="备注" min-width="290px" show-overflow-tooltip>
+      <el-table-column prop="operRemark" label="备注" min-width="290px">
         <template slot-scope="{ row }">
-          <span v-if="row.operRemark" v-html="row.operRemark" />
+          <div v-if="row.operRemark" style="width: 100%" ref="operRemark">
+            <el-tooltip placement="top" :disabled="row.hideTip">
+              <div style="max-width: 400px" slot="content" v-html="row.operRemark"></div>
+              <span style="display:inline-block; max-width: 95%;overflow: hidden; text-overflow:ellipsis;white-space:nowrap;vertical-align:middle" v-html="row.operRemark"></span>
+            </el-tooltip>
+            <el-button v-if="memberId && (row.operType == '客户合并' && row.referLogId && (row.referLogId != -1 && row.referLogId != ''))" type="text" @click="goLink('/customerLog',row.referLogId)">查看</el-button>
+          </div>
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column prop="" label="操作" min-width="77px" v-if="memberId">
+      <!-- <el-table-column prop="" label="操作" min-width="77px" v-if="memberId">
         <template slot-scope="{ row }">
           <el-button v-if="row.operType == '客户合并' && row.referLogId && (row.referLogId != -1 && row.referLogId != '')" type="text" @click="goLink('/customerLog',row.referLogId)">查看</el-button>
           <p v-else>--</p>
-          <!-- <el-button @click="goLink('/customerLog',row.referLogId)">查看</el-button> -->
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <div class="page mTop20" v-if="totalCount > 0">
       <dm-pagination
@@ -140,6 +145,20 @@ export default {
               return el;
             });
             this.totalCount = res.data.result.page.totalCount;
+            this.$nextTick(() => {
+              const maxWidth = this.$refs.operRemark.clientWidth;
+              const div = document.createElement('div');
+              div.style.position = 'fixed';
+              div.style.zIndex = -1;
+              div.style.opacity = 0;
+              document.body.appendChild(div);
+              this.tableData = this.tableData.map(el => {
+                div.innerHTML = el.operRemark;
+                el.hideTip = div.clientWidth / maxWidth < 0.8;
+                return el;
+              })
+              document.body.removeChild(div);
+            })
           } else {
             checkFalse(res.data.message);
             return false;
@@ -207,7 +226,7 @@ export default {
   display: flex;
   align-items: center;
   margin-right: 10px;
-  line-height: normal;
+  // line-height: normal;
   vertical-align: middle;
 }
 .tip-p{

src/components/wechatmembers/integralDataPage.vue

@@ -54,7 +54,7 @@
           <el-option label="所有积分状态" :value=-1></el-option>
           <el-option v-for="item in frozenStatusList" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
-         <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
+         <el-date-picker style="width: 256px;margin-bottom:1px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
       </div>
       <el-button
         v-if="getCodeAuth('memberAdjustIntegral')"