admin/gr_report_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web

Browse Source
This commit is contained in:
mll
2026-03-25 12:04:04 +08:00
parent 7e57cfb871 c5ff4c263f
commit a441538178
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/LowDesign/src/LowTable/components/import/importHistory.vue
View File

@@ -118,7 +118,7 @@ const getTableData = async () => {
}) })
if (userIds.length) { if (userIds.length) {
const dicRes = await DicApi.getDicTableText({ const dicRes = await DicApi.getDicTableText({
lideeYunji_dictLabel: encryptAES(JSON.stringify([{ userIdList: [...new Set(userIds)] }])) lideeYunJi_dictLabel: encryptAES(JSON.stringify([{ userIdList: [...new Set(userIds)] }]))
}) })
if (dicRes?.userList) { if (dicRes?.userList) {
dicRes.userList.forEach((item) => (userObj[item.id] = item.nickname)) dicRes.userList.forEach((item) => (userObj[item.id] = item.nickname))

2
src/components/LowDesign/src/utils/formUtil.ts
View File

@@ -624,7 +624,7 @@ export const formDataFormatting = (formOption, formData, formType) => {
} }
if (dicApiData.length) { if (dicApiData.length) {
DicApi.getDicTableText({ DicApi.getDicTableText({
lideeYunji_dictLabel: encryptAES(JSON.stringify(dicApiData)) lideeYunJi_dictLabel: encryptAES(JSON.stringify(dicApiData))
}).then(dicData => { }).then(dicData => {
const dictData = { const dictData = {
userList: { dicKey: 'userSelect', label: 'nickname' }, userList: { dicKey: 'userSelect', label: 'nickname' },

2
src/components/LowDesign/src/utils/getName.ts
View File

@@ -24,7 +24,7 @@ export const setUserAndDeptName = (params) => {
userList: { dicKey: 'userSelect', label: 'nickname' }, userList: { dicKey: 'userSelect', label: 'nickname' },
deptList: { dicKey: 'deptSelect', label: 'name' } deptList: { dicKey: 'deptSelect', label: 'name' }
} }
getDicTableText({ lideeYunji_dictLabel: encryptAES(JSON.stringify(dictLabel)) }).then( getDicTableText({ lideeYunJi_dictLabel: encryptAES(JSON.stringify(dictLabel)) }).then(
(dicData) => { (dicData) => {
for (const key in dicData) { for (const key in dicData) {
const dicObj = {} const dicObj = {}

10
src/components/LowDesign/src/utils/tableUtil.ts
View File

@@ -886,7 +886,7 @@ export const tableFormatting = (data, column, otherData: any = {}) => {
}) })
//查询回显文本 //查询回显文本
const dicApiData: any = { lideeYunji_dictLabel: [] } const dicApiData: any = { lideeYunJi_dictLabel: [] }
if (dicTableData.keyList.length) { if (dicTableData.keyList.length) {
const dicTableApiData: Array<string> = [] const dicTableApiData: Array<string> = []
dicTableData.keyList.forEach(key => { dicTableData.keyList.forEach(key => {
@@ -899,17 +899,17 @@ export const tableFormatting = (data, column, otherData: any = {}) => {
dicTableData[key].dataList = [...new Set(dicTableData[key].dataList)].filter((id: string) => !lowStore.dicObj[key] ? true : !lowStore.dicObj[key][id]) dicTableData[key].dataList = [...new Set(dicTableData[key].dataList)].filter((id: string) => !lowStore.dicObj[key] ? true : !lowStore.dicObj[key][id])
if (dicTableData[key].dataList.length) dicTableApiData.push(dicTableData[key]) if (dicTableData[key].dataList.length) dicTableApiData.push(dicTableData[key])
}) })
dicApiData.lideeYunji_dictLabel.push(...dicTableApiData) dicApiData.lideeYunJi_dictLabel.push(...dicTableApiData)
} }
for (const key in userAndDeptControl.typeKey) { for (const key in userAndDeptControl.typeKey) {
const abbr = userAndDeptControl.typeKey[key] const abbr = userAndDeptControl.typeKey[key]
userAndDeptControl[`${abbr}Ids`] = userAndDeptControl[`${abbr}Ids`].filter(id => { userAndDeptControl[`${abbr}Ids`] = userAndDeptControl[`${abbr}Ids`].filter(id => {
return /^(\d+)$/.test(id + '') return /^(\d+)$/.test(id + '')
}) })
if (userAndDeptControl[`${abbr}Ids`].length) dicApiData.lideeYunji_dictLabel.push({ [`${abbr}IdList`]: [...new Set(userAndDeptControl[`${abbr}Ids`])] }) if (userAndDeptControl[`${abbr}Ids`].length) dicApiData.lideeYunJi_dictLabel.push({ [`${abbr}IdList`]: [...new Set(userAndDeptControl[`${abbr}Ids`])] })
} }
if (dicApiData.lideeYunji_dictLabel.length) { if (dicApiData.lideeYunJi_dictLabel.length) {
dicApiData.lideeYunji_dictLabel = encryptAES(JSON.stringify(dicApiData.lideeYunji_dictLabel)) dicApiData.lideeYunJi_dictLabel = encryptAES(JSON.stringify(dicApiData.lideeYunJi_dictLabel))
const dictData = { const dictData = {
userList: { dicKey: 'userSelect', label: 'nickname', value: 'id' }, userList: { dicKey: 'userSelect', label: 'nickname', value: 'id' },
deptList: { dicKey: 'deptSelect', label: 'name', value: 'id' } deptList: { dicKey: 'deptSelect', label: 'name', value: 'id' }