对接cfflp报名申请

modules/letter/index.vue

@@ -9,7 +9,7 @@
         </div>
       </div>
     </header>
-    <nav class="nav"><h1 class="title">美国印第安纳大学Kelley商学院金融学硕士项目推荐信</h1></nav>
+    <nav class="nav"><h1 class="title">中国未来金融领袖计划项目推荐信</h1></nav>
     <section class="content">
       <el-form
         :model="ruleForm"

modules/my/account/home.vue

@@ -29,7 +29,7 @@
           <img src="https://webapp-pub.ezijing.com/project/application/images/welcome.png" width="350" />
           <div class="welcome-content">
             <h1>欢迎您报考</h1>
-            <h2>美国印第安纳大学</h2>
+            <h2>中国未来金融领袖计划</h2>
             <div class="welcome-button" @click="handleStart">马上开始</div>
           </div>
         </div>

modules/my/admission/form/cjd.js

-export default function(_this) {
-  return {
-    id: 'admission_cjd',
-    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) > 6
-        return attachments.reduce(
-          (result, item) => {
-            if (item.file_type_id === 'REPORT_CARD_CN') {
-              result.REPORT_CARD_CN.push(item)
-            }
-            if (item.file_type_id === 'REPORT_CARD_EN') {
-              result.REPORT_CARD_EN.push(item)
-            }
-            return result
-          },
-          { REPORT_CARD_CN: [], REPORT_CARD_EN: [] }
-        )
-      }
-    },
-    form: {
-      next: { to: { query: { active: 'admission_xy' } } },
-      hasButton: false,
-      options: { 'label-position': 'top' },
-      hint: `
-      <p>请将中英文成绩单原件扫描或者拍照后提交。</p>
-      <p>获取途径:联系大学时就读学校相关部门(档案馆/教务处)获取成绩单。</p>
-    `,
-      items: [
-        {
-          type: 'v-upload',
-          label: '中文成绩单',
-          model: 'REPORT_CARD_CN',
-          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_CN' }
-          }
-        },
-        {
-          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/admission/form/index.js

-import cjd from './cjd'
 import xy from './xy'
 import xfjn from './xfjn'
 
@@ -6,6 +5,6 @@ export default function(_this) {
   return {
     id: 'admission',
     title: '入学办理',
-    children: [cjd(_this), xy(_this), xfjn(_this)]
+    children: [xy(_this), xfjn(_this)]
   }
 }

modules/my/admission/form/xy.js

@@ -24,7 +24,6 @@ export default function(_this) {
       }
     },
     form: {
-      prev: { to: { query: { active: 'admission_cjd' } } },
       next: { to: { query: { active: 'admission_xfjn' } } },
       hasButton: false,
       options: {},
@@ -39,7 +38,7 @@ export default function(_this) {
             data: { file_type: 'ADMISSION_AGREEMENT' }
           },
           prepend: `
-            <p><a href="https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/kelley/%E5%85%A5%E5%AD%A6%E5%8D%8F%E8%AE%AE.pdf" target="_blank" download="入学协议">下载入学协议</a></p>
+            <p><a href="https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/chinafflg/%E5%85%A5%E5%AD%A6%E5%8D%8F%E8%AE%AE.docx" target="_blank" download="入学协议">下载入学协议</a></p>
             <p>申请者可将签字后的入学协议原件扫描或拍照后提交。</p>
             <p>学员应仔细阅读《入学协议》以及课程介绍，如对入学协议或课程有异议，请第一时间与课程顾问咨询确认。请用A4纸打印后，在入学协议上签上姓名和日期，内容需显示完整、格式整齐、字迹清晰可辨。上传文件仅限“jpg,jpeg,pdf,png”格式，文件小于10Mb。</p>
           `

modules/my/admission/index.vue

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

modules/my/admission/xy.vue

@@ -45,13 +45,11 @@
       </app-collapse>
       <p>2.<b>入学项目：</b></p>
       <p>
-        <b
-          >项目课程为【紫荆教育-美国印第安纳大学Kelley商学院金融硕士（MSinFinance）2021年夏季班】。该项目学制为【15】个月，自当期项目课程开课之日起计算。</b
-        >如学员因个人原因需要延长学习期限的，须至少提前<b>【3】</b>个月申请延期，批准后方可延期毕业。最长可延期至<b>【60】</b>个月,自所报名的项目课
-        程原定开课之日起算。
+        <b>项目课程为【紫荆教育-中国未来金融领袖计划第一期】。该项目学制为【1.5】年，自当期项目课程开课之日起计算。</b
+        >如学员因个人原因需要延长学习期限的，须至少提前<b>【3】</b>个月申请延期，批准后方可延期毕业。最长可延期至<b>【60】</b>个月,自所报名的项目课程原定开课之日起算。
       </p>
       <p>
-        <b>课程的总学分为【33】学分，其中必修课【33】学分。先修课3门，不计入学分。</b
+        <b>课程的总学分为【38】学分，其中必修课【38】学分。先修课3门，不计入学分。</b
         >课程成绩未通过需要重修或选修其它课程。重修或选修超规定的学分的，需按学分单价缴纳相关费用。
       </p>
       <app-collapse>
@@ -162,7 +160,7 @@ export default {
   },
   methods: {
     createSign() {
-      api.createSign({ type: 'kelley-agreement' }).then(response => {
+      api.createSign({ type: 'future-agreement' }).then(response => {
         const { code, data } = response
         if (code === 1) {
           this.sign = data
@@ -173,7 +171,7 @@ export default {
       })
     },
     getSignDocument(flowid) {
-      return api.getSignDocument({ flowid, type: 'kelley-agreement' }).then(response => {
+      return api.getSignDocument({ flowid, type: 'future-agreement' }).then(response => {
         const { code, data } = response
         if (code === 1) {
           this.documentUrl = data.url

modules/my/application/complete.vue

@@ -43,19 +43,24 @@ export default {
             title: '个人资料',
             code: 'applicaitonInfo',
             view: { to: { path: '/my/application', query: { active: 'application_info' } } }
+          },
+          {
+            title: '推荐信',
+            code: 'applicationTjx',
+            view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
           }
           // {
-          //   title: '推荐信',
-          //   code: 'applicationTjx',
-          //   view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
-          // }
-          // {
           //   title: '无犯罪证明',
           //   code: 'applicationWfzzm',
           //   view: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } }
           // }
         ],
         [
+          {
+            title: '2寸照片',
+            code: 'interviewZp',
+            view: { to: { path: '/my/interview', query: { active: 'interview_zp' } } }
+          },
           {
             title: '毕业证书',
             code: 'interviewByzs',
@@ -66,31 +71,26 @@ export default {
             code: 'interviewXwzs',
             view: { to: { path: '/my/interview', query: { active: 'interview_xwzs' } } }
           },
-          // {
-          //   title: '学位证书英文证明',
-          //   code: 'interviewXwzsEnglish',
-          //   view: { to: { path: '/my/interview', query: { active: 'interview_xwzsywzm' } } }
-          // },
+          {
+            title: '学位证书英文证明',
+            code: 'interviewXwzsEnglish',
+            view: { to: { path: '/my/interview', query: { active: 'interview_xwzsywzm' } } }
+          },
           {
             title: '英文简历',
             code: 'interviewYwjl',
             view: { to: { path: '/my/interview', query: { active: 'interview_ywjl' } } }
           },
           {
-            title: '2寸照片',
-            code: 'interviewZp',
-            view: { to: { path: '/my/interview', query: { active: 'interview_zp' } } }
+            title: '成绩单',
+            code: 'interviewCjd',
+            view: { to: { path: '/my/interview', query: { active: 'interview_cjd' } } }
+          },
+          {
+            title: '推荐信',
+            code: 'interviewTjx',
+            view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
           }
-          // {
-          //   title: '成绩单',
-          //   code: 'interviewCjd',
-          //   view: { to: { path: '/my/interview', query: { active: 'interview_cjd' } } }
-          // },
-          // {
-          //   title: '推荐信',
-          //   code: 'interviewTjx',
-          //   view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
-          // }
         ]
       ]
     }

modules/my/application/components/qrcodePay.vue

@@ -5,9 +5,7 @@
         <img src="https://webapp-pub.ezijing.com/project/application/images/my_pay_01.png" />
       </div>
       <h1>欢迎您</h1>
-      <p class="t1">
-        紫荆-印第安纳大学Kelley商学院金融硕士（MSF）项目申请费<span>700</span>元，请扫描二维码支付完成报名。
-      </p>
+      <p class="t1">紫荆-中国未来金融领袖计划项目项目申请费<span>800</span>元，请扫描二维码支付完成报名。</p>
     </div>
     <div class="qrcode-error" v-if="qrcodeError">
       生成二维码失败请刷新<i class="el-icon-refresh-left" @click="getOrder" title="刷新"></i>

modules/my/application/form/declare.js

@@ -34,7 +34,7 @@ export default function(_this) {
       }
     },
     form: {
-      prev: { to: { query: { active: 'application_info', tab: 'application_info_honor' } } },
+      prev: { to: { query: { active: 'application_tjx' } } },
       submitText: '提交报名申请',
       model: { isAgree: [] },
       options: {},
@@ -45,7 +45,7 @@ export default function(_this) {
           model: 'isAgree',
           rules: [{ required: true, message: '请阅读协议', trigger: 'change' }],
           prepend:
-            '<p>我提供的所有报名材料信息皆准确和完整。我同意在需要的情况下提交原件以确认我的报名资格。由于报名材料中的虚假、错误信息或重大遗漏导致不录取或取消学籍的后果由我个人承担。 我理解并同意所有报名材料归紫荆教育所有，无论考生录取与否均不退回。我授权紫荆教育使用报名表中的信息查询本人学习和工作记录。</p>'
+            '<p>我提供的所有报名材料信息皆准确和完整。我同意在需要的情况下提交原件以确认我的报名资格。由于报名材料中的虚假、错误信息或重大遗漏导致不录取或取消学籍的后果由我个人承担。我理解并同意所有报名材料归紫荆教育所有，无论考生录取与否均不退回。我授权紫荆教育使用报名表中的信息查询本人学习和工作记录。</p>'
         }
       ]
     }

modules/my/application/form/index.js

 import info from './info'
-// import tjx from './tjx'
-// import wfzsm from './wfzzm'
+import tjx from './tjx'
 import declare from './declare'
 
 export default function(_this) {
@@ -9,7 +8,7 @@ export default function(_this) {
     title: '报名申请',
     children: [
       info(_this),
-      // tjx(_this),
+      tjx(_this),
       // wfzsm(_this),
       declare(_this),
       {

modules/my/application/form/info/answer.js

@@ -19,7 +19,7 @@ export default function(_this) {
         const [first = {}, second = {}] = answers
         return {
           qid1: first.qid || '1',
-          question1: '您为什么要申请美国印第安纳大学Kelley商学院金融学硕士项目?(200字以上，1000字以内)',
+          question1: '您为什么申请中国产业金融菁英计划项目? (200字以上，1000字以内)',
           answer1: first.answer,
           qid2: second.qid || '2',
           question2: '您的短期和长期职业发展目标是什么?您打算如何达成此愿景?(200字以上，1000字以内)',
@@ -45,7 +45,7 @@ export default function(_this) {
       items: [
         {
           type: 'v-input',
-          label: '您为什么要申请美国印第安纳大学Kelley商学院金融学硕士项目?(200字以上，1000字以内)',
+          label: '您为什么申请中国产业金融菁英计划项目? (200字以上，1000字以内)',
           model: 'answer1',
           attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
           rules: [

modules/my/application/form/info/honor.js

@@ -31,7 +31,7 @@ export default function(_this) {
     },
     form: {
       prev: { to: { query: { active: 'application_info', tab: 'application_info_training' } }, isSubmit: true },
-      next: { to: { query: { active: 'application_declare' } }, isSubmit: true },
+      next: { to: { query: { active: 'application_tjx' } }, isSubmit: true },
       hasAdd: true,
       options: { labelWidth: '140px' },
       items: [

modules/my/application/form/tjx.js

@@ -37,7 +37,7 @@ export default function(_this) {
     form: {
       minlength: 2,
       prev: { to: { query: { active: 'application_info', tab: 'application_info_honor' } }, isSubmit: true },
-      next: { to: { query: { active: 'application_wfzzm' } }, isSubmit: true },
+      next: { to: { query: { active: 'application_declare' } }, isSubmit: true },
       hasAdd: true,
       disabled(data) {
         return !!data.letter_content

modules/my/application/pay.vue

@@ -4,7 +4,7 @@
     <qrcode-pay @update="handleUpdateOrder" v-else></qrcode-pay>
     <div class="pay-ft">
       <p class="t2">注释：该申请费提交后不予退还，缴纳申请费后，申请人还需提交以下文件：</p>
-      <p class="t2">①本科及以上学历毕业证书扫描件②本科及以上学历学位证书扫描件③个人证件照④英文简历</p>
+      <p class="t2">①毕业证书扫描件②学位证书扫描件③英文简历④2寸照片⑤成绩单</p>
       <p class="t2">该申请费不退，请慎重缴费！</p>
     </div>
     <el-dialog

modules/my/application/preview.vue

@@ -308,23 +308,23 @@ export default {
             { label: '荣誉奖励', code: 'title' },
             { label: '证书颁发机构', code: 'institution_cn' }
           ]
+        },
+        {
+          title: '推荐信',
+          code: 'reco_letters',
+          edit: { to: { path: '/my/application', query: { active: 'application_tjx' } } },
+          isMultiple: true,
+          items: [
+            { label: '推荐人姓名', code: 'provider_name' },
+            { label: '推荐人电话', code: 'provider_phone_number' },
+            { label: '推荐人邮箱', code: 'provider_email' },
+            { label: '与推荐人关系', code: 'provider_relationship' },
+            { label: '推荐人工作单位', code: 'provider_company_name', visible: () => this.isManager },
+            { label: '推荐人职务', code: 'provider_job_title', visible: () => this.isManager },
+            { label: '推荐信内容', code: 'letter_content', visible: () => this.isManager }
+          ]
         }
         // {
-        //   title: '推荐信',
-        //   code: 'reco_letters',
-        //   edit: { to: { path: '/my/application', query: { active: 'application_tjx' } } },
-        //   isMultiple: true,
-        //   items: [
-        //     { label: '推荐人姓名', code: 'provider_name' },
-        //     { label: '推荐人电话', code: 'provider_phone_number' },
-        //     { label: '推荐人邮箱', code: 'provider_email' },
-        //     { label: '与推荐人关系', code: 'provider_relationship' },
-        //     { label: '推荐人工作单位', code: 'provider_company_name', visible: () => this.isManager },
-        //     { label: '推荐人职务', code: 'provider_job_title', visible: () => this.isManager },
-        //     { label: '推荐信内容', code: 'letter_content', visible: () => this.isManager }
-        //   ]
-        // }
-        // {
         //   title: '无犯罪证明',
         //   code: 'attachments',
         //   edit: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } },

modules/my/interview/form/byzs.js

@@ -23,6 +23,7 @@ export default {
     }
   },
   form: {
+    prev: { to: { query: { active: 'interview_zp' } } },
     next: { to: { query: { active: 'interview_xwzs' } } },
     hasButton: false,
     options: {},

modules/my/interview/form/index.js

+import zp from './zp'
 import byzs from './byzs'
 import xwzs from './xwzs'
+import xwzszm from './xwzszm'
 import ywjl from './ywjl'
-import zp from './zp'
+import cjd from './cjd'
 
 export default function(_this) {
   return {
     id: 'interview',
     title: '申请面试',
-    children: [byzs, xwzs, ywjl, zp(_this)]
+    children: [
+      zp(_this),
+      byzs,
+      xwzs,
+      xwzszm,
+      ywjl,
+      cjd(_this),
+      {
+        id: 'interview_exam',
+        title: '考试测评',
+        show: false,
+        href: ''
+      }
+    ]
   }
 }

modules/my/interview/form/xwzs.js

@@ -24,7 +24,7 @@ export default {
   },
   form: {
     prev: { to: { query: { active: 'interview_byzs' } } },
-    next: { to: { query: { active: 'interview_ywjl' } } },
+    next: { to: { query: { active: 'interview_xwzsywzm' } } },
     hasButton: false,
     options: {},
     items: [

modules/my/interview/form/ywjl.js

@@ -23,8 +23,8 @@ export default {
     }
   },
   form: {
-    prev: { to: { query: { active: 'interview_xwzs' } } },
-    next: { to: { query: { active: 'interview_zp' } } },
+    prev: { to: { query: { active: 'interview_xwzsywzm' } } },
+    next: { to: { query: { active: 'interview_cjd' } } },
     hasButton: false,
     options: {},
     items: [
@@ -38,7 +38,7 @@ export default {
           data: { file_type: 'RESUME_EN' }
         },
         append: `
-        <p>请下载填写英文简历模板后上传 [<a href="https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/kelley/%E8%8B%B1%E6%96%87%E7%AE%80%E5%8E%86.docx" target="_blank" download="英文简历模板">下载模板</a>]</p>
+        <p>请下载填写英文简历模板后上传 [<a href="https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/chinafflg/%E8%8B%B1%E6%96%87%E7%AE%80%E5%8E%86.docx" target="_blank" download="英文简历模板">下载模板</a>]</p>
         <p>请将英文简历填写完存为"pdf"格式上传，文件小于10MB。</p>`
       }
     ]

modules/my/interview/form/zp.js

@@ -23,24 +23,9 @@ export default function(_this) {
         return { PERSONAL_PHOTO_FOR_ID }
       }
     },
-    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' },
+      next: { to: { query: { active: 'interview_byzs' } } },
+      hasButton: false,
       options: {},
       items: [
         {

modules/my/interview/index.vue

@@ -9,6 +9,7 @@
       @back="$router.push('/my/account')"
       @prev="handlePrev"
       @next="handleNext"
+      @uploaded="getApplication"
     >
       <template #aside-append>
         <div class="aside-logout" @click="$store.dispatch('logout')"><span>退出登录</span></div>
@@ -44,7 +45,7 @@ export default {
     const menus = getMenu(this)
     return {
       menus: [menus],
-      currentActive: 'interview_byzs',
+      currentActive: 'interview_zp',
       completeVisible: false,
       dialogVisible: false,
       detail: null
@@ -55,7 +56,7 @@ export default {
       immediate: true,
       handler(route) {
         const { query = {} } = route
-        this.currentActive = query.active || 'interview_byzs'
+        this.currentActive = query.active || 'interview_zp'
       }
     },
     showSubmitedDialog(value) {
@@ -90,6 +91,7 @@ export default {
         const { data, error, message } = response
         if (error.toString() === '0') {
           this.detail = data
+          this.showExamText(data)
         } else {
           this.$message.error(message)
         }
@@ -114,6 +116,18 @@ export default {
     },
     handleNext(to) {
       this.$router.push(to)
+    },
+    // 考试测评
+    showExamText(data) {
+      if (!this.isSubmited) {
+        return
+      }
+      const menu = this.menus[0]
+      const found = menu.children.find(item => item.id === 'interview_exam')
+      api.getExamTestUrl().then(data => {
+        found.href = data.address
+        found.show = true
+      })
     }
   },
   beforeMount() {

modules/my/welcome/indexPay.vue

@@ -4,8 +4,8 @@
     <qrcode-pay @update="handleUpdateOrder" v-else></qrcode-pay>
     <div class="pay-ft">
       <p class="t2">
-        欢迎您申请紫荆-印第安纳大学Kelley商学院金融硕士（MSF）<br />
-        申请流程：①支付报名费②填写报名资料并提供相关材料（身份证扫描件、毕业证书扫描件、学位证书扫描件、英文简历、2寸照片）③参加面试④获得录取⑤缴纳学费并签署入学协议⑥入学学习（办理入学手续：提供成绩单、学籍注册等）<br />
+        欢迎您申请紫荆-中国未来金融领袖计划项目<br />
+        申请流程：①支付报名费②填写报名资料并提供相关材料（身份证扫描件、毕业证书扫描件、学位证书扫描件、成绩单、英文简历、推荐信、2寸照片）③完成综合素质测评、④参加面试⑤获得录取⑥缴纳学费并签署入学协议⑦入学学习（办理入学手续：学籍注册等）<br />
         申请费提交后不予退还
       </p>
     </div>

modules/my/welcome/indexWelcome.vue

@@ -6,8 +6,8 @@
       </div>
       <h1>欢迎您</h1>
       <p class="t1">
-        申请紫荆-美国印第安纳大学Kelley商学院金融学硕士项目，请在填写以下内容并<br />
-        提交报名申请后，扫码支付本项目的申请费共计<span>700</span>元。
+        申请紫荆-中国未来金融领袖计划项目，请在填写以下内容并<br />
+        提交报名申请后，扫码支付本项目的申请费共计<span>800</span>元。
       </p>
     </div>
     <div class="form">