Merge branch 'release' into dev

src/views/todo/seats/accept/ybAccept.vue

@@ -146,7 +146,7 @@
 									</el-form-item>
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item label="联系电话" prop="contact" :rules="[{ required: true, message: '请填写联系电话', trigger: 'blur' }]">
+									<el-form-item label="联系电话" prop="contact" :rules="[{ required: true, message: '请填写联系电话', trigger: 'blur' },{ required: true, pattern: '[^ \x20]+', trigger: 'blur', message: '联系电话不能为空' }]">
 										<el-row class="w100">
 											<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 												<el-input v-model="state.ruleForm.contact" placeholder="请填写联系电话" @blur="searchHistory" clearable> </el-input>

src/views/todo/seats/accept/zgAccept.vue

@@ -136,7 +136,14 @@
 									</el-form-item>
 								</el-col>-->
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-									<el-form-item label="联系电话" prop="contact" :rules="[{ required: true, message: '请填写联系电话', trigger: 'blur' }]">
+									<el-form-item
+										label="联系电话"
+										prop="contact"
+										:rules="[
+											{ required: true, message: '请填写联系电话', trigger: 'blur' },
+											{ required: true, pattern: '[^ \x20]+', trigger: 'blur', message: '联系电话不能为空' },
+										]"
+									>
 										<el-input v-model="state.ruleForm.contact" placeholder="请填写联系电话" @blur="searchHistory" clearable> </el-input>
 									</el-form-item>
 								</el-col>