chore(报名申请): 申请表格移动到综合评审阶段

modules/my/application/complete.vue

@@ -65,11 +65,6 @@ 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.APPLICATION_FORM',
-            view: { to: { path: '/my/interview', query: { active: 'interview_form' } } }
           }
         ],
         [
@@ -99,6 +94,11 @@ 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',
+            view: { to: { path: '/my/review', query: { active: 'admission_form' } } }
           }
         ],
         [

modules/my/application/preview.vue

@@ -396,14 +396,14 @@ export default {
         [
           { name: '英文简历', code: 'RESUME_EN' },
           { name: '成绩单（中文）', code: 'REPORT_CARD_CN' },
-          { name: '语言能力证明', code: 'INTERNATIONAL_LANGUAGE_SCORE' },
-          { name: '申请表格', code: 'APPLICATION_FORM' }
+          { name: '语言能力证明', code: 'INTERNATIONAL_LANGUAGE_SCORE' }
         ],
         [
           { name: '成绩单（英文）', code: 'REPORT_CARD_EN' },
           { name: '推荐信', code: ['RECOMMENDATION_LETTER', 'RECOMMENDATION_LETTER_2'] },
           { name: '个人陈述', code: 'PERSONAL_STATEMENT' },
-          { name: '毕业证书或在读证明', code: ['DIPLOMA_CN', 'DEGREE_CERT_CN', 'PROOF_READING'] }
+          { name: '毕业证书或在读证明', code: ['DIPLOMA_CN', 'DEGREE_CERT_CN', 'PROOF_READING'] },
+          { name: '申请表格', code: 'APPLICATION_FORM' }
         ],
         [
           { name: '缴费凭证', code: 'PAYMENT_VOUCHER' },

modules/my/interview/form/index.js

@@ -5,12 +5,12 @@ import yynl from './yynl'
 import ywjl from './ywjl'
 // import zp from './zp'
 // import tjx from './tjx'
-import form from './form'
+// import form from './form'
 
 export default function(_this) {
   return {
     id: 'interview',
     title: '申请面试',
-    children: [ywjl(_this), cjd(_this), yynl(_this), form(_this)]
+    children: [ywjl(_this), cjd(_this), yynl(_this)]
   }
 }

modules/my/interview/form/yynl.js

@@ -34,19 +34,19 @@ export default function(_this) {
           return result
         }, {})
         return { basic_info: basicInfo }
+      },
+      callback() {
+        _this.changeSubmissionStage(() => {
+          this.form.options.disabled = true
+        })
       }
-      // callback() {
-      //   _this.changeSubmissionStage(() => {
-      //     this.form.options.disabled = true
-      //   })
-      // }
     },
     form: {
       prev: { to: { query: { active: 'interview_cjd' } }, isSubmit: true },
-      next: { to: { query: { active: 'interview_form' } }, isSubmit: true },
-      // submitText: '申请面试',
-      hasButton: false,
-      // model: { submission_stage: 'INTERVIEW_APPLICATION' },
+      // next: { to: { query: { active: 'interview_form' } }, isSubmit: true },
+      submitText: '申请面试',
+      // hasButton: false,
+      model: { submission_stage: 'INTERVIEW_APPLICATION' },
       options: { 'label-position': 'top' },
       items: [
         {

modules/my/interview/index.vue

@@ -72,7 +72,7 @@ export default {
       return false
     },
     showSubmittedDialog() {
-      return this.isSubmitted && this.currentActive === 'interview_form'
+      return this.isSubmitted && this.currentActive === 'interview_yynl'
     },
     user() {
       return this.$store.state.user

modules/my/review/form/byzs.js

@@ -41,16 +41,18 @@ export default function(_this) {
         }, {})
         return { basic_info: basicInfo }
       },
-      callback() {
-        _this.changeSubmissionStage(() => {
-          this.form.options.disabled = true
-          // _this.$router.push('/my/admission')
-        })
-      }
+      // callback() {
+      //   _this.changeSubmissionStage(() => {
+      //     this.form.options.disabled = true
+      //     // _this.$router.push('/my/admission')
+      //   })
+      // }
     },
     form: {
-      prev: { to: { query: { active: 'admission_grcs' } } },
+      prev: { to: { query: { active: 'admission_grcs' } }, isSubmit: true },
+      next: { to: { query: { active: 'admission_form' } }, isSubmit: true },
       submitText: '提交申请',
+      hasButton: false,
       options: { 'label-position': 'top' },
       items: [
         {

modules/my/review/form/form.js

+import { STAGE_LIST } from '../../index'
+export default function(_this) {
+  return {
+    required: true,
+    id: 'admission_form',
+    title: '申请表格',
+    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
+
+        this.form.options.disabled = STAGE_LIST.findIndex(item => item === submissionStage) > 6
+        const attachment = attachments.reduce(
+          (result, item) => {
+            if (item.file_type_id === 'APPLICATION_FORM') {
+              result.APPLICATION_FORM.push(item)
+            }
+            return result
+          },
+          { APPLICATION_FORM: [] }
+        )
+        return Object.assign({}, basicInfo, attachment)
+      }
+    },
+    update: {
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
+      beforeRequest(data) {
+        return { submission_stage: 'REGISTRATION' }
+      },
+      callback() {
+        this.form.options.disabled = true
+        _this.dialogVisible = true
+        _this.getApplication()
+      },
+      errorCallback() {
+        _this.completeVisible = true
+      }
+    },
+    form: {
+      prev: { to: { query: { active: 'admission_byzs' } } },
+      submitText: '提交申请',
+      model: { submission_stage: 'REGISTRATION' },
+      options: { 'label-position': 'top' },
+      items: [
+        {
+          required: true,
+          type: 'v-upload',
+          model: 'APPLICATION_FORM',
+          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: 'APPLICATION_FORM' },
+            limit: 1
+          },
+          rules: [{ required: true, message: '请上传', trigger: 'change' }],
+          prepend: `<p>请下载填写申请表格（First Year Application Form）模板后上传 <a href="https://webapp-pub.ezijing.com/project/sit-plus/First%20Year%20Application.docx" target="_blank" download="申请表格" style="color:#aa1941;">[下载模板]</a></p>`
+        }
+      ]
+    }
+  }
+}

modules/my/review/form/index.js

@@ -6,11 +6,12 @@ import xfjn from './xfjn'
 import tjx from './tjx'
 import grcs from './grcs'
 // import yynl from './yynl'
+import form from './form'
 
 export default function(_this) {
   return {
     id: 'admission',
     title: '综合评审',
-    children: [cjd(_this), tjx(_this), grcs(_this), byzs(_this), xfjn(_this)]
+    children: [cjd(_this), tjx(_this), grcs(_this), byzs(_this), xfjn(_this), form(_this)]
   }
 }

modules/my/review/index.vue

@@ -80,7 +80,7 @@ export default {
       return false
     },
     showSubmittedDialog() {
-      return this.isSubmitted && this.currentActive === 'admission_byzs'
+      return this.isSubmitted && this.currentActive === 'admission_form'
     },
     user() {
       return this.$store.state.user