页面调整

pages/human/enrollment/registration/EnrollmentRegistrationAddForm.vue

@@ -99,11 +99,11 @@
 			     <u--input placeholder='请填写专业'  v-model="inputForm.speciality"></u--input>
 			</u-form-item>
 			
-			<u-form-item label="开始时间" borderBottom prop="startTime" :required="true">
+			<u-form-item label="入学时间" borderBottom prop="startTime" :required="true">
 			     <el-date-picker
 			     	v-model="inputForm.startTime"
 			     	type="date"
-			     	placeholder="选择开始时间"
+			     	placeholder="选择入学时间"
 			     	style="width:100%"
 			     	size="default"
 			     	placement="bottom-start"
@@ -151,24 +151,24 @@
 						    ]"></jp-picker>
 			</u-form-item>
 			
-			<u-form-item label="英语等级" borderBottom prop="englishLevel" :required="true">
+			<u-form-item label="英语等级" borderBottom prop="englishLevel" >
 				<jp-picker v-model="inputForm.englishLevel" rangeKey="label" rangeValue="value" :range="[
+						        { label: '无', value: '6' },
+						        { label: '三级', value: '5' },
 						        { label: 'CET-4', value: '1' },
 						        { label: 'CET-6', value: '2' },
 						        { label: 'TEM-4', value: '3' },
 						        { label: 'TEM-8', value: '4' },
-						        { label: 'PRETCO', value: '5' },
-						        { label: '无', value: '6' },
 						    ]"></jp-picker>
 			</u-form-item>
 			
 			<u-form-item label="计算机等级" borderBottom prop="ncre" :required="true">
 				<jp-picker v-model="inputForm.ncre" rangeKey="label" rangeValue="value" :range="[
+						        { label: '无', value: '5' },
 						        { label: '一级', value: '1' },
 						        { label: '二级', value: '2' },
 						        { label: '三级', value: '3' },
 						        { label: '四级', value: '4' },
-						        { label: '无', value: '5' },
 						    ]"></jp-picker>
 			</u-form-item>
 			
@@ -176,12 +176,12 @@
 			    <u--textarea  placeholder='请填写个人简历'  v-model="inputForm.remarks" ></u--textarea>
 			</u-form-item>
 			
-			<u-form-item label="社保编号(选填)" borderBottom prop="socialSecurityNumber">
-			    <u--input  placeholder='请填写社保编号'  v-model="inputForm.socialSecurityNumber" maxlength="10" @input="validateInput"></u--input>
+			<!--<u-form-item label="社保编号(选填)" borderBottom prop="socialSecurityNumber">
+			    <u&#45;&#45;input  placeholder='请填写社保编号'  v-model="inputForm.socialSecurityNumber" maxlength="10" @input="validateInput"></u&#45;&#45;input>
 			</u-form-item>
 			
 			<u-form-item label="社保银行卡号(选填)" borderBottom prop="socialSecurityBankNumber">
-			    <u--input  placeholder='请填写社保银行卡号'  v-model="inputForm.socialSecurityBankNumber" @change="checkBankNumber(inputForm.socialSecurityBankNumber)" maxlength="19"></u--input>
+			    <u&#45;&#45;input  placeholder='请填写社保银行卡号'  v-model="inputForm.socialSecurityBankNumber" @change="checkBankNumber(inputForm.socialSecurityBankNumber)" maxlength="19"></u&#45;&#45;input>
 			</u-form-item>
 			
 			<u-form-item label="社保卡照片正面" borderBottom prop="socialSecurityPictureFront">
@@ -214,7 +214,7 @@
 				  <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
 				</el-upload>
 				
-			</u-form-item>
+			</u-form-item>-->
 			<u-form-item style="margin-top: 20px; text-align: center;">
 				<el-button type="primary" @click="saveForm" style="width: 100%;">
 					<span style="margin: 0 auto;">提交</span>

pages/human/practice/register/RegistrationAddForm.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom :backUrl="'/pages/human/practice/register/RegistrationAddForm'" :isBack="true" bgColor="bg-gradual-blue" >
+		<cu-custom :backUrl="'/pages/human/practice/register/RegistrationAddForm'" :isBack="false" bgColor="bg-gradual-blue" >
 			<block slot="content">实习登记</block>
 		</cu-custom>
 		<u--form :model="inputForm" labelWidth="100px" class="u-form" labelPosition="left" :rules="rules" ref="inputForm">
@@ -59,7 +59,7 @@
 			<u-form-item label="QQ号/微信号" borderBottom prop="qqNum" >
 			     <u--input placeholder='请填写QQ号/微信号'  v-model="inputForm.qqNum" :maxlength="20"></u--input>
 			</u-form-item>
-			<u-form-item label="实习开始时间" borderBottom prop="practiceStartDay" >
+			<u-form-item label="实习开始时间" borderBottom prop="practiceStartDay" :required="true">
 				<el-date-picker
 						v-model="inputForm.practiceStartDay"
 						type="date"
@@ -70,7 +70,7 @@
 						clearable>
 				</el-date-picker>
 			</u-form-item>
-			<u-form-item label="实习结束时间" borderBottom prop="practiceCompleteDay" >
+			<u-form-item label="实习结束时间" borderBottom prop="practiceCompleteDay"  :required="true">
 				<el-date-picker
 						v-model="inputForm.practiceCompleteDay"
 						type="date"
@@ -86,12 +86,12 @@
 			</u-form-item>
 			
 			 <!-- 添加按钮 -->
-			      <u-form-item label="实习经验">
+			      <!-- <u-form-item label="实习经验">
 			        <el-button type="primary" @click="addRow">新增</el-button>
-			      </u-form-item>
+			      </u-form-item> -->
 			
 			      <!-- 表格 -->
-			      <el-table :data="inputForm.experiences" style="width: 100%">
+			      <!-- <el-table :data="inputForm.experiences" style="width: 100%">
 			        <el-table-column label="开始时间">
 			          <template slot-scope="scope">
 			            <el-date-picker
@@ -127,21 +127,88 @@
 					  <template slot-scope="scope">
 					    <el-input  placeholder="请填写岗位"  v-model="scope.row.post"/>
 					  </template>
-					</el-table-column>
+					</el-table-column> -->
 			        <!-- 添加其他表格列 -->
-			        <el-table-column label="操作">
+			        <!-- <el-table-column label="操作">
 			          <template slot-scope="scope">
 			            <el-button @click="removeRow(scope.$index)" type="danger" icon="el-icon-delete">删除</el-button>
 			          </template>
 			        </el-table-column>
-			      </el-table>
+			      </el-table> -->
+				  
+				  
+				  <el-row  :gutter="15" :key="index_experience" v-for="(item,index_experience) in this.inputForm.experiences">
+				  	<el-col :span="24">
+				  		<el-form-item label="" >
+				  			<el-divider content-position="left"> 实习经验 {{index_experience + 1}}</el-divider>
+				  		</el-form-item>
+				  	</el-col>
+				  	
+				  	<el-col :span="24">
+				  		<u-form-item label="开始时间" :prop="'experiences[' + index_experience + '].startTime'" :required="true"
+				  					  :rules="[
+				     ]">
+				  			<el-date-picker
+				  				v-model="inputForm.experiences[index_experience].startTime"
+				  				type="date"
+				  				placeholder="选择开始时间"
+				  				style="width:100%"
+				  				size="default"
+				  				placement="bottom-start"
+				  				clearable>
+				  			</el-date-picker>
+				  		</u-form-item>
+				  	</el-col>
+				  	<el-col :span="24">
+				  		<u-form-item label="结束时间" :prop="'experiences[' + index_experience + '].endTime'" :required="true"
+				  					  :rules="[
+				  	 ]">
+				  			<el-date-picker
+				  				v-model="inputForm.experiences[index_experience].endTime"
+				  				type="date"
+				  				placeholder="选择开始时间"
+				  				style="width:100%"
+				  				size="default"
+				  				placement="bottom-start"
+				  				clearable>
+				  			</el-date-picker>
+				  		</u-form-item>
+				  	</el-col>
+					
+				  	<el-col :span="24">
+				  		<u-form-item label="实践单位" :prop="'experiences[' + index_experience + '].practiceUnit'" :required="true"
+				  					 :rules="[
+				     ]">
+				  			<el-input v-model="inputForm.experiences[index_experience].practiceUnit" placeholder="请填写实践单位"     clearable></el-input>
+				  		</u-form-item>
+				  	</el-col>
+				  
+				  	<el-col :span="24">
+				  		<u-form-item label="岗位" :prop="'experiences[' + index_experience + '].post'"  :required="true"
+				  					 :rules="[
+				     ]">
+				  			<el-input v-model="inputForm.experiences[index_experience].post" placeholder="请填写岗位"     clearable></el-input>
+				  		</u-form-item>
+				  	</el-col>
+				  
+				  	<el-col :span="24" style="text-align: center">
+				  		<u-form-item label="" >
+				  			<el-button style="width: 100%" type="danger" @click="removeRow(index_experience)" plain>删除实习经验 {{index_experience + 1}}</el-button>
+				  		</u-form-item>
+				  	</el-col>
+				  </el-row>
+			<u-form-item label="" >
+				<el-button style="width: 100%" type="primary" @click="addRow()" plain>新增实习经验</el-button>
+			</u-form-item>
 				  
-				  <u-form-item label="家庭成员">
+				  
+				  
+				  <!--<u-form-item label="家庭成员">
 					<el-button type="primary" @click="addRow2">新增</el-button>
-				  </u-form-item>
+				  </u-form-item>-->
 				  
 				  <!-- 表格 -->
-				  <el-table :data="inputForm.familyMembers" style="width: 100%">
+				  <!--<el-table :data="inputForm.familyMembers" style="width: 100%">
 					<el-table-column label="称呼">
 					  <template slot-scope="scope">
 						<el-input  placeholder="请填写称呼"  v-model="scope.row.callName"/>
@@ -162,13 +229,66 @@
 						<el-input  placeholder="请填写工作单位"  v-model="scope.row.workUnit"/>
 					  </template>
 					</el-table-column>
-				    <!-- 添加其他表格列 -->
+				    &lt;!&ndash; 添加其他表格列 &ndash;&gt;
 				    <el-table-column label="操作">
 				      <template slot-scope="scope">
 				        <el-button @click="removeRow2(scope.$index)" type="danger" icon="el-icon-delete">删除</el-button>
 				      </template>
 				    </el-table-column>
-				  </el-table>
+				  </el-table>-->
+
+
+
+			<el-row  :gutter="15" :key="index_family" v-for="(item,index_family) in this.inputForm.familyMembers">
+				<el-col :span="24">
+					<el-form-item label="" >
+						<el-divider content-position="left"> 家庭成员 {{index_family + 1}}</el-divider>
+					</el-form-item>
+				</el-col>
+				
+				<el-col :span="24">
+					<u-form-item label="关系" :prop="'familyMembers[' + index_family + '].callName'" :required="true"
+								  :rules="[
+               ]">
+						<el-input v-model="inputForm.familyMembers[index_family].callName" placeholder="请填写成员关系"     clearable></el-input>
+					</u-form-item>
+				</el-col>
+				<el-col :span="24">
+					<u-form-item label="成员姓名" :prop="'familyMembers[' + index_family + '].name'" :required="true"
+								  :rules="[
+               ]">
+						<el-input v-model="inputForm.familyMembers[index_family].name" placeholder="请填写成员姓名"     clearable></el-input>
+					</u-form-item>
+				</el-col>
+				<el-col :span="24">
+					<u-form-item label="联系方式" :prop="'familyMembers[' + index_family + '].phone'" :required="true"
+								 :rules="[
+               ]">
+						<el-input v-model="inputForm.familyMembers[index_family].phone" placeholder="请填写联系方式"  @blur="checkMobile(scope.row)"   clearable></el-input>
+					</u-form-item>
+				</el-col>
+
+				<el-col :span="24">
+					<u-form-item label="工作单位" :prop="'familyMembers[' + index_family + '].workUnit'"
+								 :rules="[
+               ]">
+						<el-input v-model="inputForm.familyMembers[index_family].workUnit" placeholder="请填写工作单位"     clearable></el-input>
+					</u-form-item>
+				</el-col>
+
+				<el-col :span="24" style="text-align: center">
+					<u-form-item label="" >
+						<el-button style="width: 100%" type="danger" @click="removeRow2(index_family)" plain>删除家庭成员 {{index_family + 1}}</el-button>
+					</u-form-item>
+				</el-col>
+			</el-row>
+
+			<u-form-item label="" >
+				<el-button style="width: 100%" type="primary" @click="addRow3()" plain>新增家庭成员</el-button>
+			</u-form-item>
+				  
+				  
+						  
 			<u-form-item style="margin-top: 20px; text-align: center;">
 				<el-button type="primary" @click="saveForm" style="width: 100%;">
 					<span style="margin: 0 auto;">提交</span>
@@ -254,16 +374,12 @@
 						  }
 					  ],
 					  'mobilePhone': [
-					  {
-							required: true,
-							message: '联系电话不能为空',
-							trigger: ['blur', 'change']
-					  },
 						  {
-							  validator: (rule, value, callback) => this.validatePhone(value, callback),
-							  trigger: ['blur', 'change']
+								required: true,
+								message: '联系电话不能为空',
+								trigger: ['blur', 'change']
 						  }
-					],
+					  ],
 					'idCard': [
 						{
 							validator: (rule, value, callback) => this.isCardId(value, callback),
@@ -323,6 +439,26 @@
 						})
 						this.inputForm.idCard = ''
 					}
+					
+					
+					if (this.isEmpty(this.inputForm.practiceStartDay)) {
+						uni.showToast({
+							title: '实习开始时间不能为空',
+							icon: "none",
+							duration:2000
+						})
+						throw new Error('实习开始时间不能为空')
+					}
+					if (this.isEmpty(this.inputForm.practiceCompleteDay)) {
+						uni.showToast({
+							title: '实习结束时间不能为空',
+							icon: "none",
+							duration:2000
+						})
+						throw new Error('实习结束时间不能为空')
+					}
+					
+					
 					if (this.isEmpty(this.inputForm.familyMembers)) {
 						uni.showToast({
 							title: '请至少填写一条家庭成员信息',
@@ -331,14 +467,15 @@
 						})
 						throw new Error('请至少填写一条家庭成员信息')
 					} else {
+						console.log(this.inputForm.familyMembers)
 						this.inputForm.familyMembers.forEach((item, index) => {
 							if (this.isEmpty(item.callName)) {
 								uni.showToast({
-									title: '家庭成员明细中第' + (index + 1) + '条数据的 “称呼” 不能为空',
+									title: '家庭成员明细中第' + (index + 1) + '条数据的 “关系” 不能为空',
 									icon: "none",
 									duration:2000
 								})
-								throw new Error('家庭成员明细中第' + (index + 1) + '条数据的 “称呼” 不能为空')
+								throw new Error('家庭成员明细中第' + (index + 1) + '条数据的 “关系” 不能为空')
 							}
 							if (this.isEmpty(item.name)) {
 								uni.showToast({
@@ -378,10 +515,14 @@
 						experience.startTime = this.formatDate(experience.startTime);
 						experience.endTime = this.formatDate(experience.endTime);
 					});
-
+					
+					if(this.inputForm.practiceStartDay){
 					this.inputForm.practiceStartDay = this.formatDate(this.inputForm.practiceStartDay)
+					}
+					if(this.inputForm.practiceCompleteDay){
 					this.inputForm.practiceCompleteDay = this.formatDate(this.inputForm.practiceCompleteDay)
-
+					}
+					console.log(this.inputForm)
 					registerService.save(this.inputForm).then((data) => {
 						// 接口调用成功，隐藏加载动画
 						uni.hideLoading();
@@ -405,6 +546,11 @@
 			      // 点击新增按钮时，向表格中添加一行空数据
 			      this.inputForm.familyMembers.push({ startTime: '', endTime: '' });
 			    },
+			addRow3() {
+			      // 点击新增按钮时，向表格中添加一行空数据
+			      this.inputForm.familyMembers.push({ startTime: '', endTime: '' });
+			    },
+
 			removeRow2(index) {
 			  // 点击删除按钮时，从表格中移除指定行
 			  // this.tableData.splice(index, 1);