chore:报名流程新增字段

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

@@ -21,6 +21,7 @@ export default function(_this) {
     update: {
       action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
+        console.log(data, '1111')
         const educations = data.map(item => {
           return ['start_date', 'end_date', 'school_name_cn', 'major_cn', 'degree'].reduce((result, key) => {
             result[key] = item[key]
@@ -36,6 +37,14 @@ export default function(_this) {
       hasAdd: true,
       options: { labelWidth: '140px' },
       items: [
+        {
+          type: 'v-input',
+          label: '当前教育状态',
+          model: 'education_status',
+          attrs: { placeholder: '请填写当前教育状态' },
+          rules: [{ required: true, message: '请填写当前教育状态', trigger: 'blur' }],
+          append: '<p style="color:#606266">当前教育状态(填写示例：本科在读/大四)</p>'
+        },
         {
           type: 'v-datepicker',
           label: '开始时间',
@@ -89,6 +98,16 @@ export default function(_this) {
           model: 'degree',
           rules: [{ required: true, message: '请选择学历/学位', trigger: 'change' }]
         }
+      ],
+      appendItems: [
+        {
+          type: 'v-input',
+          label: '当前教育状态',
+          model: 'education_status',
+          attrs: { placeholder: '请填写当前教育状态' },
+          rules: [{ required: true, message: '请填写当前教育状态', trigger: 'blur' }],
+          append: '<p style="color:#606266">当前教育状态(填写示例：本科在读/大四)</p>'
+        }
       ]
     }
   }

modules/my/application/preview.vue

@@ -4,13 +4,26 @@
       <div class="preview-hd">
         <el-steps align-center :active="options.length">
           <template v-for="item in options">
-            <el-step :title="item.title" :status="(progress.FILLING[item.code] && progress.FILLING[item.code].progress === 1) || !item.required ? 'success' : 'error'" :key="item.code"></el-step>
+            <el-step
+              :title="item.title"
+              :status="
+                (progress.FILLING[item.code] && progress.FILLING[item.code].progress === 1) || !item.required
+                  ? 'success'
+                  : 'error'
+              "
+              :key="item.code"
+            ></el-step>
           </template>
         </el-steps>
       </div>
       <div class="preivew-bd">
         <template v-for="item in options">
-          <div class="preview-item" :class="progress.FILLING[item.code].progress === 1 || !item.required ? 'is-success' : 'is-error'" :key="item.code" v-if="progress.FILLING[item.code]">
+          <div
+            class="preview-item"
+            :class="progress.FILLING[item.code].progress === 1 || !item.required ? 'is-success' : 'is-error'"
+            :key="item.code"
+            v-if="progress.FILLING[item.code]"
+          >
             <div class="preview-item-hd">
               <div class="title">
                 {{ item.title }}
@@ -26,7 +39,11 @@
               </template>
               <template v-else-if="item.isMultiple">
                 <div class="group" v-for="(data, index) in material[item.code]" :key="index">
-                  <dl v-for="subitem in item.items" :key="subitem.code" v-show="subitem.visible ? subitem.visible() : true">
+                  <dl
+                    v-for="subitem in item.items"
+                    :key="subitem.code"
+                    v-show="subitem.visible ? subitem.visible() : true"
+                  >
                     <dt>{{ subitem.label }}：</dt>
                     <dd>
                       <template v-if="subitem.computed">
@@ -74,7 +91,9 @@
                     </div>
                   </div>
                   <el-button-group v-if="hasButton" style="margin-left: 40px">
-                    <el-button size="mini" :disabled="item.status === 'INACTIVE'" @click="handleRemove(item)">删除</el-button>
+                    <el-button size="mini" :disabled="item.status === 'INACTIVE'" @click="handleRemove(item)"
+                      >删除</el-button
+                    >
                     <el-button size="mini" :disabled="item.status === 'LOG'" @click="handleSave(item)">存档</el-button>
                   </el-button-group>
                 </li>
@@ -230,7 +249,10 @@ export default {
             },
             { label: '专业名称', code: 'major_cn' },
             { label: '学校名称', code: 'school_name_cn' },
-            { label: '学历/学位', code: 'degree' }
+            { label: '学历/学位', code: 'degree' },
+            { label: '当前状态', code: 'education_status' },
+            { label: 'GPA', code: 'gpa_score' },
+            { label: '语言成绩', code: 'language_score' }
           ]
         },
         {

modules/my/interview/form/cjd.js

@@ -37,12 +37,14 @@ export default function(_this) {
       next: { to: { query: { active: 'interview_yynl' } } },
       hasButton: false,
       options: { 'label-position': 'top' },
-      hint: `
-      <p>已毕业学生需提交完整成绩单，未毕业学生提交现有成绩单，成绩单需要加盖学校公章</p>
-      <p>请将中文成绩单原件扫描或者拍照后提交。</p>
-      <p>获取途径:联系大学时就读学校相关部门(档案馆/教务处)获取成绩单。</p>
-    `,
       items: [
+        {
+          type: 'v-input',
+          label: 'GPA成绩 (填写示例：3.9 / 5.0)',
+          model: 'id_number',
+          attrs: { placeholder: '请填写您的GPA成绩' },
+          rules: [{ required: true, message: '请填写您的GPA成绩', trigger: 'blur' }]
+        },
         {
           required: true,
           type: 'v-upload',
@@ -52,7 +54,11 @@ 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' }
-          }
+          },
+          append: `
+          <p>已毕业学生需提交完整成绩单，未毕业学生提交现有成绩单，成绩单需要加盖学校公章</p>
+          <p>请将中文成绩单原件扫描或者拍照后提交。</p>
+          <p>获取途径:联系大学时就读学校相关部门(档案馆/教务处)获取成绩单。</p>`
         }
         // {
         //   type: 'v-upload',

modules/my/interview/form/yynl.js

@@ -48,17 +48,25 @@ export default function(_this) {
       submitText: '申请面试',
       model: { submission_stage: 'INTERVIEW_APPLICATION' },
       options: { 'label-position': 'top' },
-      hint: '成绩单类型包括：CET-4，CET-6，TOEFL，IELTS等',
       items: [
+        {
+          type: 'v-input',
+          label: '语言成绩(填写示例：大学英语六级/550)',
+          model: 'id_number',
+          attrs: { placeholder: '请填写您的语言成绩' },
+          rules: [{ required: true, message: '请填写您的语言成绩', trigger: 'blur' }]
+        },
         {
           required: true,
           type: 'v-upload',
+          label: '语言成绩单',
           model: 'INTERNATIONAL_LANGUAGE_SCORE',
           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: 'INTERNATIONAL_LANGUAGE_SCORE' }
-          }
+          },
+          append: '成绩单类型包括：CET-4，CET-6，TOEFL，IELTS等'
         }
       ]
     }