刘洋 před 8 měsíci
rodič
revize
966759843a

+ 4 - 1
src/render/components/SelectCourse/index.vue

@@ -42,7 +42,10 @@ const optionList = ref<SubjectItem[]>([]);
 const search = async () => {
   optionList.value = [];
   const resData = await getSubjectList({ examId: props.examId });
-  optionList.value = resData || [];
+  optionList.value = (resData || []).map((item: any) => {
+    item.name = item.code + "-" + item.name;
+    return item;
+  });
 };
 search();
 

+ 4 - 1
src/render/components/SelectSubject/index.vue

@@ -37,7 +37,10 @@ const optionList = ref([]);
 const search = async () => {
   optionList.value = [];
   const resData = await getSubjectList({ examId: props.examId });
-  optionList.value = resData || [];
+  optionList.value = (resData || []).map((item: any) => {
+    item.name = item.code + "-" + item.name;
+    return item;
+  });
 };
 search();
 

+ 6 - 3
src/render/views/BaseDataConfig/ScanParams.vue

@@ -43,7 +43,7 @@
               v-for="(item, index) in params.paperTypeBarcodeContent"
               :key="index"
             >
-              <span class="s-name">{{ getSubjectName(item.value) }}:</span>
+              <span class="s-name">{{ getSubjectName(item.code) }}:</span>
               <div class="flex-1">
                 <div
                   class="tag"
@@ -139,7 +139,10 @@ onMounted(() => {
   getSubjectList({ examId: userStore.curExam?.id }).then((res: any) => {
     subjectOptions.value = (res || [])
       .filter((item: any) => item.code == "1" || item.code == "2")
-      .map((item: any) => ({ label: item.name, value: item.code }));
+      .map((item: any) => ({
+        label: item.code + "-" + item.name,
+        value: item.code,
+      }));
     if (subjectOptions.value.length) {
       subjectCode.value = subjectOptions.value[0].value;
     }
@@ -150,7 +153,7 @@ const getSubjectName = (code: string) => {
   if (!subjectOptions.value.length) {
     return "";
   } else {
-    return subjectOptions.value.find((item: any) => item.code == code)?.label;
+    return subjectOptions.value.find((item: any) => item.value == code)?.label;
   }
 };
 const params = reactive<any>({