From eab0b3a79e7f6c1fa53fc2c853fe0602c560947a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 23 Aug 2024 19:42:00 +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
---
src/views/kc/zyJxdgBanben/ZyJxdgBanben.api.ts | 2 +
.../kc/zyJxdgBanben/ZyJxdgBanbenList.vue | 13 ++-
.../components/ZyJxdgBanbenDetailForm.vue | 105 +++++++++++-------
.../checkKecheng/dqxqkcMenu.vue | 6 +
4 files changed, 81 insertions(+), 45 deletions(-)
diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgBanben.api.ts b/src/views/kc/zyJxdgBanben/ZyJxdgBanben.api.ts
index 8608fe1..5f37383 100644
--- a/src/views/kc/zyJxdgBanben/ZyJxdgBanben.api.ts
+++ b/src/views/kc/zyJxdgBanben/ZyJxdgBanben.api.ts
@@ -16,6 +16,7 @@ enum Api {
queryDataById = '/zyJxdgBanben/zyJxdgBanben/queryById',
queryDataById2 = '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbh',
queryZyJxdgMainListByMainId2 = '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbhList',
+ queryZyJxdgMainListByMainId3 = '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryZyJxdgMainListByMainId3',
zyJxdgMainList = '/zyJxdgBanben/zyJxdgBanben/queryZyJxdgMainByMainId',
}
/**
@@ -35,6 +36,7 @@ export const getImportUrl = Api.importExcel;
*/
export const queryZyJxdgMainListByMainId = (id) => defHttp.get({url: Api.zyJxdgMainList, params:{ id }});
export const queryZyJxdgMainListByMainId2 = (rwbh,teacherNo) => defHttp.get({url: Api.queryZyJxdgMainListByMainId2, params:{ rwbh,teacherNo }});
+export const queryZyJxdgMainListByMainId3 = (params) => defHttp.get({url: Api.queryZyJxdgMainListByMainId3, params});
/**
* 列表接口
diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgBanbenList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgBanbenList.vue
index d82ed18..af1b766 100644
--- a/src/views/kc/zyJxdgBanben/ZyJxdgBanbenList.vue
+++ b/src/views/kc/zyJxdgBanben/ZyJxdgBanbenList.vue
@@ -127,7 +127,7 @@
openModal4(true, {
record,
isUpdate: true,
- showFooter: false,
+ showFooter: true,
});
}
@@ -167,12 +167,13 @@
},
{
label: '模仿教师填写',
- onClick: handleTianxie.bind(null, record),
- },
- {
- label: '填写后详情',
onClick: handleDetail.bind(null, record),
- }, {
+ },
+ // {
+ // label: '填写后详情',
+ // onClick: handleDetail.bind(null, record),
+ // },
+ {
label: '删除',
popConfirm: {
placement: 'topRight',
diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
index 3b38a61..ce78cb5 100644
--- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
+++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
@@ -23,15 +23,23 @@
自增多行文本 8
自增表格 9
-->
+
+ {{ oldInfo.title }}（{{ oldInfo.twoTitle_dictText }}）教学大纲
+
-
+
-
+
{{ item.title }}
-
+
@@ -68,9 +76,15 @@
添加
-
-
- 删除
+
+
+ 删除
@@ -80,9 +94,9 @@
添加
-
+
- 删除
+ 删除
@@ -92,7 +106,7 @@
添加
-
+
删除
@@ -119,7 +133,7 @@
- 删除
+ 删除
@@ -145,7 +159,13 @@
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,
+ queryZyJxdgMainListByMainId3,
+ 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';
@@ -216,21 +236,31 @@ export default defineComponent({
async function edit(row) {
oldInfo.value = row;
- row.rwbh = '202320242000629';
- row.teacherNo = '2002900106';
+ oldInfo.value.rwbh = '202320242000629';
+ oldInfo.value.teacherNo = '1001901726';
+ oldInfo.value.banbenId = row.id;
+ row.rwbh = oldInfo.value.rwbh;
+ row.teacherNo = oldInfo.value.teacherNo;
//主表数据
await queryMainData(row);
+ var params = {
+ mainId: row.id,
+ rwbh: row.rwbh,
+ teacherNo: row.teacherNo,
+ };
//子表数据
- const zyJxdgMainDataList = await queryZyJxdgMainListByMainId2(row['rwbh'], row['teacherNo']);
+ const zyJxdgMainDataList = await queryZyJxdgMainListByMainId3(params);
console.log('💁♀️', zyJxdgMainDataList);
zyJxdgMainTable.dataSource = [...zyJxdgMainDataList];
}
async function queryMainData(record) {
const row = await queryDataById2(record);
- Object.keys(row).map((k) => {
- formData[k] = row[k];
- });
+ if (row) {
+ Object.keys(row).map((k) => {
+ formData[k] = row[k];
+ });
+ }
}
const { getSubFormAndTableData, transformData } = useValidateAntFormAndTable(activeKey, {
@@ -246,17 +276,14 @@ export default defineComponent({
const alllist = zyJxdgMainTable.dataSource;
console.log('✋', alllist);
- var values = {
- id: '',
- rwbh: '',
- banbenId: '',
- teacherNo: '',
- sffb: '',
- list: alllist,
- };
+ var values = {};
const mainData = await getFormData();
+ console.log('🧙♀️', mainData);
values = mainData;
+ values.rwbh = oldInfo.value.rwbh;
+ values.banbenId = oldInfo.value.banbenId;
values.list = alllist;
+ // values.teacherNo = oldInfo.value.teacherNo;
// const subData = zyJxdgMainTable.dataSource;
// const values = Object.assign({}, dbData, mainData);
// values.zyJxdgMainList = subData;
@@ -434,7 +461,7 @@ export default defineComponent({
var item1 = list1[i];
var item2 = alllist[j]; //具体数据
item2.list = item2.list || [];
-
+
if (item2.guanlian == sort) {
//判断当前项是否等于关联项
var item3 = item.zyJxdgPzxxList;
@@ -503,31 +530,31 @@ export default defineComponent({
padding-left: 10px;
position: relative;
color: #333333;
- line-height:40px;
+ line-height: 40px;
}
.tishi {
width: 100%;
display: flex;
- flex-direction: column;
+ flex-direction: column;
text-align: left;
margin: 5px;
margin: 10px 0;
}
-.tishi span{
+.tishi span {
margin: 0 15px;
font-size: 12px;
color: #ff9924;
}
-.increase{
+.increase {
position: absolute;
- right:6px;
- top:-51px;
+ right: 6px;
+ top: -51px;
+}
+.place-dele {
+ margin: 10px 0;
+}
+.Sheet {
+ color: #91949a;
+ border-radius: 4px;
}
-.place-dele{
- margin:10px 0;
- }
- .Sheet{
- color:#91949a;
- border-radius: 4px;
- }
\ No newline at end of file
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index ab564b5..1d7f29b 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -45,6 +45,12 @@
课堂测验
+