Merge branch 'dev' into order

@@ -313,7 +313,7 @@ function checkCard() {
       form.value.representing = res.data.representing
       form.value.representing = res.data.representing
       form.value.ageGroup = res.data.ageGroup
       form.value.ageGroup = res.data.ageGroup
       form.value.division = res.data.division
       form.value.division = res.data.division
-      form.value.status = res.data.status
+      form.value.wdsfStatus = res.data.status
       if (!form.value.sex) {
       if (!form.value.sex) {
         form.value.sex = '0'
         form.value.sex = '0'
       }
       }
@@ -346,7 +346,7 @@ function checkCode() {
 }
 }
 
 
 function changeCountry() {
 function changeCountry() {
-  if(  form.value.countryId = 240 ){
+  if( form.value.countryId == 240 ){
     form.value.idcType = '0'
     form.value.idcType = '0'
   }
   }
 }
 }

@@ -305,7 +305,7 @@ function codeSuccess(msg) {
     form.value = res.data
     form.value = res.data
     form.value.xing = form.value.surname
     form.value.xing = form.value.surname
     form.value.ming = form.value.name
     form.value.ming = form.value.name
-    form.value.wdsfStatus = form.value.status
+    form.value.wdsfStatus = res.data.status
     if (!form.value.sex) {
     if (!form.value.sex) {
       form.value.sex = '0'
       form.value.sex = '0'
     }
     }

@@ -29,7 +29,7 @@
                     <el-option v-for="item in countryList" :key="item.id" :label="item.noc||item.enName" :value="item.id"/>
                     <el-option v-for="item in countryList" :key="item.id" :label="item.noc||item.enName" :value="item.id"/>
                   </el-select>
                   </el-select>
                 </el-form-item>
                 </el-form-item>
-                <el-form-item v-if="form.type!='4'" :label="language==0?'参赛队名称':'Name of participating team'" required prop="abreviations">
+                <el-form-item v-if="form.type!='4'" :label="language==0?'参赛队名称':'Name of participating team'" required>
                   <el-input type="text" v-model="form.abreviations" :placeholder="language==0?'请输入内容':''"/>
                   <el-input type="text" v-model="form.abreviations" :placeholder="language==0?'请输入内容':''"/>
                 </el-form-item>
                 </el-form-item>
 <!--                <el-form-item v-if="form.type!='4'" :label="language==0?'团体名称':'Team Name'" prop="name" required>-->
 <!--                <el-form-item v-if="form.type!='4'" :label="language==0?'团体名称':'Team Name'" prop="name" required>-->
@@ -270,6 +270,10 @@ function goPrev() {
 function submitForm() {
 function submitForm() {
   proxy.$refs['ruleFormRef'].validate((valid, fields) => {
   proxy.$refs['ruleFormRef'].validate((valid, fields) => {
     if (valid) {
     if (valid) {
+      if(form.value.type!='4'&&(form.value.abreviations=='')){
+        ElMessage.warning(language.value==0?`请输入参赛队名称`:`Please complete Name of participating team`)
+        return
+      }
       console.log(form.value)
       console.log(form.value)
       for (const n of participantsInfoArr.value) {
       for (const n of participantsInfoArr.value) {
         if (n.status == 0 && (!n.value && (!n.fixWxFile||n.fixWxFile.length==0))) {
         if (n.status == 0 && (!n.value && (!n.fixWxFile||n.fixWxFile.length==0))) {