update: 积分

src/components/allCustomers/info.js

@@ -180,7 +180,10 @@ export default {
   },
   watch: {
     count: function (n, o) {
-      if (n === 4) this.fullscreenLoading = false;
+      if (n === 4){
+        this.fullscreenLoading = false;
+        if(!this.memberInfo.erpIntegralFlag) this.$message.error('查询ERP积分失败，当前积分为上次同步积分，实际积分以ERP为准');
+      }
     },
   },
   filters: {

src/components/wechatmembers/enterpriseIntegralDataPage.vue

@@ -7,7 +7,7 @@
       </el-tab-pane>
       <el-tab-pane label="集团预扣明细" name="second">
         <p class="font14 tip-p">展示近两年的预扣明细</p>
-        <enterprise-intergral-withhold :member-id="cliqueMemberId"></enterprise-intergral-withhold>
+        <enterprise-intergral-withhold :member-id="cliqueMemberId" :is-enterprise="true"></enterprise-intergral-withhold>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -18,14 +18,17 @@ import enterpriseIntegralDetial from './enterpriseIntegralDetial.vue';
 import enterpriseIntergralWithhold from './enterpriseIntergralWithhold.vue';
 export default {
   name: 'enterpriseIntegralDataPage',
-  components: { enterpriseIntegralDetial,enterpriseIntergralWithhold },
+  components: { 
+    enterpriseIntegralDetial,
+    enterpriseIntergralWithhold
+    },
   props: {
   },
   data() {
     return {
       activeName: 'first',
       memberId: this.$route.query.memberId || "",
-      cliqueMemberId: this.$route.query.cliqueMemberId || ""
+      cliqueMemberId: this.$route.query.cliqueMemberId || "",
     };
   },
   methods: {

src/components/wechatmembers/enterpriseIntegralDetial.vue

@@ -102,7 +102,13 @@
           min-width="150px"
         >
         <template slot-scope="scope">
-            <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.brandName || '--'}}</div>
+          <el-tooltip placement="top">
+              <div slot="content">
+                <p>{{scope.row.brandName}}</p>
+              </div>
+              <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.brandName }}</div>
+          </el-tooltip>
+            <!-- <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.brandName || '--'}}</div> -->
         </template>
         </el-table-column>
         <el-table-column
@@ -111,7 +117,13 @@
           min-width="160px"
         >
         <template slot-scope="scope">
-            <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.remark }}</div>
+          <el-tooltip placement="top">
+              <div slot="content">
+                <p>{{scope.row.remark}}</p>
+              </div>
+              <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.remark }}</div>
+          </el-tooltip>
+            <!-- <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.remark }}</div> -->
         </template>
         </el-table-column>
       </el-table>

src/components/wechatmembers/enterpriseIntergralWithhold.vue

@@ -78,12 +78,23 @@
         </template>
         </el-table-column>
         <el-table-column
+          v-if="isEnterprise"
+          prop="brandName"
+          label="来源品牌"
+          min-width="100px"
+        ></el-table-column>
+        <el-table-column
           prop="openStoreName"
           label="积分成本主体"
           min-width="180px"
         >
         <template slot-scope="scope">
-            <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.openStoreName }}</div>
+            <el-tooltip placement="top">
+              <div slot="content">
+                <p>{{scope.row.openStoreName}}</p>
+              </div>
+              <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.openStoreName }}</div>
+            </el-tooltip>
         </template>
         </el-table-column>
         <el-table-column
@@ -92,7 +103,13 @@
           min-width="130px"
         >
         <template slot-scope="scope">
-            <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.intervalEffect }}</div>
+          <el-tooltip placement="top">
+              <div slot="content">
+                <p>{{scope.row.intervalEffect}}</p>
+              </div>
+              <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.intervalEffect }}</div>
+          </el-tooltip>
+            <!-- <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.intervalEffect }}</div> -->
         </template>
         </el-table-column>
       </el-table>
@@ -133,12 +150,18 @@ export default {
       default() {
         return '';
       }
+    },
+    isEnterprise: {
+      type: Boolean,
+      default() {
+        return false
+      }
     }
   },
   data() {
     return {
         memberData: [
-            // {createTime:1723736363636,integralVal:344,intervalEffect:'的好多好多',processStatus:2,limitTime:236363738821,openStoreName:'i u 合适',relationId:'udjdhdu883733737'},
+            // {createTime:1723736363636,integralVal:344,intervalEffect:'的好',processStatus:2,limitTime:236363738821,openStoreName:'ii u 合适就说好多好多好多的好多好多好多的反反复复 u 合适',relationId:'udjdhdu883733737'},
             // {createTime:1723736363636,integralVal:344,intervalEffect:'的好多好多',processStatus:1,openStoreName:'i u 合精华的和阿胶恶毒的接电话电话讲的点点滴滴是适'},
             // {createTime:1723736363636,integralVal:344,intervalEffect:'的好多好多',processStatus:3},
             // {createTime:1723736363636,integralVal:344,intervalEffect:'的好多好多',processStatus:4},
@@ -148,7 +171,6 @@ export default {
           pageSize: 20,
           totalCount: 0
         },
-
         statusList:[
         {code: -1 ,name:'全部处理状态'},
          {code: 1 ,name:'待处理',icon:'dm-status--warning'},
@@ -173,15 +195,6 @@ export default {
       this.getIntegralDataPage();
     },
     getIntegralDataPage() {
-      // console.log({
-      //   memberId: this.memberId,
-      //   pageSize: this.page.pageSize,
-      //   currentPage: this.page.currentPage,
-      //   processStatus: this.processStatus,
-      //   beginTime: this.dateDefault[0],
-      //   endTime: this.dateDefault[1],
-      // });
-      // return
       doFetch(url.enterpriseIntegralWithholdData, {
         memberId: this.memberId,
         pageSize: this.page.pageSize,