Merge branch 'crm/crm_15.9.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_share.go

@@ -530,7 +530,7 @@ func (this *CompanyController) CompanyShareList() {
 			//btnItem = services.GetCompanyPermissionButtonByReceiveEnabled(btnItem, receiveEnabled)
 
 			// 13.6正式客户共享按钮显示控制
-			btnItem = services.GetShareCompanyPermissionButton(roleTypeCode, strings.Replace(itemStatus, "(共享)", "", -1), item.ProductId, item, sysUser)
+			btnItem = services.GetShareCompanyPermissionButton(roleTypeCode, itemStatus, item.ProductId, item, sysUser)
 		}
 		list[i].BtnItem = btnItem
 

services/company.go

@@ -1229,30 +1229,31 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 			//如果是组长，且该客户属于本组客户
 			if authority == 2 && hasGroupId && groupId == sysUserGroupId {
 				button.BtnView = true                             //查看详情权限
+				button.BtnRemarkViewHistory = true                //历史备注
 				if productStatus == utils.COMPANY_STATUS_FORMAL { //正式
 					button.BtnModifySeller = true
 					//button.BtnShare = true
 					//button.BtnRemarkView = true //权益销售隐藏
-					button.BtnRemarkViewHistory = true
+					//button.BtnRemarkViewHistory = true
 				} else if productStatus == utils.COMPANY_STATUS_TRY_OUT { //试用
 					button.BtnModifySeller = true
 					//button.BtnRemarkView = true //权益销售隐藏
-					button.BtnRemarkViewHistory = true
+					//button.BtnRemarkViewHistory = true
 					//button.BtnShare = true
 				} else if productStatus == utils.COMPANY_STATUS_FREEZE { //冻结
 					button.BtnModifySeller = true
 					//button.BtnRemarkView = true //权益销售隐藏
-					button.BtnRemarkViewHistory = true
+					//button.BtnRemarkViewHistory = true
 				} else if productStatus == utils.COMPANY_STATUS_LOSE { //流失
 					if sellerId == sysUserId || groupId == sysUserGroupId || utils.InArrayByStr(shareSellerIdArr, strconv.Itoa(sysUserId)) || shareSellerId == sysUserId {
 						button.BtnApplyReceive = true
 					} else {
 						button.BtnReceive = true
 					}
-					button.BtnRemarkViewHistory = true
+					//button.BtnRemarkViewHistory = true
 				} else { //永续
 					//button.BtnDelete = true
-					button.BtnRemarkViewHistory = true
+					//button.BtnRemarkViewHistory = true
 				}
 			}
 
@@ -2422,6 +2423,7 @@ func FilterReadAndContractAuth(chartPermissions, contractPermissions, condition
 
 // GetShareCompanyPermissionButton 正式客户共享-权限按钮
 func GetShareCompanyPermissionButton(roleTypeCode, statuses string, productId int, item *company.CompanyItem, sysUser *system.Admin) (button *company.ButtonPermission) {
+	statuses = strings.Replace(statuses, "(共享)", "", -1)
 	statusMap := make(map[int]string)
 	statusMap[productId] = statuses
 	if strings.Contains(statuses, "/") {
@@ -2506,6 +2508,9 @@ func GetShareCompanyPermissionButton(roleTypeCode, statuses string, productId in
 	//备注与历史备注修改 CRM15.9.1
 	button.BtnRemarkView = companyButton.BtnRemarkView
 	button.BtnRemarkViewHistory = companyButton.BtnRemarkViewHistory
+	if productId == 2 {
+		button.BtnRemarkView = false
+	}
 
 	if utils.InArrayByStr([]string{utils.ROLE_TYPE_CODE_RAI_ADMIN, utils.ROLE_TYPE_CODE_RAI_SELLER, utils.ROLE_TYPE_CODE_RAI_GROUP}, roleTypeCode) {
 		button.BtnServiceRecord = false //王芳，权益销售，权益销售组长，这三种身份看不到这个按钮