第一版上线

src/components/Introduce/Model.vue

@@ -31,8 +31,8 @@
         >
           <!-- 单选 -->
           <a-radio-group v-model="recruit.sex">
-            <a-radio :value="1">男</a-radio>
+            <a-radio :value="0">男</a-radio>
-            <a-radio :value="2">女</a-radio>
+            <a-radio :value="1">女</a-radio>
           </a-radio-group>
         </a-form-item>
         <a-form-item
@@ -121,6 +121,34 @@
             v-decorator="['email', { rules: emailRules }]"
           />
         </a-form-item>
+        <!-- 是否在职 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="是否在职"
+        >
+          <!-- 单选 -->
+          <a-radio-group v-model="recruit.inWork">
+            <a-radio :value="1">是</a-radio>
+            <a-radio :value="2">否</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <!-- 现居住地 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="现居住地"
+        >
+          <a-input placeholder="请输入现居住地" v-model.trim="recruit.address" />
+        </a-form-item>
+        <!-- 户口所在地 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="户口所在地"
+        >
+          <a-input placeholder="请输入户口所在地" v-model.trim="recruit.birthdayPlace" />
+        </a-form-item>
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
@@ -142,6 +170,30 @@
         >
           <a-textarea placeholder="请输入教育经历..." v-model.trim="recruit.educationExpirence" />
         </a-form-item>
+        <!-- 语言能力 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="语言能力"
+        >
+          <a-textarea placeholder="请输入语言能力" v-model.trim="recruit.language" />
+        </a-form-item>
+        <!-- 专业技能 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="专业技能"
+        >
+          <a-textarea placeholder="请输入专业技能" v-model.trim="recruit.skill" />
+        </a-form-item>
+        <!-- 获得证书 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="获得证书"
+        >
+          <a-textarea placeholder="请输入获得证书" v-model.trim="recruit.zhengShu" />
+        </a-form-item>
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
@@ -193,10 +245,11 @@ export default {
       formItemLayout,
       formTailLayout,
       form: this.$form.createForm(this, { name: 'submit' }),
-      value: 1,
+      value: 0,
+      inWorkValue: 1,
       recruit: {
         name: '', // 姓名
-        sex: 1, // 性别
+        sex: 0, // 性别
         birthday: '', // 出生年月
         startJob: '', // 参加工作时间
         tel: '', // 电话
@@ -204,10 +257,16 @@ export default {
         isTel: false, // 是否符合验证的电话号
         email: '', // 电子邮箱
         isEmail: false, // 是否符合验证的电子邮箱
+        inWork: 1, // 是否在职
+        address: '', // 现居住地
+        birthdayPlace: '', // 户口所在地
         jobWilling: '', // 求职意向
         jobExpirence: '', // 工作经历
         educationExpirence: '', // 教育经历
         personalDescription: '', // 自我评价
+        language: '', // 语言能力
+        skill: '', // 专业技能
+        zhengShu: '', // 获得证书
         files: [], // 附件Id
       },
       action: upload,
@@ -281,22 +340,47 @@ export default {
     async subMitAdd() {
       this.confirmLoading = true;
       try {
-        var params = {};
+        const {
-        var res = {};
+          name,
+          sex,
+          birthday,
+          startJob,
+          tel,
+          email,
+          inWork,
+          address,
+          birthdayPlace,
+          jobWilling,
+          jobExpirence,
+          educationExpirence,
+          language,
+          skill,
+          zhengShu,
+          personalDescription,
+          files,
+        } = this.recruit;
+        let params = {};
+        let res = {};
         params = {
           param: {
-            name: this.recruit.name, // 姓名
+            name, // 姓名
-            gender: this.recruit.sex, // 性别
+            gender: sex, // 性别
-            birthday: this.recruit.birthday, // 出生年月
+            birthday, // 出生年月
-            startJob: this.recruit.startJob, // 参加工作时间
+            startJob, // 参加工作时间
-            phone: this.recruit.tel, // 电话
+            phone: tel, // 电话
             code: this.recruit.code, // 验证码
-            email: this.recruit.email, // 电子邮箱
+            email, // 电子邮箱
-            jobWilling: this.recruit.jobWilling, // 求职意向
+            inWork, // 是否在职
-            jobExpirence: this.recruit.jobExpirence, // 工作经历
+            address, // 现居住地
-            educationExpirence: this.recruit.educationExpirence, // 教育经历
+            birthdayPlace, // 户口所在地
-            personalDescription: this.recruit.personalDescription, // 自我评价
+            jobWilling, // 求职意向
-            files: this.recruit.files, // 附件Id
+            jobExpirence, // 工作经历
+            educationExpirence, // 教育经历
+            language, // 语言能力
+            skill, // 专业技能
+            zhengShu, // 获得证书
+            personalDescription, // 自我评价
+            files, // 附件Id
           },
         };
         res = await joinUs(params);

src/views/Activity/Activity.vue

@@ -39,9 +39,9 @@
         <p class="original">
           <a-button
             disabled
-            v-if="item.closeTime && Date.parse(item.closeTime) < Date.parse(nowData)"
+            v-if="item.releaseTime && Date.parse(item.releaseTime) < Date.parse(nowData)"
           >报名已结束</a-button>
-          <enroll :fnval="item.activityId" v-else />
+          <enroll :activityId="item.activityId" :actName="item.title" v-else />
         </p>
       </div>
     </div>

src/views/Activity/components/Enroll.vue

@@ -34,23 +34,14 @@
           required
         >
           <div :key="index" class="d-flex flex-nowrap mb-3" v-for="(item,index) in people">
-            <a-input
+            <a-input class="flex-1 mr-3" placeholder="姓名" v-model.trim="item.name" />
-              @change="changePerson($event,'name',index)"
+            <a-input class="flex-1 mr-3" placeholder="职称" v-model.trim="item.duties" />
-              class="flex-1 mr-3"
+            <a-input class="flex-1 mr-3" placeholder="职务" v-model.trim="item.positional" />
-              placeholder="姓名"
+            <a-button
-              v-model.trim="item.name"
+              @click="changePerson(index)"
-            />
+              icon="plus"
-            <a-input
+              type="link"
-              @change="changePerson($event,'duties',index)"
+              v-if="index === people.length -1"
-              class="flex-1 mr-3"
-              placeholder="职称"
-              v-model.trim="item.duties"
-            />
-            <a-input
-              @change="changePerson($event,'positional',index)"
-              class="flex-1"
-              placeholder="职务"
-              v-model.trim="item.positional"
             />
           </div>
         </a-form-item>
@@ -205,11 +196,11 @@ export default {
     ...mapActions('user', ['sendCode', 'sendPicCode']),
     ...mapActions('home', ['getUserSer']),
 
-    changePerson(e, type, index) {
+    changePerson(index) {
-      if (this.people[index].name && this.people[index].positional && this.people[index].duties) {
+      // if (this.people[index].name && this.people[index].positional && this.people[index].duties) {
-        const a = { name: '', positional: '', duties: '' };
+      const a = { name: '', positional: '', duties: '' };
-        this.people.push(a);
+      this.people.push(a);
-      }
+      // }
     },
     // 显示表单输入框
     showModal() {