fix: 客户日志接口修改

src/components/allCustomers/components/customerLog.vue

@@ -14,21 +14,21 @@
       <p class="font14 tip-p" v-if="!memberId">展示近一年的日志</p>
     </div>
     <el-table :data="tableData"  style="width: 100%">
-      <el-table-column prop="createTime" label="时间" min-width="100px">
+      <el-table-column prop="createTime" label="时间" min-width="138px">
         <template slot-scope="scope">
           {{ scope.row.createTime | formatDate('ymd') }} <br /> {{ scope.row.createTime | formatDate('hms') }}
         </template>
       </el-table-column>
-      <el-table-column prop="operType" label="日志类型" min-width="100px" :formatter="(row, col, val) => val || '--'" />
-      <el-table-column prop="operReason" label="事由" min-width="100px" :formatter="(row, col, val) => val || '--'" />
-      <el-table-column prop="operContent" label="日志详情" min-width="230px" show-overflow-tooltip :formatter="(row, col, val) => val || '--'"/>
-      <el-table-column prop="operRemark" label="备注" min-width="230px" show-overflow-tooltip>
+      <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>
         <template slot-scope="{ row }">
           <span v-if="row.operRemark" v-html="row.operRemark" />
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column prop="" label="操作" width="80" 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>
@@ -99,16 +99,15 @@ export default {
   methods: {
     // 级联搜索
     filterMethod(e) {
-      console.log(e.length);
       if(e && e.length > 0) {
-        if(e[0]) {
+        // if(e[0]) {
           this.logPageParam.operType = e[0];
-        }else if (e[1]) {
+        // }else if (e[1]) {
           this.logPageParam.operReason = e[1]
-        }
+        // }
       }else {
         this.logPageParam.operType = null;
-        // this.logPageParam.operReason = null;
+        this.logPageParam.operReason = null;
       }
       this.logPageParam.currentPage = 1;
       this.getLogPage();

src/components/wechatmembers/integralDataPage.vue

@@ -72,7 +72,7 @@
         <el-table-column
           prop="callBeginTime"
           label="时间"
-          min-width="110px"
+          min-width="118px"
         >
           <template slot-scope="scope">
             {{ scope.row.createTime | formatDate('ymd') }} <br /> {{ scope.row.createTime | formatDate('hms') }}
@@ -81,7 +81,7 @@
         <el-table-column
           prop="intervalInout"
           label="日志类型"
-          min-width="80px"
+          min-width="120px"
         >
           <template slot-scope="scope">
             <span v-if="scope.row.intervalInout == 1">积分获取</span>
@@ -91,12 +91,12 @@
         <el-table-column
           prop="memberIntegralName"
           label="事由"
-          min-width="90px"
+          min-width="108px"
         ></el-table-column>
         <el-table-column
           prop="intervalHistory"
           label="日志详情"
-          min-width="80px"
+          min-width="132px"
         >
           <template slot-scope="scope">
             <span :style="{color: scope.row.intervalHistory > 0 ? 'green' : 'red'}">{{ scope.row.intervalHistory }}</span>
@@ -111,28 +111,28 @@
             <span>{{  row.frozenStatus==1?'冻结':'可用' }}</span>
           </template>
         </el-table-column> -->
-        <el-table-column prop="sourceType" label="来源渠道" min-width="80px" :formatter="formatSourceType"></el-table-column>
+        <el-table-column prop="sourceType" label="来源渠道" min-width="98px" :formatter="formatSourceType"></el-table-column>
         <el-table-column
           prop="remark"
           label="备注"
-          min-width="160px"
+          min-width="128px"
         ></el-table-column>
         <el-table-column
           prop="mainStoreName"
           label="服务门店"
-          min-width="160px"
+          min-width="146px"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="openStoreName"
           label="开卡门店"
-          min-width="160px"
+          min-width="141px"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="intervalEffect"
           label="积分成本主体"
-          min-width="110px"
+          min-width="132px"
           show-overflow-tooltip
         >
           <template slot-scope="scope">