报名优化3步变2步

modules/my/account/home.vue

@@ -11,12 +11,12 @@
     <div class="card" style="min-height: 360px">
       <ul class="nav">
         <li class="nav-application" @click="toApplication"></li>
-        <li class="nav-interview" @click="toInterview"></li>
+        <!-- <li class="nav-interview" @click="toInterview"></li> -->
         <li class="nav-admission" @click="toAdmission"></li>
       </ul>
       <div class="progress">
         <el-steps :active="activeProgress" finish-status="success" align-center>
-          <el-step v-for="(item, index) in 3" :key="index">
+          <el-step v-for="(item, index) in 2" :key="index">
             <template #title>{{ getProgressStatusText(index) }}</template>
           </el-step>
         </el-steps>
@@ -49,10 +49,9 @@ export default {
       material: {},
       progress: {},
       submissionStage: {
-        0: ['FILLING'],
-        1: ['INTERVIEW_APPLICATION', 'AUDITION', 'PREPAYMENT', 'INTERVIEW'],
-        2: ['REGISTRATION', 'PAYMENT'],
-        3: ['CLOSED']
+        0: ['FILLING', 'INTERVIEW_APPLICATION', 'AUDITION', 'PREPAYMENT', 'INTERVIEW'],
+        1: ['REGISTRATION', 'PAYMENT'],
+        2: ['CLOSED']
       },
       result: {},
       welcomeShow: false
@@ -119,7 +118,7 @@ export default {
     },
     // 办理入学
     toAdmission() {
-      if (this.activeProgress < 2) {
+      if (this.activeProgress < 1) {
         this.$message.warning('请等待面试结果')
         return
       }
@@ -194,8 +193,8 @@ export default {
 }
 .nav {
   display: flex;
-  justify-content: space-between;
-  padding: 40px 70px 20px;
+  justify-content: space-around;
+  padding: 40px 40px 20px;
   li {
     position: relative;
     width: 188px;

modules/my/application/complete.vue

@@ -140,7 +140,7 @@ export default {
           const applicationWfzzm = { progress: 0 }
           applicationWfzzm.progress = fillingMissedRequiredList.NO_CRIMINAL_CERT ? 0 : 1
 
-          const missedRequiredList = progress.INTERVIEW_APPLICATION.attachments.missed_required_list
+          const missedRequiredList = progress.FILLING.attachments.missed_required_list
           // 2寸照片
           const interviewZp = { progress: 0 }
           interviewZp.progress = missedRequiredList.PERSONAL_PHOTO_FOR_ID ? 0 : 1

modules/my/application/form/declare.js

@@ -26,8 +26,8 @@ export default function(_this) {
       callback() {
         _this.getApplication()
         this.form.options.disabled = true
-        // _this.$router.push({ path: this.$route.path, query: { active: 'application_pay' } })
-        _this.$router.push({ path: '/my/interview' })
+        _this.$router.push({ path: this.$route.path, query: { active: 'application_pay' } })
+        // _this.$router.push({ path: '/my/interview' })
       },
       errorCallback() {
         _this.completeVisible = true

modules/my/application/form/index.js

@@ -11,15 +11,15 @@ export default function(_this) {
       info(_this),
       // tjx(_this),
       // wfzsm(_this),
-      declare(_this)
-      // {
-      //   id: 'application_pay',
-      //   title: '缴报名费',
-      //   show: false,
-      //   visible() {
-      //     return _this.visible
-      //   }
-      // }
+      declare(_this),
+      {
+        id: 'application_pay',
+        title: '缴报名费',
+        show: false,
+        visible() {
+          return _this.visible
+        }
+      }
     ]
   }
 }

modules/my/application/form/info.js

@@ -5,11 +5,21 @@ import career from './info/career'
 import honor from './info/honor'
 import training from './info/training'
 import answer from './info/answer'
+import attachment from './info/attachment'
 
 export default function(_this) {
   return {
     id: 'application_info',
     title: '个人资料',
-    tabs: [first(_this), profile(_this), education(_this), career(_this), answer(_this), training(_this), honor(_this)]
+    tabs: [
+      first(_this),
+      profile(_this),
+      education(_this),
+      career(_this),
+      answer(_this),
+      training(_this),
+      honor(_this),
+      attachment(_this)
+    ]
   }
 }

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

+/**
+ * 相关附件
+ */
+export default function(_this) {
+  return {
+    id: 'application_info_attachment',
+    title: '相关附件',
+    required: true,
+    visible() {
+      return _this.visible
+    },
+    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) => {
+            if (item.file_type_id === 'DIPLOMA_CN') {
+              result.DIPLOMA_CN.push(item)
+            }
+            if (item.file_type_id === 'DEGREE_CERT_CN') {
+              result.DEGREE_CERT_CN.push(item)
+            }
+            if (item.file_type_id === 'RESUME_EN') {
+              result.RESUME_EN.push(item)
+            }
+            if (item.file_type_id === 'PERSONAL_PHOTO_FOR_ID') {
+              result.PERSONAL_PHOTO_FOR_ID.push(item)
+            }
+            return result
+          },
+          { DIPLOMA_CN: [], DEGREE_CERT_CN: [], RESUME_EN: [], PERSONAL_PHOTO_FOR_ID: [] }
+        )
+      }
+    },
+    form: {
+      prev: { to: { query: { active: 'application_info', tab: 'application_info_honor' } } },
+      next: { to: { query: { active: 'application_declare' } } },
+      hasButton: false,
+      options: {},
+      items: [
+        {
+          type: 'v-upload',
+          label: '毕业证书',
+          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。'
+        },
+        {
+          type: 'v-upload',
+          label: '学位证书',
+          required: true,
+          model: 'DEGREE_CERT_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: 'DEGREE_CERT_CN' }
+          },
+          append:
+            '申请者需要将学位证书原件扫描或者拍照后提交。<br>可上传多个文件，请确保证书号码清晰可辨。<br>上传文件仅限“jpg,jpeg,png”格式，文件小于10MB。'
+        },
+        {
+          type: 'v-upload',
+          label: '英文简历',
+          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.ezijing.com/pc/kelley/%E8%8B%B1%E6%96%87%E7%AE%80%E5%8E%86.docx" download="英文简历模板">下载模板</a>]</p>
+          <p>请将英文简历填写完存为"pdf"格式上传，文件小于10MB。</p>`
+        },
+        {
+          type: 'v-upload',
+          label: '2寸照片',
+          required: true,
+          model: 'PERSONAL_PHOTO_FOR_ID',
+          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: 'PERSONAL_PHOTO_FOR_ID' },
+            limit: 1
+          },
+          append:
+            '申请者需要上传本人半年以内的两寸彩色近照。<br> 只需上传一个文件，且照片完整、干净。<br> 上传文件仅限“jpg,jpeg,gif,png”格式的图片文件，且文件小于10MB。'
+        }
+      ]
+    }
+  }
+}

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

@@ -29,7 +29,8 @@ export default function(_this) {
             'industry',
             'dept_cn',
             'position_cn',
-            'job_desc_cn'
+            'job_desc_cn',
+            'annual_salary'
           ].reduce((result, key) => {
             result[key] = item[key]
             return result
@@ -141,6 +142,13 @@ export default function(_this) {
           attrs: { placeholder: '请输入工作职位' },
           rules: [{ required: true, message: '请输入工作职位', trigger: 'blur' }]
         },
+        {
+          type: 'v-input',
+          label: '年薪收入(万元)',
+          model: 'annual_salary',
+          attrs: { placeholder: '请输入您的年薪收入', maxlength: '20' },
+          rules: [{ required: true, message: '请输入您的年薪收入', trigger: 'blur' }]
+        },
         {
           type: 'v-input',
           label: '工作描述',

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_info', tab: 'application_info_attachment' } }, isSubmit: true },
       hasAdd: true,
       options: { labelWidth: '140px' },
       items: [
@@ -46,15 +46,15 @@ export default function(_this) {
           type: 'v-input',
           label: '荣誉奖励',
           model: 'title',
-          attrs: { placeholder: '请输入荣誉奖励' }
-          // rules: [{ required: true, message: '请输入荣誉奖励', trigger: 'blur' }]
+          attrs: { placeholder: '请填写您所获得的荣誉/奖励/社会职务' }
+          // rules: [{ required: true, message: '请填写您所获得的荣誉/奖励/社会职务', trigger: 'blur' }]
         },
         {
           type: 'v-input',
-          label: '证书颁发机构',
+          label: '授予机构',
           model: 'institution_cn',
-          attrs: { placeholder: '请输入证书颁发机构' }
-          // rules: [{ required: true, message: '请输入证书颁发机构', trigger: 'blur' }]
+          attrs: { placeholder: '请输入授予机构' }
+          // rules: [{ required: true, message: '请输入授予机构', trigger: 'blur' }]
         }
       ]
     }

modules/my/application/pay.vue

@@ -2,11 +2,11 @@
   <div class="pay">
     <h5-pay @update="handleUpdateOrder" v-if="isWechat"></h5-pay>
     <qrcode-pay @update="handleUpdateOrder" v-else></qrcode-pay>
-    <div class="pay-ft">
+    <!-- <div class="pay-ft">
       <p class="t2">注释：该申请费提交后不予退还，缴纳申请费后，申请人还需提交以下文件：</p>
       <p class="t2">①本科及以上学历毕业证书扫描件②本科及以上学历学位证书扫描件③个人证件照④英文简历</p>
       <p class="t2">该申请费不退，请慎重缴费！</p>
-    </div>
+    </div> -->
     <el-dialog
       title="报名费缴费成功"
       :visible.sync="dialogVisible"
@@ -15,12 +15,12 @@
       width="348px"
     >
       <div class="dialog-pay">
-        <p>请填写申请面试的材料，材料齐全后<br />招生办老师将给您致电预约面试日期与时间</p>
+        <p>招生办老师将给您致电预约面试日期与时间</p>
         <div class="icon"><img src="https://webapp-pub.ezijing.com/project/application/images/icon_success.png" /></div>
       </div>
-      <template #footer>
+      <!-- <template #footer>
         <el-button type="primary" @click="toInterview">立即预约</el-button>
-      </template>
+      </template> -->
     </el-dialog>
   </div>
 </template>

modules/my/application/preview.vue

@@ -261,6 +261,7 @@ export default {
             },
             { label: '工作部门', code: 'dept_cn' },
             { label: '工作职位', code: 'position_cn' },
+            { label: '年薪收入（万元）', code: 'annual_salary' },
             { label: '工作描述', code: 'job_desc_cn' }
           ]
         },