!23 6

Merge pull request !23 from Sky_ID/zql

src/pages/Apply/Apply.vue

@@ -6,8 +6,8 @@
       <span class="steps-tip">&nbsp;&nbsp;报名</span>
       <el-steps :active="1" simple class="steps-steps">
         <el-step title="填写信息" icon="el-icon-edit"></el-step>
-        <el-step title="审核通过" icon="el-icon-upload"></el-step>
+        <el-step title="审核通过" icon="el-icon-s-check"></el-step>
-        <el-step title="报名成功" icon="el-icon-picture"></el-step>
+        <el-step title="报名成功" icon="el-icon-success"></el-step>
       </el-steps>
     </div>
     <!-- 提示信息 -->
@@ -37,6 +37,14 @@
               <el-input v-model="applyForm.applyChargeName" clearable placeholder="请输入负责人姓名"></el-input>
             </el-form-item>
 
+            <el-form-item label="电话" prop="applyPhone" class="apply-form-item">
+              <el-input v-model="applyForm.applyPhone" clearable placeholder="请输入电话"></el-input>
+            </el-form-item>
+
+            <el-form-item label="邮箱" prop="applyEmail" class="apply-form-item">
+              <el-input v-model="applyForm.applyEmail" clearable placeholder="请输入邮箱"></el-input>
+            </el-form-item>
+
             <el-form-item label="职务" prop="applyChargeDuty" class="apply-form-item">
               <el-input v-model="applyForm.applyChargeDuty" clearable placeholder="请输入负责人职务"></el-input>
             </el-form-item>
@@ -80,14 +88,12 @@
               <el-input v-model="applyForm.applySource" :disabled="inputIf" clearable placeholder="填写课题来源"></el-input>
             </el-form-item>
 
-          <el-form-item label="电话" prop="applyPhone" class="apply-form-item">
+          <!-- 成员表单 -->
-            <el-input v-model="applyForm.applyPhone" clearable placeholder="请输入电话"></el-input>
+          <div class="apply-menber">
-          </el-form-item>
+            <div class="apply-member-header">
-
+              <h4>成员</h4>
-          <div>
-            <el-form-item label="成员">
               <el-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAddMember(memberList)">添加成员</el-button>
-            </el-form-item>
+            </div>
             <!-- 成员表格 -->
             <el-table v-loading="loading"
               :element-loading-text="loading_text"
@@ -134,11 +140,9 @@
                 </template>
               </el-table-column>
            </el-table>
+          </div>
 
-          </div>
         </el-form>
-      </div>
-    </div>
 
         <div class="apply-button">
         <!-- 导入按钮 -->
@@ -163,6 +167,9 @@
               </el-link>
             </el-upload>
           </div>
+
+      </div>
+    </div>
   </div>
 </template>
 
@@ -174,14 +181,23 @@ export default {
     return {
       /* 报名表单信息 */
       applyForm: {
-        applyCompany: "",
+        applyCompId: "", 
-        applyChargeName: "",
+        applyTeamId: "",
-        applyChargeDuty: "",
+
-        applyChargeArmyRank: "",
+        applyCompany: "",    // unit单位
-        applyRegion: "",
+        applyChargeName: "",    // name姓名      
-        applySort: "",
+        applyPhone: "",    // tel电话
-        applySource: "",
+        applyEmail: "",    // email邮箱
-        applyPhone: "",      
+
+        applyChargeDuty: "",   // duty职务
+        applyChargeArmyRank: "",   // army_rank军衔
+
+        applyRegion: "",    // division赛区
+        applySort: "",    // kind类别 
+        applySource: "",   // appky_source课题来源
+
+        applyFile: "",     // file文件
+
       },
 
       radioValue: 1,      /* 单选框默认 */
@@ -191,16 +207,19 @@ export default {
       loading_text: "",
 
       memberList: [],     /* 成员列表 */
-      addForm: [],        /* 逐个添加的表单 */
+      addForm: [],        /* 临时变量：逐个添加的表单 */
       
       /* 表格成员信息 */
       memberName: "",      
-      memberCompany: "",
+      memberPhone: "",
-      memberDuty: "",
+      memberEmail: "",
-      memberArmyRank: "",
 
-      uploadActionUrl: "",
+      memberCompany: "",    // memberUnit
-      applyFilterUrl: "",
+      memberDuty: "",       // memberDuty
+      memberArmyRank: "",   // memberArmyRank
+
+      uploadActionUrl: "",   // 上传后端接口url
+      applyFilterUrl: "",    // 下载报名表的url
 
 
       rules: {
@@ -211,6 +230,14 @@ export default {
         applyChargeName: [
           { required: true, message: "请输入负责人姓名", trigger: "blur" },
         ],
+        applyPhone: [
+          { required: true, message: "请输入电话", trigger: "blur" },
+          { pattern: /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/, message:"请输入正确的成员电话", trigger: "change"},    
+        ],
+        applyEmail: [
+          { required: true, message: "请输入邮箱", trigger: "blur" },
+          { pattern: /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/, message:"请输入正确的邮箱地址", trigger: "change"},    
+        ],
         applyChargeDuty: [
           { required: true, message: "请输入职务", trigger: "blur" },
         ],
@@ -226,10 +253,6 @@ export default {
         applySource: [
           { required: true, message: "请填写课题来源", trigger: "change" }
         ],
-        applyPhone: [
-          { required: true, message: "请输入电话", trigger: "blur" },
-          { pattern: /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/, message:"请输入正确的成员电话", trigger: "change"},    
-        ],
 
         memberName: [
           { required: true, message: "请输入成员姓名", trigger: "blur" },
@@ -393,7 +416,16 @@ export default {
   top: -1.75vw;
 }
 
-.apply-table {
+.apply-menber {
+  float: left;
+  text-align: left;
+  width: 100%;
+  margin-top: -1vw;
+}
+h4 {
+  margin-bottom: 1vw;
+}
+::v-deep .apply-table {
   width: 95%;
   height: auto;
 }
@@ -401,7 +433,12 @@ export default {
   margin-bottom: 16px;
 }
 
+.apply-button {
+  float: left;
+  margin: 3vw 2vw;
+}
 .import-apply-tip {
+  align-items: left;
   text-align: left;
   font-size: 11px;
 }