刘洋 hace 2 años
padre
commit
ab80a655d4
Se han modificado 1 ficheros con 16 adiciones y 5 borrados
  1. 16 5
      src/modules/quality/ending-check/components/SubjectProgress.vue

+ 16 - 5
src/modules/quality/ending-check/components/SubjectProgress.vue

@@ -42,6 +42,10 @@ import type { ExtractApiResponse } from '@/api/api'
 import type { EpTableColumn, InstanceTable } from 'global-type'
 
 type SubjectProgress = ExtractArrayValue<ExtractApiResponse<'subjectProgressEnd'>>
+const subjectView = ref<any>({
+  code: '',
+  name: '',
+})
 const {
   subjectList,
   mainQuestionList,
@@ -100,7 +104,13 @@ const { fetch: subjectProgressEnd, result: subjectProgressEndList, loading } = u
 
 // subjectProgressEnd({ subjectCode: mainStore.myUserInfo?.subjectCode || '' })
 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)
 const getMainName = (row?: SubjectProgress) => {
@@ -211,10 +221,11 @@ const columns: EpTableColumn<SubjectProgress>[] = [
   {
     label: '科目',
     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,
   },