fix: 卡券布局修改

src/components/allCustomers/components/customerLog.vue

@@ -8,6 +8,7 @@
         filterable
         clearable
         :props="{ checkStrictly: true }"
+        @click="clickEvent"
         @change="filterMethod">
       </el-cascader>
       <el-date-picker style="width: 256px; margin-left:10px;" 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>
@@ -27,7 +28,7 @@
           <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: 90%;overflow: hidden; text-overflow:ellipsis;white-space:nowrap;vertical-align:middle" v-html="row.operRemark"></span>
+              <span style="display:block; max-width: 90%;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>
@@ -103,6 +104,10 @@ export default {
     this.getLogTypeData();
   },
   methods: {
+    clickEvent(ee){
+      // this.filterMethod();
+      console.log(ee, 'ee');
+    },
     // 级联搜索
     filterMethod(e) {
       if(e && e.length > 0) {

src/components/wechatmembers/cardvoucher.vue

@@ -84,38 +84,40 @@
                 <el-table-column
                   prop="putOnTime"
                   label="投放时间"
-                  width="160px"
+                  min-width="100px"
                   fixed
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.putOnTime | formatTime }}
+                     {{ scope.row.putOnTime | formatDate('ymd') }} <br /> {{ scope.row.putOnTime | formatDate('hms') }}
                   </template>
                 </el-table-column>
                 <el-table-column
                   prop="receiveTime"
                   label="领取时间"
-                  width="160px"
+                  min-width="100px"
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.receiveTime | formatTime }}
+                     {{ scope.row.receiveTime | formatDate('ymd') }} <br /> {{ scope.row.receiveTime | formatDate('hms') }}
                   </template>
                 </el-table-column>
                 <el-table-column
                   prop="receiveTime"
                   label="核销时间"
-                  width="160px"
+                  min-width="100px"
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.usedTime | formatTime }}
+                     {{ scope.row.usedTime | formatDate('ymd') }} <br /> {{ scope.row.usedTime | formatDate('hms') }}
                   </template>
                 </el-table-column>
                 <el-table-column
                   prop="receiveName"
                   label="投放来源"
+                  min-width="100px"
                 ></el-table-column>
                 <el-table-column
                   prop="cardType"
                   label="卡券类型"
+                  min-width="80px"
                 >
                 <template slot-scope="{row}">
                   {{row.cardType == 0 ? '抵金券' : row.cardType == 1 ? '折扣券' : row.cardType == 2 ? '兑换券' : '--'}}
@@ -124,6 +126,8 @@
                 <el-table-column
                   prop="cardName"
                   label="卡券名称"
+                  min-width="260px"
+                  show-overflow-tooltip
                 >
                 <template slot-scope="scope">
                   <el-tooltip open-delay="200" effect="dark" :content="scope.row.cardId || '--'" placement="top-start">
@@ -134,6 +138,7 @@
                 <el-table-column
                   prop="cardDenomination"
                   label="优惠额度"
+                  min-width="80px"
                 >
                 <template slot-scope="{row}">
                   {{row.cardType == 0 ? `${row.cardDenomination}元` : row.cardType == 1 ? `${row.cardDenomination}折` : '--'}}
@@ -142,7 +147,7 @@
                 <el-table-column
                   prop="receiveName"
                   label="有效期"
-                  width="160px"
+                  min-width="230px"
                 >
                 <template slot-scope="{row}">
                   <span v-if="row.cardEffectiveMode == 0 || (row.cardEffectiveMode == 2 && row.receiveTime != null) || (row.cardEffectiveMode == 1 && row.receiveTime != null)">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span>
@@ -154,6 +159,7 @@
                 <el-table-column
                   prop="cardCode"
                   label="卡券代码"
+                  min-width="150px"
                 >
                   <template slot-scope="scope">
                     <span v-if="scope.row.cardCode">{{ scope.row.cardCode }}</span>
@@ -163,6 +169,7 @@
                 <el-table-column
                   prop="status"
                   label="卡券状态"
+                  min-width="80px"
                 >
                   <div slot-scope="scope" v-html="formatStatus(scope.row)">
                     <!-- <span v-if="scope.row.status === -1">所有</span>
@@ -179,10 +186,12 @@
                 <el-table-column
                   prop="saleAmount"
                   label="销售额"
+                  min-width="80px"
                 > </el-table-column>
                 <el-table-column
                   prop="checkSource"
                   label="核销来源"
+                  min-width="80px"
                 >
                   <template slot-scope="scope">
                     <!-- <div v-if="scope.row.checkSource === 0">