Merge remote-tracking branch 'origin/master'

src/views/saleManage/requireManage/pages/requireDetail.vue

@@ -424,7 +424,6 @@
                             }
                         }
                         this.getCompanyInfoById(res.result.businessId);
-                        this.getUserInfoFunc();
                     }else{
                         this.$message.error(res.msg);
                     }
@@ -440,6 +439,7 @@
                         this.companyInfo = res.result;
                         this.companyInfo.industryList = res.result.companyIndustryStr?res.result.companyIndustryStr.split(",").join(" | "):"";
                         this.companyInfo.companyLabelList = res.result.companyLabel?res.result.companyLabel.split(","):"";
+                        this.getUserInfoFunc();
                     }else{
                         this.$message.error(res.msg);
                     }
@@ -483,6 +483,7 @@
                 var userInfo = window.localStorage.getItem("userInfo") ? JSON.parse(this.Base64.decode(window.localStorage.getItem("userInfo"))) : "";
                 if (userInfo) {
                     this.userInfo = userInfo;
+                    console.log(this.companyInfo)
                     if(userInfo.empId==this.companyInfo.createdBy){ //是自己
                         this.operationVisible = true;
                         // this.navTitleList = ["title","serviceRecord","basicInfo","contactInfo","sendself"];