diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java index 20d6dd7..b287b7b 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java @@ -125,8 +125,6 @@ public class XxhbjwxtjxrwController extends JeecgController zjXkxxQueryWrapper = new QueryWrapper<>(); zjXkxxQueryWrapper.eq("user_id",sysUser.getUsername()); List list = zjXkxxService.zjList(zjXkxxQueryWrapper); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java index 838d3d6..04fb99d 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java @@ -31,9 +31,16 @@ public class Xxhbjwxtjxrw implements Serializable { private static final long serialVersionUID = 1L; /**学年学期*/ - @Excel(name = "学年学期", width = 15) @ApiModelProperty(value = "学年学期") private java.lang.String xnxqdm; + /**xn*/ + @Excel(name = "学年", width = 15) + @ApiModelProperty(value = "学年") + private java.lang.String xn; + /**xqmc*/ + @Excel(name = "学期", width = 15) + @ApiModelProperty(value = "学期") + private java.lang.String xqmc; /**kcmc*/ @Excel(name = "课程名称", width = 15) @ApiModelProperty(value = "课程名称") @@ -55,31 +62,21 @@ public class Xxhbjwxtjxrw implements Serializable { @ApiModelProperty(value = "学时") private java.lang.String zxs; /**kkyxmc*/ - @Excel(name = "开课单位名称", width = 15) + @Excel(name = "开课单位", width = 15) @ApiModelProperty(value = "开课单位名称") private java.lang.String kkyxmc; /**所属校内专业(大类)名称*/ - @Excel(name = "所属校内专业(大类)名称", width = 15) - @ApiModelProperty(value = "所属校内专业(大类)名称") + @Excel(name = "专业名称", width = 15) + @ApiModelProperty(value = "所属校内专业(大类)") private String zymc; /**teaxm*/ @Excel(name = "任课教师[职称]", width = 15) @ApiModelProperty(value = "任课教师[职称]") private java.lang.String teaxm; /**bjxx*/ - @Excel(name = "班级", width = 15) @ApiModelProperty(value = "班级") private java.lang.String bjxx; - /**xn*/ - @Excel(name = "学年", width = 15) - @ApiModelProperty(value = "学年") - private java.lang.String xn; - /**xqmc*/ - @Excel(name = "学期", width = 15) - @ApiModelProperty(value = "学期") - private java.lang.String xqmc; /**sjfs*/ - @Excel(name = "试卷份数", width = 15) @ApiModelProperty(value = "试卷份数") private java.lang.String sjfs; /**khfsmc*/ @@ -87,13 +84,13 @@ public class Xxhbjwxtjxrw implements Serializable { @ApiModelProperty(value = "考试方式") private java.lang.String khfsmc; /**isUploadSj*/ - @Excel(name = "是否能上传考核分析及试卷样本", width = 15) @ApiModelProperty(value = "是否能上传考核分析及试卷样本") private java.lang.String isUploadSj; /**jxbrs*/ - @Excel(name = "jxbrs", width = 15) @ApiModelProperty(value = "jxbrs") private String jxbrs; + @Excel(name = "审核状态", width = 15) + private String fileShztmc; @TableField(exist = false) diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList.vue new file mode 100644 index 0000000..4c7dd86 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts index 538067d..c4548f3 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts @@ -5,10 +5,22 @@ import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ + // { + // title: '学年学期', + // align: "center", + // dataIndex: 'xnxqdm' + // }, { - title: '学年学期', + title: '学年', align: "center", - dataIndex: 'xnxqdm' + dataIndex: 'xn', + width: 100 + }, + { + title: '学期', + align: "center", + dataIndex: 'xqmc', + width: 80 }, { title: '课程名称', @@ -43,7 +55,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'kkyxmc' }, { - title: '所属校内专业(大类)', + title: '专业名称', align: "center", dataIndex: 'zymc', width: 220 @@ -53,36 +65,32 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'teaxm' }, - { - title: '班级', - align: "center", - dataIndex: 'bjxx' - }, - { - title: '学年', - align: "center", - dataIndex: 'xn' - }, - { - title: '学期', - align: "center", - dataIndex: 'xqmc' - }, - { - title: '试卷份数', - align: "center", - dataIndex: 'sjfs' - }, + // { + // title: '班级', + // align: "center", + // dataIndex: 'bjxx' + // }, + // { + // title: '试卷份数', + // align: "center", + // dataIndex: 'sjfs' + // }, { title: '考试方式', align: "center", - dataIndex: 'khfsmc' + dataIndex: 'khfsmc', + width: 80 }, { - title: '是否能上传考核分析及试卷样本', + title: '审核状态', align: "center", - dataIndex: 'isUploadSj' + dataIndex: 'fileShztmc' }, + // { + // title: '是否能上传考核分析及试卷样本', + // align: "center", + // dataIndex: 'isUploadSj' + // }, ]; diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue index 388b1b0..868b978 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue @@ -82,7 +82,13 @@ /> - + + + + + + + 查询 @@ -262,15 +268,15 @@ /> - - + + + + + + + 查询 - 重置 + @@ -470,18 +476,18 @@ function textDown(type, downame) { } //选课提交 -function handleXUanze(record) { +async function handleXUanze(record) { record.id = null; console.log('😰record----------', record); - defHttp + await defHttp .post({ url: '/zjXkxx/zjXkxx/add', params: record, }) .then((res) => { console.log('🤛', res); + xtsuccess(); }); - xtsuccess(); } //选课提交 @@ -529,9 +535,9 @@ function handleView(record) { function onChangeTab(tab) { console.log('🎒', tab); - if(tab==2){ + if (tab == 2) { khpjclFormModal.value.init(jxrwInfo.value); //考核评价材料 - }else if(tab==3){ + } else if (tab == 3) { xsysclFormModal.value.init(jxrwInfo.value); //学生原始材料 } } @@ -571,6 +577,8 @@ function searchQuery() { */ function searchQuery2() { queryParam2.value.pageNo = paginationProp.value.current; + queryParam2.value.fileShztmc = '审核通过'; + console.log('🧛', queryParam2); defHttp.get({ url: '/xxhbjwxtjxrw/xxhbjwxtjxrw/list', params: { pageNo: paginationProp.value.current, ...queryParam2.value } }).then((res) => { dataList.value = res.records; paginationProp.value.total = res.total; diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue index 6558db1..7aa8bfa 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue @@ -82,7 +82,13 @@ /> - + + + + + + + 查询 @@ -262,12 +268,12 @@ /> - + + + + + + 查询 重置 @@ -469,18 +475,18 @@ function textDown(type, downame) { } //选课提交 -function handleXUanze(record) { +async function handleXUanze(record) { record.id = null; console.log('😰record----------', record); - defHttp + await defHttp .post({ url: '/zjXkxx/zjXkxx/add', params: record, }) .then((res) => { console.log('🤛', res); + xtsuccess(); }); - xtsuccess(); } //选课提交 @@ -570,6 +576,7 @@ function searchQuery() { */ function searchQuery2() { queryParam2.value.pageNo = paginationProp.value.current; + queryParam2.value.fileShztmc = '审核通过'; defHttp.get({ url: '/xxhbjwxtjxrw/xxhbjwxtjxrw/list', params: { pageNo: paginationProp.value.current, ...queryParam2.value } }).then((res) => { dataList.value = res.records; paginationProp.value.total = res.total;