@@ -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 })); | |||
} | |||
// 存储 | |||
@@ -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, | |||
} | |||
} | |||
@@ -1,5 +1,5 @@ | |||
<template> | |||
<project-list v-if="true" /> | |||
<project-list v-if="isMini" /> | |||
<project-list-complex v-else /> | |||
</template> | |||
@@ -11,6 +11,12 @@ export default { | |||
components: { | |||
ProjectListComplex, | |||
ProjectList, | |||
}, | |||
data() { | |||
const { softwareVersion } = this.$store.state.currentPlatform; | |||
return { | |||
isMini: softwareVersion === 'Mini', | |||
} | |||
} | |||
} | |||
</script> |
@@ -259,6 +259,30 @@ | |||
</div> | |||
</el-form-item> | |||
</div> | |||
<div class="node-form-field"> | |||
<el-form-item | |||
label="软件版本:" | |||
prop="softwareVersion" | |||
> | |||
<div v-if="editing == false">{{nodeDetailFormData.softwareVersion | displaySoftwareCN}}</div> | |||
<div | |||
v-if="editing == true" | |||
class="boolEdit_Input" | |||
> | |||
<el-select | |||
v-model="nodeDetailFormData.softwareVersion" | |||
placeholder="请选择" | |||
> | |||
<el-option | |||
v-for="item in softwareOptions" | |||
:key="item.id" | |||
:label="item.label" | |||
:value="item.id" | |||
></el-option> | |||
</el-select> | |||
</div> | |||
</el-form-item> | |||
</div> | |||
<div class="node-form-field"> | |||
<el-form-item label="开户行:"> | |||
<div v-if="editing == false">{{nodeDetailFormData.openingBank}}</div> | |||
@@ -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(); | |||
@@ -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, | |||