diff --git a/src/store/index.js b/src/store/index.js index 59f50f9e..11a64be0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -109,7 +109,6 @@ export default { // if (isSuperAdmin) { // todo 服务商查询企业列表并生成platformList - // todo 暂时将模板控制台加入到超管账号中 platformList.push( platform(PLATFORM_TYPE.MANAGE_CENTER, companyId, 'LOCKING 总后台', undefined, []) // platform(PLATFORM_TYPE.TEMPLATE_CONSOLE, CompanyId, undefined, false, '模版控制台'), @@ -122,7 +121,7 @@ export default { } const { Data = {} } = companyInfoRes; const { - company: { LogoUrl, CompanyName, ServiceProviderStatus }, + company: { LogoUrl, CompanyName, ServiceProviderStatus, SoftwareVersion }, } = Data; const accessList = []; if(ServiceProviderStatus == 1) { @@ -134,7 +133,7 @@ export default { if (permission === 1) { accessList.push(AccessCode.ProjectManager); } - platformList.push(platform(PLATFORM_TYPE.COMPANY, companyId, CompanyName, LogoUrl, accessList)); + platformList.push(platform(PLATFORM_TYPE.COMPANY, companyId, CompanyName, LogoUrl, accessList, { softwareVersion: SoftwareVersion })); } // 存储 diff --git a/src/utils/access.js b/src/utils/access.js index 9b1b014e..16688c6d 100644 --- a/src/utils/access.js +++ b/src/utils/access.js @@ -14,13 +14,14 @@ export const PLATFORM_TYPE = { * @param {*} orgLogo 企业logo * @param {*} accessList 权限列表 */ -export function platform(platformType, orgId, orgName, orgLogo, accessList = []/* , hasCompanyManageAccess = false */ ) { +export function platform(platformType, orgId, orgName, orgLogo, accessList = [], options = {} ) { return { platformType, orgId, orgLogo, orgName, accessList, + ...options, } } diff --git a/src/views/main_web/project/index.vue b/src/views/main_web/project/index.vue index 1f8652d2..2faed6ed 100644 --- a/src/views/main_web/project/index.vue +++ b/src/views/main_web/project/index.vue @@ -1,5 +1,5 @@ @@ -11,6 +11,12 @@ export default { components: { ProjectListComplex, ProjectList, + }, + data() { + const { softwareVersion } = this.$store.state.currentPlatform; + return { + isMini: softwareVersion === 'Mini', + } } } \ No newline at end of file diff --git a/src/views/manage_system/customer/components/company-detail.vue b/src/views/manage_system/customer/components/company-detail.vue index 0e3cfbce..c1a37565 100644 --- a/src/views/manage_system/customer/components/company-detail.vue +++ b/src/views/manage_system/customer/components/company-detail.vue @@ -259,6 +259,30 @@ +
+ +
{{nodeDetailFormData.softwareVersion | displaySoftwareCN}}
+
+ + + +
+
+
{{nodeDetailFormData.openingBank}}
@@ -389,6 +413,12 @@ const dataParamRules = { ], }; +const softwareMap = { + Mini: '简易版', + Standard: '标准版', +} +const softwareOptions = Object.entries(softwareMap).map(([id, label]) => ({ id, label })); + export default { components: { CardHeader }, props: { @@ -401,12 +431,20 @@ export default { return { editing: this.node.id ? false : true, companyRules: dataParamRules, - nodeDetailFormData: {}, + nodeDetailFormData: { + softwareVersion: 'Mini', + }, industryOptions: [], proviceOptions: [], nodeDetailData: {}, + softwareOptions, }; }, + filters: { + displaySoftwareCN(v) { + return softwareMap[v] || ''; + } + }, computed: { el_formLabelcolor() { return this.editing ? "textlabelblock" : "textlabelgray"; @@ -464,6 +502,11 @@ export default { this.nodeDetailFormData.proviceName = target.label; } }, + // nodeDetailFormData(obj) { + // if(obj && !('softwareVersion' in obj)) { + // obj.softwareVersion = 'mini'; + // } + // } }, mounted() { this.loadIndustury(); diff --git a/src/views/manage_system/customer/services.js b/src/views/manage_system/customer/services.js index fc3eb305..1acf54bb 100644 --- a/src/views/manage_system/customer/services.js +++ b/src/views/manage_system/customer/services.js @@ -72,6 +72,7 @@ export async function fetchCompanyDetail(companyId) { serviceProviderStatus: resData.company.ServiceProviderStatus, templateConsoleStatus: resData.company.TemplateConsoleStatus, templateProxyStatus: resData.company.TemplateProxyStatus, + softwareVersion: resData.company.SoftwareVersion, cnName: userData.CnName, email: userData.Email, phone: userData.Phone, @@ -108,6 +109,7 @@ export async function createCompany(data) { // ModifyTime: data.modifyTime, ModifyUserId: data.modifyUserId, OpeningBank: data.openingBank, + SoftwareVersion: data.softwareVersion, // Password: data.password, ProviceId: data.proviceID, Remark: data.remark, @@ -147,6 +149,7 @@ export async function updateCompany(data) { // ModifyTime: data.modifyTime, ModifyUserId: data.modifyUserId, OpeningBank: data.openingBank, + SoftwareVersion: data.softwareVersion, // Password: data.password, ProviceId: data.proviceID, Remark: data.remark,