修改报名

api/my.js

@@ -30,18 +30,11 @@ export function sendCode(data) {
   return httpRequest.post('/api/usercenter/user/send-code', data)
 }
 
-/**
- * 检验验证码
- */
-export function checkCode(params) {
-  return httpRequest.get('/api/usercenter/user/check-code', { params })
-}
-
 /**
  * 获取报名信息
  */
 export function getApplication(params) {
-  return httpRequest.get(`/api/enrollment/v1.0/application-materials/${projectId}`, { params })
+  return httpRequest.get(`/api/enrollment/v1.0/application-materials/${projectId}`, params)
 }
 /**
  * 获取报名信息
@@ -112,6 +105,15 @@ export function sendToProvider(letterId) {
     `/api/enrollment/v1.0/application-materials/reco-letters/send-invitation-to-provider/${projectId}/${letterId}`
   )
 }
+
+/**
+ * 发送推荐信
+ */
+export function sendToProviders() {
+  return httpRequest.get(
+    `/api/enrollment/v1.0/application-materials/reco-letters/send-invitation-to-providers/${projectId}`
+  )
+}
 /**
  * 退出登录
  */
@@ -149,12 +151,3 @@ export function createSign(data) {
 export function getSignDocument(params) {
   return httpRequest.get('/api/usercenter/v1/sign/document', { params })
 }
-
-/**
- * 提交留咨信息
- */
-export function postNes(obj) {
-  return httpRequest.post('/new-app/v1.0/applications', obj, {
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-  })
-}

modules/my/admission/form/byzs.js

+export default {
+  id: 'admission_byzs',
+  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
+      const DIPLOMA_FILING_TABLE = attachments.filter(item => {
+        return item.file_type_id === 'DIPLOMA_FILING_TABLE'
+      })
+      return { DIPLOMA_FILING_TABLE }
+    }
+  },
+  form: {
+    prev: { to: { query: { active: 'admission_cjd' } } },
+    next: { to: { query: { active: 'admission_ywjl' } } },
+    hasButton: false,
+    options: {},
+    items: [
+      {
+        type: 'v-upload',
+        required: true,
+        model: 'DIPLOMA_FILING_TABLE',
+        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: 'DIPLOMA_FILING_TABLE' }
+        },
+        prepend: `
+        <p>学信网《教育部学历证书电子注册备案表》[<a href="https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/sofia/%E6%AF%95%E4%B8%9A%E8%AF%81%E4%B9%A6%E6%B3%A8%E5%86%8C%E5%A4%87%E6%A1%88%E8%A1%A8.pdf" target="_blank" download="毕业证书注册备案表">下载流程表</a>]
+        <p>学历在学信网可查的同学，请下载学信网电子注册备案表提交到系统，具体获取流程请</p>
+        <p>下载附件 上传文件仅限“jpg,jpeg,pdf,png”格式，文件小于10Mb。</p>
+      `
+      }
+    ]
+  }
+}

modules/my/admission/form/cjd.js

@@ -32,7 +32,7 @@ export default function(_this) {
       }
     },
     form: {
-      next: { to: { query: { active: 'admission_xy' } } },
+      next: { to: { query: { active: 'admission_tjx' } } },
       hasButton: false,
       options: { 'label-position': 'top' },
       hint: `

modules/my/admission/form/index.js

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

modules/my/admission/form/tjx.js

+/**
+ * 推荐信
+ */
+
+export default function(_this) {
+  return {
+    id: 'admission_tjx',
+    title: '推荐信',
+    get: {
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
+      callback(data) {
+        const { 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
+        const list = data.data.material.reco_letters || []
+        // this.form.options.disabled = list.length >= 2
+        return list.length ? list : [{}, {}]
+      }
+    },
+    update: {
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
+      beforeRequest(data) {
+        return { reco_letters: data }
+      },
+      callback({ message }) {
+        // this.form.options.disabled = true
+        const letters = _this.detail.material.reco_letters || []
+        if (!letters.length) {
+          _this.sendToProviders()
+          _this.getApplication()
+        } else {
+          this.$message({ type: 'success', message })
+        }
+      }
+    },
+    form: {
+      minlength: 2,
+      prev: { to: { query: { active: 'admission_cjd' } }, isSubmit: true },
+      next: { to: { query: { active: 'admission_xy' } }, isSubmit: true },
+      hasAdd: true,
+      options: { disabled: false, labelWidth: '140px' },
+      disabled(data) {
+        return !!data.letter_content
+      },
+      aside: {
+        prepend: {
+          html: '<p style="color:#33C011;">推荐人已完成</p>',
+          visible(data) {
+            return !!data.letter_content
+          }
+        },
+        buttons: [
+          {
+            text: '再次邀请',
+            visible(data) {
+              const editable = ['PREPAYMENT', 'REGISTRATION'].includes(_this.detail.material.submission_stage)
+              return data.id && !data.letter_content && editable
+            },
+            onClick(data) {
+              _this.sendToProvider(data)
+            }
+          },
+          {
+            text: '更换推荐人',
+            visible(data) {
+              const editable = ['PREPAYMENT', 'REGISTRATION'].includes(_this.detail.material.submission_stage)
+              return data.id && !data.letter_content && editable
+            },
+            onClick(data, $form) {
+              $form.validate().then(() => {
+                _this.changeProvider(data)
+              })
+            }
+          }
+        ]
+      },
+      items: [
+        {
+          type: 'v-input',
+          label: '推荐人姓名',
+          model: 'provider_name',
+          attrs: { placeholder: '请输入推荐人姓名' },
+          rules: [{ required: true, message: '请输入推荐人姓名', trigger: 'blur' }]
+        },
+
+        {
+          type: 'v-input',
+          label: '推荐人电话',
+          model: 'provider_phone_number',
+          attrs: { placeholder: '请输入推荐人电话', maxlength: 11 },
+          rules: [{ required: true, pattern: /^1[3-9]\d{9}$/, message: '请输入推荐人电话', trigger: 'blur' }]
+        },
+        {
+          type: 'v-input',
+          label: '推荐人邮箱',
+          model: 'provider_email',
+          attrs: { placeholder: '请输入推荐人邮箱' },
+          rules: [{ type: 'email', required: true, message: '请输入推荐人邮箱', trigger: 'blur' }]
+        },
+        {
+          type: 'v-select',
+          values: [
+            { value: '老师/导师' },
+            { value: '领导' },
+            { value: '同学' },
+            { value: '同事' },
+            { value: '亲属' },
+            { value: '朋友' },
+            { value: '其他' }
+          ],
+          label: '与推荐人关系',
+          model: 'provider_relationship',
+          rules: [{ required: true, message: '请选择与推荐人关系', trigger: 'change' }]
+        }
+      ]
+    }
+  }
+}

modules/my/admission/form/xy.js

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

modules/my/admission/form/ywjl.js

+export default {
+  id: 'admission_ywjl',
+  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
+      const RESUME_EN = attachments.filter(item => {
+        return item.file_type_id === 'RESUME_EN'
+      })
+      return { RESUME_EN }
+    }
+  },
+  form: {
+    prev: { to: { query: { active: 'admission_byzs' } } },
+    next: { to: { query: { active: 'admission_xy' } } },
+    hasButton: false,
+    options: {},
+    items: [
+      {
+        type: 'v-upload',
+        required: true,
+        model: 'RESUME_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: 'RESUME_EN' }
+        },
+        append: `
+        <p>请下载填写英文简历模板后上传 [<a href="https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/sofia/%E8%8B%B1%E6%96%87%E7%AE%80%E5%8E%86.doc" target="_blank" download="英文简历模板">下载模板</a>]</p>
+        <p>请将英文简历填写完存为"pdf"格式上传，文件小于10MB。</p>`
+      }
+    ]
+  }
+}

modules/my/admission/index.vue

@@ -10,9 +10,10 @@
       @prev="handlePrev"
       @next="handleNext"
       @uploaded="getApplication"
+      v-if="detail"
     >
       <template #aside-append>
-        <div class="aside-logout" @click="$store.dispatch('logout')"><span>退出登录</span></div>
+        <!-- <div class="aside-logout" @click="$store.dispatch('logout')"><span>退出登录</span></div> -->
       </template>
       <!-- 入学协议 -->
       <!-- <template #content v-if="currentActive === 'admission_xy'">
@@ -111,6 +112,40 @@ export default {
     toPay() {
       this.dialogVisible = false
       this.$router.push({ path: '/my/admission', query: { active: 'admission_xfjn' } })
+    },
+    // 更换推荐人
+    changeProvider(data) {
+      api.updateProvider(data.id, data).then(response => {
+        const { error, message } = response
+        if (error.toString() === '0') {
+          this.sendToProvider(data)
+          // this.$message({ type: 'success', message })
+        } else {
+          this.$message.error(message)
+        }
+      })
+    },
+    // 再次邀请推荐
+    sendToProvider(data) {
+      api.sendToProvider(data.id).then(response => {
+        const { error, message } = response
+        if (error.toString() === '0') {
+          this.$message({ type: 'success', message })
+        } else {
+          this.$message.error(message)
+        }
+      })
+    },
+    // 发送推荐信
+    sendToProviders() {
+      api.sendToProviders().then(response => {
+        const { error, message } = response
+        if (error.toString() === '0') {
+          this.$message({ type: 'success', message })
+        } else {
+          this.$message.error(message)
+        }
+      })
     }
   },
   beforeMount() {

modules/my/admission/xy.vue

@@ -46,12 +46,11 @@
       <p>2.<b>入学项目：</b></p>
       <p>
         <b
-          >项目课程为【紫荆教育-美国印第安纳大学Kelley商学院金融硕士（MSinFinance）2021年夏季班】。该项目学制为【15】个月，自当期项目课程开课之日起计算。</b
-        >如学员因个人原因需要延长学习期限的，须至少提前<b>【3】</b>个月申请延期，批准后方可延期毕业。最长可延期至<b>【60】</b>个月,自所报名的项目课
-        程原定开课之日起算。
+          >项目课程为【紫荆教育-索菲亚金融方向工商管理硕士（FMBA）2021年春季班】。该项目学制为【2】年，自当期项目课程开课之日起计算。</b
+        >如学员因个人原因需要延长学习期限的，须至少提前<b>【3】</b>个月申请延期，批准后方可延期毕业。最长可延期<b>【12】</b>个月,自所报名的项目课程原定毕业之日起算。
       </p>
       <p>
-        <b>课程的总学分为【33】学分，其中必修课【33】学分。先修课3门，不计入学分。</b
+        <b>课程的总学分为【48】学分，其中必修课【48】学分。先修课3门，不计入学分。</b
         >课程成绩未通过需要重修或选修其它课程。重修或选修超规定的学分的，需按学分单价缴纳相关费用。
       </p>
       <app-collapse>
@@ -62,7 +61,7 @@
         <p>（2）授课教师安排及调整。我们可能会调整相关课程的任课教师，该教师如与宣传材料不符以实际任课教师为准。</p>
       </app-collapse>
       <app-collapse>
-        <template #title>4.<b>费用。</b>本项目学费共计人民币【249800】元整，包含授课费用、证书费用，不包含：</template>
+        <template #title>4.<b>费用。</b>本项目学费共计人民币【71000】元整，包含授课费用、证书费用，不包含：</template>
         <p>学习期间的交通费、食宿费、邮寄费、书本费等费用；</p>
         <p>海外学习、海外毕业典礼等费用；</p>
         <p>毕业服装、纪念品、校友会活动等相关费用；</p>
@@ -162,7 +161,7 @@ export default {
   },
   methods: {
     createSign() {
-      api.createSign({ type: 'kelley-agreement' }).then(response => {
+      api.createSign({ type: 'marywood-agreement' }).then(response => {
         const { code, data } = response
         if (code === 1) {
           this.sign = data
@@ -173,7 +172,7 @@ export default {
       })
     },
     getSignDocument(flowid) {
-      return api.getSignDocument({ flowid, type: 'kelley-agreement' }).then(response => {
+      return api.getSignDocument({ flowid, type: 'marywood-agreement' }).then(response => {
         const { code, data } = response
         if (code === 1) {
           this.documentUrl = data.url

modules/my/application/complete.vue

@@ -61,31 +61,32 @@ export default {
             code: 'interviewByzs',
             view: { to: { path: '/my/interview', query: { active: 'interview_byzs' } } }
           },
-          {
-            title: '学位证书',
-            code: 'interviewXwzs',
-            view: { to: { path: '/my/interview', query: { active: 'interview_xwzs' } } }
-          },
+          // {
+          //   title: '学位证书',
+          //   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: '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: 'interviewYwjl',
+          //   view: { to: { path: '/my/interview', query: { active: 'interview_ywjl' } } }
+          // },
           // {
           //   title: '成绩单',
           //   code: 'interviewCjd',
           //   view: { to: { path: '/my/interview', query: { active: 'interview_cjd' } } }
           // },
+          // {
+          //   title: '2寸照片',
+          //   code: 'interviewZp',
+          //   view: { to: { path: '/my/interview', query: { active: 'interview_zp' } } }
+          // }
+
           // {
           //   title: '推荐信',
           //   code: 'interviewTjx',

modules/my/application/components/qrcodePay.vue

@@ -6,7 +6,7 @@
       </div>
       <h1>欢迎您</h1>
       <p class="t1">
-        紫荆-印第安纳大学Kelley商学院金融硕士（MSF）项目申请费<span>700</span>元，请扫描二维码支付完成报名。
+        申请紫荆-玛丽伍德大学工商管理硕士（MBA）项目，本项目的申请费为<span>700</span>元，请扫描二维码以完成报名。
       </p>
     </div>
     <div class="qrcode-error" v-if="qrcodeError">

modules/my/application/form/declare.js

@@ -44,8 +44,8 @@ export default function(_this) {
           values: [{ label: '同意', value: 1 }],
           model: 'isAgree',
           rules: [{ required: true, message: '请阅读协议', trigger: 'change' }],
-          prepend:
-            '<p>我提供的所有报名材料信息皆准确和完整。我同意在需要的情况下提交原件以确认我的报名资格。由于报名材料中的虚假、错误信息或重大遗漏导致不录取或取消学籍的后果由我个人承担。 我理解并同意所有报名材料归紫荆教育所有，无论考生录取与否均不退回。我授权紫荆教育使用报名表中的信息查询本人学习和工作记录。</p>'
+          prepend: `<p>1、本人知晓此申请表及所附文件将作为申请紫荆-玛丽伍德大学MBA面试和背景评估的参考依据，一旦成功录取，有关资料将作为学生信息存档。</p>
+            <p>2、本人声明所填资料正确无误，知晓任何不真实的信息或不诚信的行为，均会影响申请结果，已取得的成绩和资格会被取消。我理解并同意所有报名材料归紫荆教育所有，无论考生录取与否均不退回。我授权紫荆教育使用报名表中的信息查询本人学习和工作记录。</p>`
         }
       ]
     }

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

@@ -19,10 +19,10 @@ export default function(_this) {
         const [first = {}, second = {}] = answers
         return {
           qid1: first.qid || '1',
-          question1: '您为什么要申请美国印第安纳大学Kelley商学院金融学硕士项目?(200字以上，1000字以内)',
+          question1: '您为什么要申请紫荆-玛丽伍德大学工商管理硕士（MBA）项目？',
           answer1: first.answer,
           qid2: second.qid || '2',
-          question2: '您的短期和长期职业发展目标是什么?您打算如何达成此愿景?(200字以上，1000字以内)',
+          question2: '您的短期和长期职业发展目标是什么？您打算如何达成此愿景？',
           answer2: second.answer
         }
       }
@@ -45,22 +45,22 @@ export default function(_this) {
       items: [
         {
           type: 'v-input',
-          label: '您为什么要申请美国印第安纳大学Kelley商学院金融学硕士项目?(200字以上，1000字以内)',
+          label: '您为什么要申请紫荆-玛丽伍德大学工商管理硕士（MBA）项目？（60字以上，1000字以内）',
           model: 'answer1',
           attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
           rules: [
             { required: true, message: '请输入', trigger: 'blur' },
-            { min: 200, max: 1000, message: '长度在 200 到 1000 个字符', trigger: 'blur' }
+            { min: 60, max: 1000, message: '长度在 60 到 1000 个字符', trigger: 'blur' }
           ]
         },
         {
           type: 'v-input',
-          label: '您的短期和长期职业发展目标是什么?您打算如何达成此愿景?(200字以上，1000字以内)',
+          label: '您的短期和长期职业发展目标是什么？您打算如何达成此愿景？（60字以上，1000字以内）',
           model: 'answer2',
           attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
           rules: [
             { required: true, message: '请输入', trigger: 'blur' },
-            { min: 200, max: 1000, message: '长度在 200 到 1000 个字符', trigger: 'blur' }
+            { min: 60, max: 1000, message: '长度在 60 到 1000 个字符', trigger: 'blur' }
           ]
         }
       ]

modules/my/application/index.vue

@@ -94,7 +94,7 @@ export default {
     },
     handlePageChange(value) {
       this.currentActive = value
-      this.$router.push({ path: this.$route.path, query: { active: value } })
+      this.$router.push({ path: this.$route.path, query: { active: value } }).catch(() => {})
     },
     handleTabChange(value) {
       this.tabActive = value

modules/my/application/pay.vue

@@ -3,9 +3,7 @@
     <h5-pay @update="handleUpdateOrder" v-if="isWechat"></h5-pay>
     <qrcode-pay @update="handleUpdateOrder" v-else></qrcode-pay>
     <div class="pay-ft">
-      <p class="t2">注释：该申请费提交后不予退还，缴纳申请费后，申请人还需提交以下文件：</p>
-      <p class="t2">①本科及以上学历毕业证书扫描件②本科及以上学历学位证书扫描件③个人证件照④英文简历</p>
-      <p class="t2">该申请费不退，请慎重缴费！</p>
+      <p class="t2">注释：成功提交700元申请费后，申请人还需上传并提交最高学历（学位）证书 （注：申请费不退还)</p>
     </div>
     <el-dialog
       title="报名费缴费成功"

modules/my/application/preview.vue

@@ -184,8 +184,19 @@ export default {
       previewImageTitle: '',
       viewer: null,
       material: {},
-      progress: {},
-      options: [
+      progress: {}
+    }
+  },
+  computed: {
+    right() {
+      const { right = '' } = this.$route.query
+      return right.toUpperCase()
+    },
+    hasButton() {
+      return this.right.includes('X')
+    },
+    options() {
+      const options = [
         {
           title: '个人资料',
           code: 'basic_info',
@@ -310,21 +321,6 @@ export default {
           ]
         }
         // {
-        //   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' } } },
@@ -339,15 +335,24 @@ export default {
         //   }
         // }
       ]
-    }
-  },
-  computed: {
-    right() {
-      const { right = '' } = this.$route.query
-      return right.toUpperCase()
-    },
-    hasButton() {
-      return this.right.includes('X')
+
+      this.isManager &&
+        options.push({
+          title: '推荐信',
+          code: 'reco_letters',
+          edit: { to: { path: '/my/admission', query: { active: 'admission_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 }
+          ]
+        })
+      return options
     }
   },
   methods: {
@@ -361,6 +366,7 @@ export default {
           this.material = material
           const missedRequiredList = progress.FILLING.attachments.missed_required_list
           progress.FILLING.attachments.progress = missedRequiredList.NO_CRIMINAL_CERT ? 0 : 1
+          progress.FILLING.reco_letters = progress.REGISTRATION.reco_letters
           this.progress = progress
         } else {
           this.$message.error(message)

modules/my/interview/form/byzs.js

-export default {
-  id: 'interview_byzs',
-  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'
+export default function(_this) {
+  return {
+    id: 'interview_byzs',
+    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
+        const DIPLOMA_CN = attachments.filter(item => {
+          return item.file_type_id === 'DIPLOMA_CN'
+        })
+        return { DIPLOMA_CN }
+      }
+    },
+    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: {
+      // next: { to: { query: { active: 'interview_zp' } } },
+      submitText: '申请面试',
+      model: { submission_stage: 'INTERVIEW_APPLICATION' },
+      options: {},
+      items: [
+        {
+          type: 'v-upload',
+          required: true,
+          model: 'DIPLOMA_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: 'DIPLOMA_CN' }
+          },
+          append:
+            '申请者需要将本科或以上毕业证书原件扫描或者拍照后提交。<br> 可上传多个文件，请确保证书号码清晰可辨。<br> 上传文件仅限“jpg,jpeg,png”格式，文件小于10MB。'
+        }
       ]
-      this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 2
-      const DIPLOMA_CN = attachments.filter(item => {
-        return item.file_type_id === 'DIPLOMA_CN'
-      })
-      return { DIPLOMA_CN }
     }
-  },
-  form: {
-    next: { to: { query: { active: 'interview_xwzs' } } },
-    hasButton: false,
-    options: {},
-    items: [
-      {
-        type: 'v-upload',
-        required: true,
-        model: 'DIPLOMA_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: 'DIPLOMA_CN' }
-        },
-        append:
-          '申请者需要将本科或以上毕业证书原件扫描或者拍照后提交。<br> 可上传多个文件，请确保证书号码清晰可辨。<br> 上传文件仅限“jpg,jpeg,png”格式，文件小于10MB。'
-      }
-    ]
   }
 }

modules/my/interview/form/cjd.js

@@ -31,24 +31,9 @@ export default function(_this) {
         )
       }
     },
-    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_ywjl' } } },
+      hasButton: false,
       options: { 'label-position': 'top' },
       hint: `
       <p>请将中英文成绩单原件扫描或者拍照后提交。</p>

modules/my/interview/form/index.js

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

modules/my/interview/form/ywjl.js

@@ -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.ezijing.com/static/public/2e8e4f6898f59e03636139a402ef16c1.docx" target="_blank" download="英文简历模板">下载模板</a>]</p>
         <p>请将英文简历填写完存为"pdf"格式上传，文件小于10MB。</p>`
       }
     ]

modules/my/interview/form/zp.js

@@ -38,7 +38,7 @@ export default function(_this) {
       }
     },
     form: {
-      prev: { to: { query: { active: 'interview_ywjl' } } },
+      prev: { to: { query: { active: 'interview_byzs' } } },
       submitText: '申请面试',
       model: { submission_stage: 'INTERVIEW_APPLICATION' },
       options: {},

modules/my/interview/index.vue

@@ -80,7 +80,7 @@ export default {
       return false
     },
     showSubmitedDialog() {
-      return this.isSubmited && this.currentActive === 'interview_zp'
+      return this.isSubmited && this.currentActive === 'interview_byzs'
     }
   },
   methods: {

modules/my/welcome/indexPay.vue

@@ -4,9 +4,9 @@
     <qrcode-pay @update="handleUpdateOrder" v-else></qrcode-pay>
     <div class="pay-ft">
       <p class="t2">
-        欢迎您申请紫荆-印第安纳大学Kelley商学院金融硕士（MSF）<br />
-        申请流程：①支付报名费②填写报名资料并提供相关材料（身份证扫描件、毕业证书扫描件、学位证书扫描件、英文简历、2寸照片）③参加面试④获得录取⑤缴纳学费并签署入学协议⑥入学学习（办理入学手续：提供成绩单、学籍注册等）<br />
-        申请费提交后不予退还
+        欢迎您申请紫荆-玛丽伍德大学金融方向工商管理硕士（FMBA）<br />
+        申请流程：①支付报名费②填写报名资料并提供相关材料（身份证扫描件、毕业证书扫描件、2寸照片）③参加面试④获得录取⑤缴纳学费并签署入学协议⑥入学学习（办
+        理入学手续：提供成绩单、学籍注册等）<br />申请费提交后不予退还
       </p>
     </div>
     <el-dialog

modules/my/welcome/indexWelcome.vue

@@ -6,7 +6,7 @@
       </div>
       <h1>欢迎您</h1>
       <p class="t1">
-        申请紫荆-美国印第安纳大学Kelley商学院金融学硕士项目，请在填写以下内容并<br />
+        申请紫荆-玛丽伍德大学工商管理硕士项目，请在填写以下内容并<br />
         提交报名申请后，扫码支付本项目的申请费共计<span>700</span>元。
       </p>
     </div>