c8d99923 by 杨炀

Revert "no message"

This reverts commit d9d99119.
1 parent d9d99119
...@@ -290,7 +290,7 @@ function getAthletesList() { ...@@ -290,7 +290,7 @@ function getAthletesList() {
290 athletesList.value = res.rows 290 athletesList.value = res.rows
291 if(!isNational.value){ 291 if(!isNational.value){
292 for(let ath of athletesList.value){ 292 for(let ath of athletesList.value){
293 if(!ath.phone){ 293 if(!ath.picUrl||!ath.phone){
294 ath.disabled = true 294 ath.disabled = true
295 } else { 295 } else {
296 ath.disabled = false 296 ath.disabled = false
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
7 <el-form ref="dialogRef" :model="form" :rules="language==0?rules:rules_cn" label-width="150px" inline> 7 <el-form ref="dialogRef" :model="form" :rules="language==0?rules:rules_cn" label-width="150px" inline>
8 <el-row :gutter="30" class="mt30"> 8 <el-row :gutter="30" class="mt30">
9 <el-col :lg="12" class="touxiang"> 9 <el-col :lg="12" class="touxiang">
10 <!-- :required="form.labelArr.indexOf('0')>-1"--> 10
11 <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" > 11 <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" :required="form.labelArr.indexOf('0')>-1">
12 <ImageUpload2 12 <ImageUpload2
13 v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1" 13 v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
14 :is-show-tip="false" 14 :is-show-tip="false"
...@@ -304,10 +304,10 @@ function giveBirthDay() { ...@@ -304,10 +304,10 @@ function giveBirthDay() {
304 function submitForm() { 304 function submitForm() {
305 proxy.$refs['dialogRef'].validate((valid) => { 305 proxy.$refs['dialogRef'].validate((valid) => {
306 if (valid) { 306 if (valid) {
307 // if(!form.value.picUrl&&form.value.labelArr.indexOf('0')>-1){ 307 if(!form.value.picUrl&&form.value.labelArr.indexOf('0')>-1){
308 // ElMessage.warning(language.value == 0 ? '请上传个人照片' :'Please upload your photo') 308 ElMessage.warning(language.value == 0 ? '请上传个人照片' :'Please upload your photo')
309 // return 309 return
310 // } 310 }
311 // 验证身份证号 311 // 验证身份证号
312 if (form.value.idcType == 0 && !(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) { 312 if (form.value.idcType == 0 && !(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(form.value.idcCode))) {
313 ElMessage.warning('请输入正确的身份证号码') 313 ElMessage.warning('请输入正确的身份证号码')
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 <!-- </el-table-column>--> 72 <!-- </el-table-column>-->
73 <el-table-column :label="language==0?'操作':'Actions'" width="180" fixed="right" align="center"> 73 <el-table-column :label="language==0?'操作':'Actions'" width="180" fixed="right" align="center">
74 <template #default="scope"> 74 <template #default="scope">
75 <el-button link v-if="!isNational&&(!scope.row.phone)" type="danger" @click="editPerson(scope.row)"> 75 <el-button link v-if="!isNational&&(!scope.row.picUrl||!scope.row.phone)" type="danger" @click="editPerson(scope.row)">
76 {{language==0?'完善信息':'Complete'}} 76 {{language==0?'完善信息':'Complete'}}
77 </el-button> 77 </el-button>
78 <el-button link v-else type="primary" @click="editPerson(scope.row)"> 78 <el-button link v-else type="primary" @click="editPerson(scope.row)">
......
...@@ -278,7 +278,6 @@ function editPerson(row) { ...@@ -278,7 +278,6 @@ function editPerson(row) {
278 278
279 function addMember() { 279 function addMember() {
280 console.log(isNational.value) 280 console.log(isNational.value)
281
282 const params = { 281 const params = {
283 title: language.value == 0 ?'添加人员':'Add', 282 title: language.value == 0 ?'添加人员':'Add',
284 id: 0, 283 id: 0,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!