(cherry picked from commit b4ba1043d6)
pull/420/head
owen 2023-12-01 18:57:46 +08:00 committed by shizhong
parent a8f9fa152a
commit 20382bdb8e
25 changed files with 64 additions and 47 deletions

View File

@ -42,12 +42,16 @@ export const exportDemo03Student = async (params) => {
// 获得学生课程列表 // 获得学生课程列表
export const getDemo03CourseListByStudentId = async (studentId) => { export const getDemo03CourseListByStudentId = async (studentId) => {
return await request.get({ url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId }) return await request.get({
url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId
})
} }
// ==================== 子表(学生班级) ==================== // ==================== 子表(学生班级) ====================
// 获得学生班级 // 获得学生班级
export const getDemo03GradeByStudentId = async (studentId) => { export const getDemo03GradeByStudentId = async (studentId) => {
return await request.get({ url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId }) return await request.get({
url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId
})
} }

View File

@ -42,12 +42,16 @@ export const exportDemo03Student = async (params) => {
// 获得学生课程列表 // 获得学生课程列表
export const getDemo03CourseListByStudentId = async (studentId) => { export const getDemo03CourseListByStudentId = async (studentId) => {
return await request.get({ url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId }) return await request.get({
url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId
})
} }
// ==================== 子表(学生班级) ==================== // ==================== 子表(学生班级) ====================
// 获得学生班级 // 获得学生班级
export const getDemo03GradeByStudentId = async (studentId) => { export const getDemo03GradeByStudentId = async (studentId) => {
return await request.get({ url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId }) return await request.get({
url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId
})
} }

View File

@ -29,7 +29,12 @@
:class="showTopSearch ? 'w-220px ml2' : 'w-0'" :class="showTopSearch ? 'w-220px ml2' : 'w-0'"
@change="handleChange" @change="handleChange"
> >
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" /> <el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</div> </div>
</template> </template>
@ -73,7 +78,7 @@ function remoteMethod(data) {
function handleChange(path) { function handleChange(path) {
router.push({ path }) router.push({ path })
hiddenTopSearch(); hiddenTopSearch()
} }
function hiddenTopSearch() { function hiddenTopSearch() {

View File

@ -65,7 +65,7 @@ export default defineComponent({
{screenfull.value ? ( {screenfull.value ? (
<Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull> <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
) : undefined} ) : undefined}
{search.value ? (<RouterSearch isModal={false} />) : undefined} {search.value ? <RouterSearch isModal={false} /> : undefined}
{size.value ? ( {size.value ? (
<SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown> <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
) : undefined} ) : undefined}

View File

@ -95,7 +95,7 @@ const list = ref([]) // 列表的数据
const total = ref(0) // const total = ref(0) //
const queryParams = reactive({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10
}) })
const queryFormRef = ref() // const queryFormRef = ref() //
const exportLoading = ref(false) // const exportLoading = ref(false) //

View File

@ -12,9 +12,9 @@
v-model="formData.userIds" v-model="formData.userIds"
:data="userTree" :data="userTree"
:props="defaultProps" :props="defaultProps"
check-on-click-node
multiple multiple
filterable filterable
check-on-click-node
node-key="id" node-key="id"
placeholder="请选择规则适用人群" placeholder="请选择规则适用人群"
/> />
@ -25,8 +25,8 @@
:data="deptTree" :data="deptTree"
:props="defaultProps" :props="defaultProps"
multiple multiple
check-strictly
filterable filterable
check-strictly
node-key="id" node-key="id"
placeholder="请选择规则适用部门" placeholder="请选择规则适用部门"
/> />

View File

@ -8,7 +8,11 @@
<column-info-form ref="columnInfoRef" :columns="formData.columns" /> <column-info-form ref="columnInfoRef" :columns="formData.columns" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="生成信息" name="generateInfo"> <el-tab-pane label="生成信息" name="generateInfo">
<generate-info-form ref="generateInfoRef" :table="formData.table" :columns="formData.columns" /> <generate-info-form
ref="generateInfoRef"
:table="formData.table"
:columns="formData.columns"
/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-form> <el-form>

View File

@ -57,7 +57,7 @@ watch(
formData.value = [] formData.value = []
// 2. val // 2. val
if (!val) { if (!val) {
return; return
} }
try { try {
formLoading.value = true formLoading.value = true

View File

@ -38,11 +38,11 @@ watch(
id: undefined, id: undefined,
studentId: undefined, studentId: undefined,
name: undefined, name: undefined,
teacher: undefined, teacher: undefined
} }
// 2. val // 2. val
if (!val) { if (!val) {
return; return
} }
try { try {
formLoading.value = true formLoading.value = true

View File

@ -57,7 +57,7 @@ watch(
formData.value = [] formData.value = []
// 2. val // 2. val
if (!val) { if (!val) {
return; return
} }
try { try {
formLoading.value = true formLoading.value = true

View File

@ -38,11 +38,11 @@ watch(
id: undefined, id: undefined,
studentId: undefined, studentId: undefined,
name: undefined, name: undefined,
teacher: undefined, teacher: undefined
} }
// 2. val // 2. val
if (!val) { if (!val) {
return; return
} }
try { try {
formLoading.value = true formLoading.value = true