|
@@ -42,6 +42,10 @@ import type { ExtractApiResponse } from '@/api/api'
|
|
import type { EpTableColumn, InstanceTable } from 'global-type'
|
|
import type { EpTableColumn, InstanceTable } from 'global-type'
|
|
|
|
|
|
type SubjectProgress = ExtractArrayValue<ExtractApiResponse<'subjectProgressEnd'>>
|
|
type SubjectProgress = ExtractArrayValue<ExtractApiResponse<'subjectProgressEnd'>>
|
|
|
|
+const subjectView = ref<any>({
|
|
|
|
+ code: '',
|
|
|
|
+ name: '',
|
|
|
|
+})
|
|
const {
|
|
const {
|
|
subjectList,
|
|
subjectList,
|
|
mainQuestionList,
|
|
mainQuestionList,
|
|
@@ -100,7 +104,13 @@ const { fetch: subjectProgressEnd, result: subjectProgressEndList, loading } = u
|
|
|
|
|
|
// subjectProgressEnd({ subjectCode: mainStore.myUserInfo?.subjectCode || '' })
|
|
// subjectProgressEnd({ subjectCode: mainStore.myUserInfo?.subjectCode || '' })
|
|
const onSearch = () => {
|
|
const onSearch = () => {
|
|
- subjectProgressEnd({ subjectCode: model.subjectCode })
|
|
|
|
|
|
+ subjectProgressEnd({ subjectCode: model.subjectCode }).then(() => {
|
|
|
|
+ let sName = (subjectList.value || []).find((item: any) => item.code == model.subjectCode)?.name
|
|
|
|
+ subjectView.value = {
|
|
|
|
+ code: model.subjectCode,
|
|
|
|
+ name: sName,
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}
|
|
}
|
|
onOptionInit(onSearch)
|
|
onOptionInit(onSearch)
|
|
const getMainName = (row?: SubjectProgress) => {
|
|
const getMainName = (row?: SubjectProgress) => {
|
|
@@ -211,10 +221,11 @@ const columns: EpTableColumn<SubjectProgress>[] = [
|
|
{
|
|
{
|
|
label: '科目',
|
|
label: '科目',
|
|
formatter() {
|
|
formatter() {
|
|
- let sName = (subjectList.value || []).find((item: any) => item.code == model.subjectCode)?.name
|
|
|
|
- return (
|
|
|
|
- (mainStore.myUserInfo?.subjectCode || model.subjectCode) + '-' + (mainStore.myUserInfo?.subjectName || sName)
|
|
|
|
- )
|
|
|
|
|
|
+ // let sName = (subjectList.value || []).find((item: any) => item.code == model.subjectCode)?.name
|
|
|
|
+ // return (
|
|
|
|
+ // (mainStore.myUserInfo?.subjectCode || model.subjectCode) + '-' + (mainStore.myUserInfo?.subjectName || sName)
|
|
|
|
+ // )
|
|
|
|
+ return subjectView.value.code + '-' + subjectView.value.name
|
|
},
|
|
},
|
|
minWidth: 100,
|
|
minWidth: 100,
|
|
},
|
|
},
|