chore: 入学协议移动到综合评审阶段

modules/my/admission/form/index.js

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

modules/my/admission/form/xfjn.js

@@ -19,9 +19,23 @@ export default function(_this) {
         return { PAYMENT_VOUCHER }
       }
     },
+    update: {
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
+      beforeRequest(data) {
+        return { submission_stage: 'CLOSED' }
+      },
+      callback() {
+        _this.$message({ type: 'success', message: '提交成功' })
+        _this.getApplication()
+        this.form.options.disabled = true
+      },
+      errorCallback() {
+        _this.completeVisible = true
+      }
+    },
     form: {
-      next: { to: { query: { active: 'admission_xy' } } },
-      hasButton: false,
+      // next: { to: { query: { active: 'admission_xy' } } },
+      submitText: '提交',
       options: { 'label-position': 'top' },
       // hint: `
       //   <p><strong>一、对公收款银行信息：</strong></p>
@@ -37,6 +51,7 @@ export default function(_this) {
           type: 'v-upload',
           model: 'PAYMENT_VOUCHER',
           label: '上传缴费凭证',
+          rules: [{ required: true, message: '请上传', trigger: 'change' }],
           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`,

modules/my/review/form/index.js

 import cjd from './cjd'
 import byzs from './byzs'
 // import ywjl from './ywjl'
-// import xy from './xy'
+import xy from './xy'
 // import xfjn from './xfjn'
 import tjx from './tjx'
 import grcs from './grcs'
@@ -25,7 +25,8 @@ export default function(_this) {
         visible() {
           return _this.hasPay
         }
-      }
+      },
+      xy(_this)
     ]
   }
 }

modules/my/review/form/xy.js

@@ -2,14 +2,18 @@ import { STAGE_LIST } from '../../index'
 
 export default function(_this) {
   return {
+    required: true,
     id: 'admission_xy',
     title: '入学协议',
+    visible() {
+      return _this.hasPay
+    },
     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
 
-        this.form.options.disabled = STAGE_LIST.findIndex(item => item === submissionStage) > 6
+        this.form.options.disabled = STAGE_LIST.findIndex(item => item === submissionStage) >= 6
         const ADMISSION_AGREEMENT = attachments.filter(item => {
           return item.file_type_id === 'ADMISSION_AGREEMENT'
         })
@@ -17,8 +21,8 @@ export default function(_this) {
       }
     },
     form: {
-      prev: { to: { query: { active: 'admission_cjd' } } },
-      next: { to: { query: { active: 'admission_xfjn' } } },
+      // prev: { to: { query: { active: 'admission_cjd' } } },
+      // next: { to: { query: { active: 'admission_xfjn' } } },
       hasButton: false,
       options: { 'label-position': 'top' },
       items: [
@@ -32,9 +36,9 @@ export default function(_this) {
             deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'ADMISSION_AGREEMENT' }
           },
-          prepend: `
-            <p><a href="https://webapp-pub.ezijing.com/project/sbu-plus/%E5%85%A5%E5%AD%A6%E5%8D%8F%E8%AE%AE.pdf" target="_blank" download="入学协议">下载入学协议</a></p>
-            <p>申请者可将签字后的入学协议原件扫描或拍照后提交。</p>
+          prepend:
+            // <p><a href="https://webapp-pub.ezijing.com/project/sbu-plus/%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>
           `
         }