bug fixes

modules/my/admission/form/grcs.js

@@ -37,7 +37,8 @@ export default function(_this) {
           attrs: {
             action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
             deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
-            data: { file_type: 'PERSONAL_STATEMENT' }
+            data: { file_type: 'PERSONAL_STATEMENT' },
+            limit: 1
           },
           append: '请上传您的个人陈述（英文）'
         }

modules/my/admission/form/tjx.js

@@ -20,16 +20,16 @@ export default function(_this) {
         this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 6
         return attachments.reduce(
           (result, item) => {
-            const types = ['RECOMMENDATION_LETTER', 'RECOMMENDATION_LETTER_2']
-            types.forEach(type => {
-              item.disabled = item.upload_operator_user_id !== _this.user?.id
-              if (item.file_type_id === type) {
-                result.RECOMMENDATION_LETTER.push(item)
-              }
-            })
+            item.disabled = item.upload_operator_user_id !== _this.user?.id
+            if (item.file_type_id === 'RECOMMENDATION_LETTER') {
+              result.RECOMMENDATION_LETTER.push(item)
+            }
+            if (item.file_type_id === 'RECOMMENDATION_LETTER_2') {
+              result.RECOMMENDATION_LETTER_2.push(item)
+            }
             return result
           },
-          { RECOMMENDATION_LETTER: [] }
+          { RECOMMENDATION_LETTER: [], RECOMMENDATION_LETTER_2: [] }
         )
       }
     },
@@ -54,6 +54,7 @@ export default function(_this) {
       // submitText: '申请面试',
       // model: { submission_stage: 'INTERVIEW_APPLICATION' },
       options: {},
+      hint: '请上传两封推荐人署名的推荐信原件照片或扫描件(英文)',
       items: [
         {
           type: 'v-upload',
@@ -62,10 +63,20 @@ export default function(_this) {
             action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
             deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'RECOMMENDATION_LETTER' },
-            accept: 'image/*'
-          },
-          append: '请上传推荐人署名的推荐信原件照片或扫描件 ',
-          class: 'upload-letter'
+            accept: 'image/*',
+            limit: 1
+          }
+        },
+        {
+          type: 'v-upload',
+          model: 'RECOMMENDATION_LETTER_2',
+          attrs: {
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
+            data: { file_type: 'RECOMMENDATION_LETTER_2' },
+            accept: 'image/*',
+            limit: 1
+          }
         }
       ]
     }

modules/my/application/complete.vue

@@ -67,7 +67,10 @@ export default {
           },
           {
             title: '推荐信',
-            code: 'REGISTRATION.attachments.submitted_required_list.RECOMMENDATION_LETTER',
+            code: [
+              'REGISTRATION.attachments.submitted_required_list.RECOMMENDATION_LETTER',
+              'REGISTRATION.attachments.submitted_required_list.RECOMMENDATION_LETTER_2'
+            ],
             view: { to: { path: '/my/admission', query: { active: 'admission_tjx' } } }
           },
           {
@@ -110,6 +113,11 @@ export default {
       })
     },
     progress(prop) {
+      if (Array.isArray(prop)) {
+        return prop.every(item => {
+          return get(this.detail.progress, item)
+        })
+      }
       return get(this.detail.progress, prop)
     },
     handleView(to) {