chore(报名申请): 新增学习状态

modules/my/admission/form/byzs.js

@@ -6,7 +6,11 @@ export default function(_this) {
     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 {
+          basic_info: basicInfo = {},
+          attachments = [],
+          submission_stage: submissionStage = 'FILLING'
+        } = data.data.material
         const stageList = [
           'FILLING',
           'PREPAYMENT',
@@ -18,7 +22,7 @@ export default function(_this) {
           'CLOSED'
         ]
         this.form.options.disabled = stageList.findIndex(item => item === submissionStage) >= 6
-        return attachments.reduce(
+        const attachment = attachments.reduce(
           (result, item) => {
             if (item.file_type_id === 'DIPLOMA_CN') {
               result.DIPLOMA_CN.push(item)
@@ -33,30 +37,40 @@ export default function(_this) {
           },
           { DIPLOMA_CN: [], DEGREE_CERT_CN: [], PROOF_READING: [] }
         )
+        return Object.assign({ learn_status: basicInfo.learn_status }, attachment)
       }
     },
     update: {
-      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
-        return { submission_stage: 'REGISTRATION' }
+        const basicInfo = ['learn_status'].reduce((result, key) => {
+          result[key] = data[key]
+          return result
+        }, {})
+        return { basic_info: basicInfo }
       },
       callback() {
-        this.form.options.disabled = true
-        _this.getApplication()
-      },
-      errorCallback() {
-        _this.completeVisible = true
+        _this.changeSubmissionStage(() => {
+          this.form.options.disabled = true
+        })
       }
     },
     form: {
       prev: { to: { query: { active: 'admission_grcs' } } },
       submitText: '提交申请',
       options: { 'label-position': 'top' },
-      hint: `
-      提示：<br />
-      1、请同时上传毕业证书及学位证书（中英文）<br />
-      2、如尚未毕业，请上传在读证明（中英文）`,
       items: [
+        {
+          type: 'v-select',
+          values: [{ value: '已毕业' }, { value: '未毕业' }],
+          label: '您当前的学习状态',
+          model: 'learn_status',
+          rules: [{ required: true, message: '请选择', trigger: 'change' }],
+          append: `
+          提示：<br />
+          1、请同时上传毕业证书及学位证书（中英文）<br />
+          2、如尚未毕业，请上传在读证明（中英文）`
+        },
         {
           required: true,
           label: '毕业证书',
@@ -69,7 +83,10 @@ export default function(_this) {
           },
           rules: { required: true, message: '请上传毕业证书' },
           append:
-            '申请者需要将本科或以上毕业证书原件扫描或者拍照后提交。<br> 可上传多个文件，请确保证书号码清晰可辨。<br> 上传文件仅限“jpg,jpeg,png”格式，文件小于10MB。'
+            '申请者需要将本科或以上毕业证书原件扫描或者拍照后提交。<br> 可上传多个文件，请确保证书号码清晰可辨。<br> 上传文件仅限“jpg,jpeg,png”格式，文件小于10MB。',
+          isShow(ruleForm) {
+            return ruleForm.learn_status === '已毕业'
+          }
         },
         {
           required: true,
@@ -83,7 +100,10 @@ export default function(_this) {
           },
           rules: { required: true, message: '请上传学位证书' },
           append:
-            '已毕业学员请提交学位证书<br />申请者需要将本科或以上的学位证书原件扫描或拍照后提交<br />可上传多个文件，请确保公章清晰可辨。'
+            '已毕业学员请提交学位证书<br />申请者需要将本科或以上的学位证书原件扫描或拍照后提交<br />可上传多个文件，请确保公章清晰可辨。',
+          isShow(ruleForm) {
+            return ruleForm.learn_status === '已毕业'
+          }
         },
         {
           required: true,
@@ -97,7 +117,10 @@ export default function(_this) {
           },
           rules: { required: true, message: '请上传在读证明' },
           append:
-            '未毕业学员提交加盖公章的在读证明<br/>申请者需要将本科或以上在读证明原件扫描或拍照后提交。<br> 可上传多个文件，请确保公章清晰可辨。'
+            '未毕业学员提交加盖公章的在读证明<br/>申请者需要将本科或以上在读证明原件扫描或拍照后提交。<br> 可上传多个文件，请确保公章清晰可辨。',
+          isShow(ruleForm) {
+            return ruleForm.learn_status === '未毕业'
+          }
         }
       ]
     }

modules/my/admission/index.vue

@@ -104,6 +104,17 @@ export default {
         }
       })
     },
+    changeSubmissionStage(callback) {
+      api
+        .changeSubmissionStage({ submission_stage: 'REGISTRATION' })
+        .then(() => {
+          this.getApplication()
+          callback && callback()
+        })
+        .catch(() => {
+          this.completeVisible = true
+        })
+    },
     handlePageChange(value) {
       this.currentActive = value
       this.$router.push({ path: this.$route.path, query: { active: value } })