Merge branch 'crm_16.4' into debug

src/views/custom_manage/contacts/contactsList.vue

@@ -54,12 +54,12 @@
       </el-autocomplete>
     </div>
     <el-card>
-      <el-table :data="tableData" style="width: 100%" border @sort-change="sortChangeHandle">
+      <el-table :data="tableData" style="width: 100%" border @sort-change="sortChangeHandle" :row-class-name="setRowClass">
         <el-table-column align="center" prop="RealName" width="90" label="姓名">
           <template slot-scope="{ row }">
             <span>{{ row.RealName }}</span>
-            
-            <img width="16" v-if="row.HaveMoveButton" style="vertical-align: middle; cursor: pointer" src="../../../assets/img/contact_transfer.jpg" alt="" @click="clickContactTransfer(row)" />
+
+            <img v-if="row.IsMaker == 1" class="name-maker" src="~@/assets/img/is_maker_icon.png" alt="" />
           </template>
         </el-table-column>
         <el-table-column align="center" prop="Mobile" width="110" label="手机号/邮箱">
@@ -76,15 +76,24 @@
         </el-table-column>
         <el-table-column align="center" prop="Status" width="110" label="状态"> </el-table-column>
         <el-table-column align="center" prop="SellerName" width="110" label="所属销售"> </el-table-column>
-        <el-table-column align="center" prop="IsMaker" width="80" label="是否KP">
+        <el-table-column align="center" prop="IsMaker" width="80" label="职位">
           <template slot-scope="{ row }">
-            {{ row.IsMaker == 1 ? "是" : "否" }}
+            {{ row.Position }}
           </template>
         </el-table-column>
         <el-table-column align="center" prop="RegisterTime" width="110" label="注册时间"> </el-table-column>
-        <el-table-column align="center" width="120" label="是否关注公众号">
+        <el-table-column align="center" width="140" label="可接收公众号推送">
           <template slot-scope="{ row }">
-            {{ row.IsSubscribeCygx == 1 ? "是" : "否" }}
+            <div style="text-align: left">
+              <img v-if="row.IsSubscribeCygx == 1" style="width: 16px; height: 16px" src="~@/assets/img/icons/icon_1.png" alt="" />
+              <img v-else style="width: 16px; height: 16px" src="~@/assets/img/icons/icon_2.png" alt="" />
+              <span>查研观向小助手</span>
+            </div>
+            <div style="text-align: left">
+              <img v-if="row.IsSubscribeMfyx == 1" style="width: 16px; height: 16px" src="~@/assets/img/icons/icon_1.png" alt="" />
+              <img v-else style="width: 16px; height: 16px" src="~@/assets/img/icons/icon_2.png" alt="" />
+              <span>买方研选</span>
+            </div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="InteractionNum" width="110" label="互动量" :render-header="renderHeader" sortable="custom">
@@ -112,7 +121,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="" label="备注" width="90">
+        <!-- <el-table-column align="center" prop="" label="备注" width="90">
           <template slot-scope="{ row }">
             <div class="remark-list">
               <div class="button">
@@ -121,7 +130,7 @@
               </div>
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align="center" prop="" label="操作" width="160">
           <template slot-scope="{ row }">
             <span :class="row.IsRemind ? 'deletesty' : 'editsty'" @click="remindHandler(row)">{{ row.IsRemind ? "取消提醒" : "互动提醒" }}</span>
@@ -461,6 +470,13 @@ export default {
       this.contactTransferDlgVisible = true;
       this.TransferMobile = item.Mobile;
     },
+    // 设置表格行的样式
+    setRowClass({ row }) {
+      if (row.IsMaker == 1) {
+        console.log(row);
+        return "not-read-seven-days";
+      }
+    },
   },
   /* 页面跳转前记录参数 */
   beforeRouteLeave(to, from, next) {
@@ -486,8 +502,21 @@ export default {
   },
 };
 </script>
+<style>
+.not-read-seven-days {
+  background-color: #fff8f8 !important;
+}
+</style>
 <style scoped lang="scss">
 .container-contactsList {
+  .name-maker {
+    width: 32px;
+    height: 22px;
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+
   .el-select {
     width: 200px;
     margin-right: 20px;