chore: 推荐信改为上传附件；修改申请面试阶段的内容；

modules/my/admission/form/index.js

@@ -10,6 +10,12 @@ export default function(_this) {
   return {
     id: 'admission',
     title: '入学办理',
-    children: [cjd(_this), yynl(_this), tjx(_this), xy(_this), xfjn(_this)]
+    children: [
+      cjd(_this),
+      yynl(_this),
+      // tjx(_this),
+      xy(_this),
+      xfjn(_this)
+    ]
   }
 }

modules/my/admission/form/xy.js

@@ -24,7 +24,7 @@ export default function(_this) {
       }
     },
     form: {
-      prev: { to: { query: { active: 'admission_tjx' } } },
+      prev: { to: { query: { active: 'admission_yynl' } } },
       next: { to: { query: { active: 'admission_xfjn' } } },
       hasButton: false,
       options: {},

modules/my/admission/form/yynl.js

@@ -33,7 +33,7 @@ export default function(_this) {
     },
     form: {
       prev: { to: { query: { active: 'admission_cjd' } } },
-      next: { to: { query: { active: 'admission_tjx' } } },
+      next: { to: { query: { active: 'admission_xy' } } },
       hasButton: false,
       options: { 'label-position': 'top' },
       items: [

modules/my/application/complete.vue

 <template>
   <el-dialog
     title="您当前完成进度如下："
-    width="348px"
+    width="388px"
     :center="true"
     :close-on-click-modal="false"
     :visible.sync="dialogVisible"
@@ -57,11 +57,16 @@ export default {
         ],
         [
           {
-            title: '毕业证书',
+            title: '毕业证书/在读证明',
             code: 'interviewByzs',
             view: { to: { path: '/my/interview', query: { active: 'interview_byzs' } } }
           },
           // {
+          //   title: '毕业证书',
+          //   code: 'interviewByzs',
+          //   view: { to: { path: '/my/interview', query: { active: 'interview_byzs' } } }
+          // },
+          // {
           //   title: '学位证书',
           //   code: 'interviewXwzs',
           //   view: { to: { path: '/my/interview', query: { active: 'interview_xwzs' } } }
@@ -71,11 +76,11 @@ export default {
           //   code: 'interviewXwzsEnglish',
           //   view: { to: { path: '/my/interview', query: { active: 'interview_xwzsywzm' } } }
           // },
-          // {
-          //   title: '英文简历',
-          //   code: 'interviewYwjl',
-          //   view: { to: { path: '/my/interview', query: { active: 'interview_ywjl' } } }
-          // },
+          {
+            title: '英文简历',
+            code: 'interviewYwjl',
+            view: { to: { path: '/my/interview', query: { active: 'interview_ywjl' } } }
+          },
           // {
           //   title: '成绩单',
           //   code: 'interviewCjd',
@@ -87,11 +92,11 @@ export default {
           //   view: { to: { path: '/my/interview', query: { active: 'interview_zp' } } }
           // }
 
-          // {
-          //   title: '推荐信',
-          //   code: 'interviewTjx',
-          //   view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
-          // }
+          {
+            title: '推荐信',
+            code: 'interviewTjx',
+            view: { to: { path: '/my/interview', query: { active: 'interview_tjx' } } }
+          }
         ]
       ]
     }
@@ -144,7 +149,7 @@ export default {
           const missedRequiredList = progress.INTERVIEW_APPLICATION.attachments.missed_required_list
           // 2寸照片
           const interviewZp = { progress: 0 }
-          interviewZp.progress = missedRequiredList.PERSONAL_PHOTO_FOR_ID ? 0 : 1
+          interviewZp.progress = missedRequiredList.PERSONAL_PHOTO_FOR_ID || missedRequiredList.PROOF_READING ? 0 : 1
           // 毕业证书
           const interviewByzs = { progress: 0 }
           interviewByzs.progress = missedRequiredList.DIPLOMA_CN ? 0 : 1
@@ -162,9 +167,7 @@ export default {
           interviewCjd.progress = missedRequiredList.REPORT_CARD_CN || missedRequiredList.REPORT_CARD_EN ? 0 : 1
           // 推荐信
           const interviewTjx = { progress: 0 }
-          interviewTjx.progress = progress.INTERVIEW_APPLICATION.reco_letters
-            ? progress.INTERVIEW_APPLICATION.reco_letters.progress
-            : 0
+          interviewTjx.progress = missedRequiredList.RECOMMENDATION_LETTER ? 0 : 1
 
           this.progress = {
             applicaitonInfo,
@@ -204,7 +207,7 @@ li {
   align-items: center;
 }
 .name {
-  width: 80px;
+  width: 120px;
   text-align: right;
 }
 .line {

modules/my/interview/form/byzs.js

 export default function(_this) {
   return {
+    required: true,
     id: 'interview_byzs',
     title: '毕业证书或在读证明',
     get: {

modules/my/interview/form/index.js

 import byzs from './byzs'
 // import xwzs from './xwzs'
 import ywjl from './ywjl'
+import tjx from './tjx'
 // import zp from './zp'
 
 export default function(_this) {
   return {
     id: 'interview',
     title: '申请面试',
-    children: [byzs(_this), ywjl(_this)]
+    children: [byzs(_this), ywjl(_this), tjx(_this)]
   }
 }

modules/my/interview/form/tjx.js

+export default function(_this) {
+  return {
+    required: true,
+    id: 'interview_tjx',
+    title: '推荐信',
+    get: {
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
+      callback(data) {
+        const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
+        const stageList = [
+          'FILLING',
+          'PREPAYMENT',
+          'INTERVIEW_APPLICATION',
+          'AUDITION',
+          'INTERVIEW',
+          'PAYMENT',
+          'REGISTRATION',
+          'CLOSED'
+        ]
+        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 2
+        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)
+              }
+            })
+            return result
+          },
+          { RECOMMENDATION_LETTER: [] }
+        )
+      }
+    },
+    update: {
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
+      beforeRequest(data) {
+        return { submission_stage: 'INTERVIEW_APPLICATION' }
+      },
+      callback() {
+        this.form.options.disabled = true
+        _this.dialogVisible = true
+        _this.getApplication()
+      },
+      errorCallback() {
+        _this.completeVisible = true
+      }
+    },
+    form: {
+      prev: { to: { query: { active: 'interview_ywjl' } } },
+      submitText: '申请面试',
+      model: { submission_stage: 'INTERVIEW_APPLICATION' },
+      options: { 'label-position': 'top' },
+      items: [
+        {
+          type: 'v-upload',
+          model: 'RECOMMENDATION_LETTER',
+          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' },
+            accept: 'image/*'
+          },
+          append: '请上传推荐人署名的推荐信原件照片或扫描件 ',
+          class: 'upload-letter'
+        }
+      ]
+    }
+  }
+}

modules/my/interview/form/ywjl.js

 export default function(_this) {
   return {
+    required: true,
     id: 'interview_ywjl',
     title: '英文简历',
     get: {
@@ -23,24 +24,26 @@ export default function(_this) {
         return { RESUME_EN }
       }
     },
-    update: {
-      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
-      beforeRequest(data) {
-        return { submission_stage: 'INTERVIEW_APPLICATION' }
-      },
-      callback() {
-        this.form.options.disabled = true
-        _this.dialogVisible = true
-        _this.getApplication()
-      },
-      errorCallback() {
-        _this.completeVisible = true
-      }
-    },
+    // update: {
+    //   action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
+    //   beforeRequest(data) {
+    //     return { submission_stage: 'INTERVIEW_APPLICATION' }
+    //   },
+    //   callback() {
+    //     this.form.options.disabled = true
+    //     _this.dialogVisible = true
+    //     _this.getApplication()
+    //   },
+    //   errorCallback() {
+    //     _this.completeVisible = true
+    //   }
+    // },
     form: {
       prev: { to: { query: { active: 'interview_byzs' } } },
-      submitText: '申请面试',
-      model: { submission_stage: 'INTERVIEW_APPLICATION' },
+      next: { to: { query: { active: 'interview_tjx' } } },
+      hasButton: false,
+      // submitText: '申请面试',
+      // model: { submission_stage: 'INTERVIEW_APPLICATION' },
       options: {},
       items: [
         {

modules/my/interview/index.vue

@@ -82,6 +82,9 @@ export default {
     },
     showSubmitedDialog() {
       return this.isSubmited && this.currentActive === 'interview_byzs'
+    },
+    user() {
+      return this.$store.state.user
     }
   },
   methods: {