Ver código fonte

后台字段添加软件版本;完成前台基于软件版本字段的判断

dev
zhengzhou 3 anos atrás
pai
commit
1fad04e4e9
5 arquivos alterados com 58 adições e 6 exclusões
  1. +2
    -3
      src/store/index.js
  2. +2
    -1
      src/utils/access.js
  3. +7
    -1
      src/views/main_web/project/index.vue
  4. +44
    -1
      src/views/manage_system/customer/components/company-detail.vue
  5. +3
    -0
      src/views/manage_system/customer/services.js

+ 2
- 3
src/store/index.js Ver arquivo

@@ -109,7 +109,6 @@ export default {
// //
if (isSuperAdmin) { if (isSuperAdmin) {
// todo 服务商查询企业列表并生成platformList // todo 服务商查询企业列表并生成platformList
// todo 暂时将模板控制台加入到超管账号中
platformList.push( platformList.push(
platform(PLATFORM_TYPE.MANAGE_CENTER, companyId, 'LOCKING 总后台', undefined, []) platform(PLATFORM_TYPE.MANAGE_CENTER, companyId, 'LOCKING 总后台', undefined, [])
// platform(PLATFORM_TYPE.TEMPLATE_CONSOLE, CompanyId, undefined, false, '模版控制台'), // platform(PLATFORM_TYPE.TEMPLATE_CONSOLE, CompanyId, undefined, false, '模版控制台'),
@@ -122,7 +121,7 @@ export default {
} }
const { Data = {} } = companyInfoRes; const { Data = {} } = companyInfoRes;
const { const {
company: { LogoUrl, CompanyName, ServiceProviderStatus },
company: { LogoUrl, CompanyName, ServiceProviderStatus, SoftwareVersion },
} = Data; } = Data;
const accessList = []; const accessList = [];
if(ServiceProviderStatus == 1) { if(ServiceProviderStatus == 1) {
@@ -134,7 +133,7 @@ export default {
if (permission === 1) { if (permission === 1) {
accessList.push(AccessCode.ProjectManager); 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 }));
} }


// 存储 // 存储


+ 2
- 1
src/utils/access.js Ver arquivo

@@ -14,13 +14,14 @@ export const PLATFORM_TYPE = {
* @param {*} orgLogo 企业logo * @param {*} orgLogo 企业logo
* @param {*} accessList 权限列表 * @param {*} accessList 权限列表
*/ */
export function platform(platformType, orgId, orgName, orgLogo, accessList = []/* , hasCompanyManageAccess = false */ ) {
export function platform(platformType, orgId, orgName, orgLogo, accessList = [], options = {} ) {
return { return {
platformType, platformType,
orgId, orgId,
orgLogo, orgLogo,
orgName, orgName,
accessList, accessList,
...options,
} }
} }




+ 7
- 1
src/views/main_web/project/index.vue Ver arquivo

@@ -1,5 +1,5 @@
<template> <template>
<project-list v-if="true" />
<project-list v-if="isMini" />
<project-list-complex v-else /> <project-list-complex v-else />
</template> </template>


@@ -11,6 +11,12 @@ export default {
components: { components: {
ProjectListComplex, ProjectListComplex,
ProjectList, ProjectList,
},
data() {
const { softwareVersion } = this.$store.state.currentPlatform;
return {
isMini: softwareVersion === 'Mini',
}
} }
} }
</script> </script>

+ 44
- 1
src/views/manage_system/customer/components/company-detail.vue Ver arquivo

@@ -259,6 +259,30 @@
</div> </div>
</el-form-item> </el-form-item>
</div> </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"> <div class="node-form-field">
<el-form-item label="开户行:"> <el-form-item label="开户行:">
<div v-if="editing == false">{{nodeDetailFormData.openingBank}}</div> <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 { export default {
components: { CardHeader }, components: { CardHeader },
props: { props: {
@@ -401,12 +431,20 @@ export default {
return { return {
editing: this.node.id ? false : true, editing: this.node.id ? false : true,
companyRules: dataParamRules, companyRules: dataParamRules,
nodeDetailFormData: {},
nodeDetailFormData: {
softwareVersion: 'Mini',
},
industryOptions: [], industryOptions: [],
proviceOptions: [], proviceOptions: [],
nodeDetailData: {}, nodeDetailData: {},
softwareOptions,
}; };
}, },
filters: {
displaySoftwareCN(v) {
return softwareMap[v] || '';
}
},
computed: { computed: {
el_formLabelcolor() { el_formLabelcolor() {
return this.editing ? "textlabelblock" : "textlabelgray"; return this.editing ? "textlabelblock" : "textlabelgray";
@@ -464,6 +502,11 @@ export default {
this.nodeDetailFormData.proviceName = target.label; this.nodeDetailFormData.proviceName = target.label;
} }
}, },
// nodeDetailFormData(obj) {
// if(obj && !('softwareVersion' in obj)) {
// obj.softwareVersion = 'mini';
// }
// }
}, },
mounted() { mounted() {
this.loadIndustury(); this.loadIndustury();


+ 3
- 0
src/views/manage_system/customer/services.js Ver arquivo

@@ -72,6 +72,7 @@ export async function fetchCompanyDetail(companyId) {
serviceProviderStatus: resData.company.ServiceProviderStatus, serviceProviderStatus: resData.company.ServiceProviderStatus,
templateConsoleStatus: resData.company.TemplateConsoleStatus, templateConsoleStatus: resData.company.TemplateConsoleStatus,
templateProxyStatus: resData.company.TemplateProxyStatus, templateProxyStatus: resData.company.TemplateProxyStatus,
softwareVersion: resData.company.SoftwareVersion,
cnName: userData.CnName, cnName: userData.CnName,
email: userData.Email, email: userData.Email,
phone: userData.Phone, phone: userData.Phone,
@@ -108,6 +109,7 @@ export async function createCompany(data) {
// ModifyTime: data.modifyTime, // ModifyTime: data.modifyTime,
ModifyUserId: data.modifyUserId, ModifyUserId: data.modifyUserId,
OpeningBank: data.openingBank, OpeningBank: data.openingBank,
SoftwareVersion: data.softwareVersion,
// Password: data.password, // Password: data.password,
ProviceId: data.proviceID, ProviceId: data.proviceID,
Remark: data.remark, Remark: data.remark,
@@ -147,6 +149,7 @@ export async function updateCompany(data) {
// ModifyTime: data.modifyTime, // ModifyTime: data.modifyTime,
ModifyUserId: data.modifyUserId, ModifyUserId: data.modifyUserId,
OpeningBank: data.openingBank, OpeningBank: data.openingBank,
SoftwareVersion: data.softwareVersion,
// Password: data.password, // Password: data.password,
ProviceId: data.proviceID, ProviceId: data.proviceID,
Remark: data.remark, Remark: data.remark,


Carregando…
Cancelar
Salvar