Merge branch 'CRM_14.5'

config/index.js

@@ -40,6 +40,7 @@ module.exports = {
 			// target:'http://rddpapi.brilliantstart.cn', // 接口的域名
 			// target:'https://admin.hzinsights.com', // 接口的域名
 	  	   target:'http://8.136.199.33:7777', // 接口的域名
+	  	  //  target:'http://192.168.77.7:8602', // 接口的域名
 			// secure:false,  // 如果是https接口，需要配置这个参数
 			changeOrigin:true, // 如果接口跨域，需要进行这个参数配置
 			pathRewrite:{

src/api/modules/crmApi.js

@@ -249,6 +249,13 @@ const customInterence = {
   concactEdit: (params) => {
     return http.post("/custom/user/edit", params);
   },
+  /* 关注/取消关注 联系人
+  UserId CompanyId
+  Type 0取关 1关注
+  */
+  concactFollow: (params) => {
+    return http.post("/custom/follow", params);
+  },
   /* 获取权限基本信息 */
   authList: (params) => {
     return http.get("/custom/permission/list", params);

src/views/custom_manage/customList/customDetail.vue

@@ -210,6 +210,7 @@
 				ref="userTable"
 				:data="userTable"
 				v-loading="isShowloadding"
+				:row-class-name="setRowClass"
 				element-loading-text="数据加载中..."
 				border>
 					<el-table-column
@@ -224,6 +225,7 @@
 							<img :src="$icons.card" alt="" style="width:17px;cursor:pointer;marginRight:5px;"
 							v-if="scope.row.BusinessCardUrl"
 							@click="reviewCard(scope.row.BusinessCardUrl)">
+							<img src="~@/assets/img/icons/like-heart.png" class="name-follow-heart" v-if="scope.row.IsFollow==1">
 							<span :class="{'isShared':scope.row.IsShared}">{{scope.row.RealName}}</span>
 						</template>
 					</el-table-column>
@@ -309,6 +311,9 @@
 							<div class="contact-opt-box" style="color:#4099ef; font-size:14px;">
 								<span  class="editsty" @click="editContact(scope.row)">编辑</span>
 								<span class="editsty move" style="margin:0 5px;" @click="handleShowMove(scope.row)">移动</span>
+								<span style="margin-right:5px;" :class="scope.row.IsFollow==1?'deletesty':'editsty'"
+								@click="followContact(scope.row)"
+								>{{ scope.row.IsFollow==1?'取消关注':'关注' }}</span>
 								<span class="deletesty" @click.stop="delConcat(scope.row)">删除</span>
 								<!-- <block v-if="RoleType!='权益'&&ficcform&&['正式','试用','永续'].includes(ficcform.Status)">
 								<span 
@@ -1259,7 +1264,29 @@ export default {
 			this.isAddContact = true;
 			this.diatit = '编辑联系人';
 		},
-		
+		// 关注与取消关注
+		followContact(row){
+			// console.log(row);
+			let isFollow = row.IsFollow==1
+			let confirmText = isFollow?'是否取消':'是否设为'
+			this.$confirm(`${confirmText}特别关注？`, "提示", {
+        type: "warning",
+      }).then(() => {
+				let params={
+					UserId:row.UserId,
+					CompanyId:row.CompanyId,
+					Type:isFollow?0:1
+				}
+				customInterence.concactFollow(params).then(res=>{
+					if(res.Ret == 200){
+						this.$message.success(isFollow?"取消成功":"关注成功")
+						this.getuserTable()
+					}
+				})
+
+			})
+			.catch(() => {});
+		},
 		// 删除联系人判断 试用、正式、永续、冻结状态下的客户 如只剩一个联系人不允许删除
 		/**
 		 * 1.如果是非管理员用户则直接根据数量判断
@@ -1538,6 +1565,12 @@ export default {
 		this.isShowDlgType = type
 		this.isShowResearchNumber =true
 	},
+	// 设置表格行的样式
+	setRowClass({row}){
+		if(row.NotRead && row.IsFollow==1){
+			return "not-read-seven-days"
+		}
+	}
 	},
 	mounted() {
 		this.getDetail();
@@ -1677,6 +1710,16 @@ export default {
 		align-items: center;
 		margin-bottom: 28px;
 	}
+	.name-follow-heart{
+		width:25px;
+		height: 15px;
+		position: absolute;
+		left: 0;
+    top: 0;
+	}
+	.not-read-seven-days{
+		background-color: #FFF8F8;
+	}
 }
 .customDetail_contract_dialog {
 	max-height: 810px;