Merge branch 'dev' into build

# Conflicts:
#	components/AiOkrTree/AiOkrTree.vue
#	project/dv/apps/AppGridDV.vue
This commit is contained in:
aixianling
2022-08-23 11:04:07 +08:00
11 changed files with 252 additions and 1776 deletions

View File

@@ -85,7 +85,7 @@ export default {
}).then(res => {
if (res?.data) {
this.tableData = res.data?.records.map(e => {
let guaranteeModeLabel = e.guaranteeMode.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
let guaranteeModeLabel = e.guaranteeMode?.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
return {...e, guaranteeModeLabel}
})
this.page.total = res.data.total