chore: update

modules/my/application/complete.vue

@@ -10,11 +10,7 @@
   >
     <div>
       <ul v-if="detail">
-        <li
-          v-for="(item, index) in currentOptions"
-          :class="progress(item.code) ? 'is-success' : 'is-error'"
-          :key="index"
-        >
+        <li v-for="(item, index) in currentOptions" :class="progress(item.code) ? 'is-success' : 'is-error'" :key="index">
           <span class="name">{{ item.title }}</span>
           <span class="line"></span>
           <span class="status">{{ progress(item.code) ? '已完成' : '未完成' }}</span>
@@ -56,6 +52,7 @@ export default {
             title: '成绩单',
             code: [
               'INTERVIEW_APPLICATION.attachments.missed_required_list.REPORT_CARD_CN',
+              'INTERVIEW_APPLICATION.attachments.missed_required_list.REPORT_CARD_EN',
               'INTERVIEW_APPLICATION.basic_info.missed_required_list.gpa_score',
               'INTERVIEW_APPLICATION.basic_info.missed_required_list.average_score'
             ],
@@ -65,6 +62,28 @@ export default {
             title: '语言能力证明',
             code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.INTERNATIONAL_LANGUAGE_SCORE',
             view: { to: { path: '/my/interview', query: { active: 'interview_yynl' } } }
+          },
+          {
+            title: '推荐信',
+            code: [
+              'INTERVIEW_APPLICATION.attachments.missed_required_list.RECOMMENDATION_LETTER',
+              'INTERVIEW_APPLICATION.attachments.missed_required_list.RECOMMENDATION_LETTER_2'
+            ],
+            view: { to: { path: '/my/interview', query: { active: 'interview_tjx' } } }
+          },
+          {
+            title: '个人陈述',
+            code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.PERSONAL_STATEMENT',
+            view: { to: { path: '/my/interview', query: { active: 'interview_grcs' } } }
+          },
+          {
+            title: '毕业证或在读证明',
+            code: [
+              'INTERVIEW_APPLICATION.attachments.missed_required_list.DIPLOMA_CN',
+              'INTERVIEW_APPLICATION.attachments.missed_required_list.DEGREE_CERT_CN',
+              'INTERVIEW_APPLICATION.attachments.missed_required_list.PROOF_READING'
+            ],
+            view: { to: { path: '/my/interview', query: { active: 'interview_byzs' } } }
           }
         ],
         [
@@ -94,7 +113,7 @@ export default {
               'REGISTRATION.attachments.missed_required_list.PROOF_READING'
             ],
             view: { to: { path: '/my/review', query: { active: 'admission_byzs' } } }
-          },
+          }
           // {
           //   title: '申请表格',
           //   code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.APPLICATION_FORM',
@@ -106,7 +125,7 @@ export default {
             title: '缴费凭证',
             code: 'CLOSED.attachments.missed_required_list.PAYMENT_VOUCHER',
             view: { to: { path: '/my/admission', query: { active: 'admission_xfjn' } } }
-          },
+          }
 
           // {
           //   title: '入学协议',

modules/my/interview/form/byzs.js

 import { STAGE_LIST } from '../../index'
 export default function(_this) {
   return {
+    required: true,
     id: 'interview_byzs',
     title: '毕业证书或在读证明',
     get: {
@@ -45,7 +46,7 @@ export default function(_this) {
     },
     form: {
       prev: { to: { query: { active: 'interview_grcs' } }, isSubmit: true },
-      next: { to: { query: { active: 'interview_form' } }, isSubmit: true },
+      next: { to: { query: { active: 'application_pay' } }, isSubmit: true },
       submitText: '提交申请',
       hasButton: false,
       options: { 'label-position': 'top' },

modules/my/interview/form/cjd.js

@@ -7,11 +7,7 @@ export default function(_this) {
     get: {
       action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
-        const {
-          basic_info: basicInfo = {},
-          attachments = [],
-          submission_stage: submissionStage = 'FILLING'
-        } = data.data.material
+        const { basic_info: basicInfo = {}, attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
 
         this.form.options.disabled = STAGE_LIST.findIndex(item => item === submissionStage) > 2
         const attachment = attachments.reduce(
@@ -68,22 +64,23 @@ 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: 'REPORT_CARD_CN' }
+          }
+        },
+        {
+          required: true,
+          type: 'v-upload',
+          label: '英文成绩单',
+          model: 'REPORT_CARD_EN',
+          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: 'REPORT_CARD_EN' }
           },
           append: `
           <p>已毕业学生需提交完整成绩单，未毕业学生提交现有成绩单，成绩单需要加盖学校公章</p>
-          <p>请将中文成绩单原件扫描或者拍照后提交。</p>
+          <p>请将成绩单原件扫描或者拍照后提交。</p>
           <p>获取途径:联系大学时就读学校相关部门(档案馆/教务处)获取成绩单。</p>`
         }
-        // {
-        //   type: 'v-upload',
-        //   label: '英文成绩单',
-        //   model: 'REPORT_CARD_EN',
-        //   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: 'REPORT_CARD_EN' }
-        //   }
-        // }
       ]
     }
   }

modules/my/interview/form/grcs.js

 import { STAGE_LIST } from '../../index'
 export default function(_this) {
   return {
+    required: true,
     id: 'interview_grcs',
     title: '个人陈述',
     get: {

modules/my/interview/form/index.js

@@ -17,6 +17,9 @@ export default function(_this) {
       ywjl(_this),
       cjd(_this),
       yynl(_this),
+      tjx(_this),
+      grcs(_this),
+      byzs(_this),
       {
         required: true,
         id: 'application_pay',

modules/my/interview/form/tjx.js

 import { STAGE_LIST } from '../../index'
 export default function(_this) {
   return {
+    required: true,
     id: 'interview_tjx',
     title: '推荐信',
     get: {
@@ -39,7 +40,7 @@ export default function(_this) {
     //   }
     // },
     form: {
-      prev: { to: { query: { active: 'interview_ywcjd' } } },
+      prev: { to: { query: { active: 'interview_yynl' } } },
       next: { to: { query: { active: 'interview_grcs' } } },
       hasButton: false,
       // submitText: '申请面试',

modules/my/interview/form/yynl.js

@@ -39,7 +39,7 @@ export default function(_this) {
     },
     form: {
       prev: { to: { query: { active: 'interview_cjd' } }, isSubmit: true },
-      next: { to: { query: { active: 'application_pay' } }, isSubmit: true },
+      next: { to: { query: { active: 'interview_tjx' } }, isSubmit: true },
       submitText: '保存',
       // hasButton: false,
       model: { submission_stage: 'INTERVIEW_APPLICATION' },

modules/my/review/form/index.js

@@ -14,18 +14,18 @@ export default function(_this) {
     title: '综合评审',
     children: [
       // { required: true, id: 'application_pay', title: '缴留位费' },
-      cjd(_this),
-      tjx(_this),
-      grcs(_this),
-      byzs(_this),
+      // cjd(_this),
+      // tjx(_this),
+      // grcs(_this),
+      // byzs(_this),
       // form(_this)
       {
         required: true,
         id: 'application_pay',
         title: '缴纳留位费',
-        visible() {
-          return _this.hasPay
-        }
+        // visible() {
+        //   return _this.hasPay
+        // }
       },
       xy(_this)
     ]

modules/my/review/form/xy.js

@@ -5,9 +5,9 @@ export default function(_this) {
     id: 'admission_xy',
     title: '入学协议',
     required: true,
-    visible() {
-      return _this.hasPay
-    },
+    // visible() {
+    //   return _this.hasPay
+    // },
     get: {
       action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {

modules/my/review/index.vue

@@ -54,7 +54,7 @@ export default {
     const menus = getMenu(this)
     return {
       menus: [menus],
-      currentActive: 'admission_cjd',
+      currentActive: 'application_pay',
       dialogVisible: false,
       detail: null,
       completeVisible: false,
@@ -66,7 +66,7 @@ export default {
       immediate: true,
       handler(route) {
         const { query = {} } = route
-        this.currentActive = query.active || 'admission_cjd'
+        this.currentActive = query.active || 'application_pay'
       }
     },
     showSubmittedDialog(value) {