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 
# Conflicts:
#	src/views/lowdesign/reportDesign/index.vue
This commit is contained in:
chy
2026-03-12 13:58:48 +08:00
parent ccfb06113a e33fcb33fe
commit 89b3c978c5
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/lowdesign/reportDesign/index.vue
View File

@@ -354,7 +354,10 @@ const tableFormVerify = (type) => {
let tabKey = 'mysql'
// 子字段不能再包含子字段
if (item.isSubField && item.hasChildren === 'Y') {
<<<<<<< HEAD
=======
>>>>>>> e33fcb33fe4b8f77c8e4cfa9784af83018966c04
messageText = `<div style="line-height:24px">
<div>子字段不能包含子字段</div>
<div>序号：${index + 1}</div>