From 27bd145d82cb2ca120e5f8031b34dd6ab3743a31 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 22 Aug 2024 11:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ZyJxdgBanbenDetailForm.vue | 61 +++++++++++++- .../components/ZyJxdgBanbenEditForm.vue | 80 ++++++++++++++++--- .../components/ZyJxdgBanbenForm.vue | 2 +- 3 files changed, 131 insertions(+), 12 deletions(-) diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue index 452e9b1..d737531 100644 --- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue +++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue @@ -113,6 +113,20 @@ + + +
新增
+ + + +
@@ -131,7 +145,7 @@ import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue'; import { defHttp } from '/@/utils/http/axios'; import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods'; -import { queryZyJxdgMainListByMainId, queryZyJxdgMainListByMainId2, saveOrUpdate2,queryDataById2 } from '../ZyJxdgBanben.api'; +import { queryZyJxdgMainListByMainId, queryZyJxdgMainListByMainId2, saveOrUpdate2, queryDataById2 } from '../ZyJxdgBanben.api'; import { JVxeTable } from '/@/components/jeecg/JVxeTable'; import { zyJxdgMainColumns } from '../ZyJxdgBanben.data'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; @@ -368,11 +382,11 @@ export default defineComponent({ key: 'action', }; columns.push(inePar2); + console.log('👺11111111', columns); return columns; } //关联项目计算方法 function handleGlxm(item) { - console.log('👩‍🍳', item); var sfsglxm = item.sfsglxm; if (sfsglxm == '1') { //判断是否是关联项目 @@ -395,6 +409,7 @@ export default defineComponent({ } //判断当前项是否等于关联项 var item3 = item2.zyJxdgPzxxList; + console.log('👶', item3); if (item3 != null && item3.length > 0) { item2.list.push({ [item3[0].id]: title }); } @@ -404,6 +419,47 @@ export default defineComponent({ } } } + //两列关联项目计算方法 + function handleTwoGlxm(item) { + var sfsglxm = item.sfsglxm; + if (sfsglxm == '1') { + //判断是否是关联项目 + var list1 = item.list; //课程目标集合 + if (list1 != null) { + //关联项目是否有值 + var sort = item.sort; //第几个关联项目 + var alllist = zyJxdgMainTable.dataSource; //获取全部的数据 + for (var j = 0; j < alllist.length; j++) { + for (var i = 0; i < list1.length; i++) { + var item1 = list1[i]; + var item2 = alllist[j]; //具体数据 + item2.list = item2.list || []; + + if (item2.guanlian == sort) { + //判断当前项是否等于关联项 + var item3 = item.zyJxdgPzxxList; + var item4 = item2.zyJxdgPzxxList; + console.log('🤐', item2); + console.log('🕵️‍♀️', item3); + + var title1 = item1[item3[0].id]; + var title2 = item1[item3[1].id]; + console.log('🧜title', title1, title2); + //关联项目等于当前数据 + if (i == 0) { + //判断第一回将原来的清空重新赋值 + item2.list = []; + } + console.log('👶', item3); + if (item3 != null && item3.length > 0) { + item2.list.push({ [item4[0].id]: title1, [item4[1].id]: title2 }); + } + } + } + } + } + } + } return { zyJxdgMainTableRef, @@ -434,6 +490,7 @@ export default defineComponent({ handleGlxm, handleZzbg, handleZzbgDel, + handleTwoGlxm, }; }, }); diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue index 2f1cbbb..683786e 100644 --- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue +++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue @@ -22,6 +22,7 @@ 自增富文本 7 自增多行文本 8 自增表格 9 +自增表格(两列关联)10 --> @@ -46,7 +47,7 @@ - + @@ -113,6 +114,21 @@ + + +
新增
+ -{{ getTableZzColumns(item.zyJxdgPzxxList) }}- + + + +
@@ -230,13 +246,13 @@ export default defineComponent({ console.log('✋', alllist); var values = { - id:'', - rwbh:'202320242000629', - banbenId:oldInfo.value.id, - teacherNo:'2002900106', - sffb:'0', - list:alllist, - } + id: '', + rwbh: '202320242000629', + banbenId: oldInfo.value.id, + teacherNo: '2002900106', + sffb: '0', + list: alllist, + }; // const mainData = await getFormData(); // const subData = zyJxdgMainTable.dataSource; // const values = Object.assign({}, dbData, mainData); @@ -367,15 +383,18 @@ export default defineComponent({ } //关联项目计算方法 function handleGlxm(item) { - console.log('👩‍🍳', item); + console.log('👩‍🍳item', item); var sfsglxm = item.sfsglxm; if (sfsglxm == '1') { //判断是否是关联项目 var list1 = item.list; //课程目标集合 + console.log('👨‍🔧list1', list1); if (list1 != null) { //关联项目是否有值 var sort = item.sort; //第几个关联项目 + console.log('💆‍♂️sort', sort); var alllist = zyJxdgMainTable.dataSource; //获取全部的数据 + console.log('🧜‍♂️alllist', alllist); for (var j = 0; j < alllist.length; j++) { for (var i = 0; i < list1.length; i++) { var item1 = list1[i]; @@ -400,6 +419,48 @@ export default defineComponent({ } } + //两列关联项目计算方法 + function handleTwoGlxm(item) { + var sfsglxm = item.sfsglxm; + if (sfsglxm == '1') { + //判断是否是关联项目 + var list1 = item.list; //课程目标集合 + if (list1 != null) { + //关联项目是否有值 + var sort = item.sort; //第几个关联项目 + var alllist = zyJxdgMainTable.dataSource; //获取全部的数据 + for (var j = 0; j < alllist.length; j++) { + for (var i = 0; i < list1.length; i++) { + var item1 = list1[i]; + var item2 = alllist[j]; //具体数据 + item2.list = item2.list || []; + + if (item2.guanlian == sort) { + //判断当前项是否等于关联项 + var item3 = item.zyJxdgPzxxList; + var item4 = item2.zyJxdgPzxxList; + console.log('🤐', item2); + console.log('🕵️‍♀️', item3); + + var title1 = item1[item3[0].id]; + var title2 = item1[item3[1].id]; + console.log('🧜title', title1, title2); + //关联项目等于当前数据 + if (i == 0) { + //判断第一回将原来的清空重新赋值 + item2.list = []; + } + console.log('👶', item3); + if (item3 != null && item3.length > 0) { + item2.list.push({ [item4[0].id]: title1, [item4[1].id]: title2 }); + } + } + } + } + } + } + } + return { zyJxdgMainTableRef, zyJxdgMainTable, @@ -429,6 +490,7 @@ export default defineComponent({ handleGlxm, handleZzbg, handleZzbgDel, + handleTwoGlxm, }; }, }); diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue index 952c2f0..3e9d0e8 100644 --- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue +++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue @@ -52,7 +52,7 @@ 富文本 3 表单 4 表格 5 --> - + 新增字段