|
@@ -12,7 +12,6 @@
|
|
</div>
|
|
</div>
|
|
<div class="m-t-base fill-blank radius-base p-base">
|
|
<div class="m-t-base fill-blank radius-base p-base">
|
|
<base-table
|
|
<base-table
|
|
- :key="tableKey"
|
|
|
|
v-loading="loading"
|
|
v-loading="loading"
|
|
border
|
|
border
|
|
stripe
|
|
stripe
|
|
@@ -43,7 +42,6 @@ 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 tableKey = ref(new Date().getTime() + '')
|
|
|
|
const subjectView = ref<any>({
|
|
const subjectView = ref<any>({
|
|
code: '',
|
|
code: '',
|
|
name: '',
|
|
name: '',
|
|
@@ -104,15 +102,22 @@ const mainStore = useMainStore()
|
|
|
|
|
|
const { fetch: subjectProgressEnd, result: subjectProgressEndList, loading } = useFetch('subjectProgressEnd')
|
|
const { fetch: subjectProgressEnd, result: subjectProgressEndList, loading } = useFetch('subjectProgressEnd')
|
|
|
|
|
|
|
|
+watch(subjectList, () => {
|
|
|
|
+ writeSubjectName()
|
|
|
|
+})
|
|
|
|
+
|
|
|
|
+const writeSubjectName = () => {
|
|
|
|
+ let sName = (subjectList.value || []).find((item: any) => item.code == model.subjectCode)?.name
|
|
|
|
+ subjectView.value = {
|
|
|
|
+ code: model.subjectCode,
|
|
|
|
+ name: sName || '',
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
// subjectProgressEnd({ subjectCode: mainStore.myUserInfo?.subjectCode || '' })
|
|
// subjectProgressEnd({ subjectCode: mainStore.myUserInfo?.subjectCode || '' })
|
|
const onSearch = () => {
|
|
const onSearch = () => {
|
|
subjectProgressEnd({ subjectCode: model.subjectCode }).then(() => {
|
|
subjectProgressEnd({ subjectCode: model.subjectCode }).then(() => {
|
|
- let sName = (subjectList.value || []).find((item: any) => item.code == model.subjectCode)?.name
|
|
|
|
- subjectView.value = {
|
|
|
|
- code: model.subjectCode,
|
|
|
|
- name: sName,
|
|
|
|
- }
|
|
|
|
- tableKey.value = new Date().getTime() + ''
|
|
|
|
|
|
+ writeSubjectName()
|
|
})
|
|
})
|
|
}
|
|
}
|
|
onOptionInit(onSearch)
|
|
onOptionInit(onSearch)
|