Merge branch 'blueBranch' into allTestUrgent

src/HManagement/accountManage/modules/account_detail.vue

@@ -212,7 +212,7 @@ export default {
           label:this.$t('状态'),
           value:this.mainData.status === 'ACTIVE'?this.$t('启用'):this.mainData.status === 'INACTIVE'?this.$t('停用'):this.$t('其他'),
           style: () => {
-            let color = that.tool.getStatusColor(that.accountInfo.status == '禁用'?'停用':that.accountInfo.status,true);
+            let color = that.tool.getStatusColor(that.mainData.status === 'ACTIVE'?that.$t('启用'):that.mainData.status === 'INACTIVE'?that.$t('停用'):that.$t('其他'),true);
             return { color: color };
           },
         },