国内赛

@@ -20,7 +20,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="language==0?'证件号码':'ID NO.'">
-          <el-input v-model="query.idcode" style="width: 120px;" clearable/>
+          <el-input v-model="query.idcCode" style="width: 120px;" clearable/>
         </el-form-item>
         <el-form-item :label="language==0?'会员角色':'Role'">
           <el-select v-model="labelArr" multiple style="width: 100px;">

@@ -201,7 +201,7 @@
             <label>Download：</label>
             <a target="_blank" class="text-primary" href="/file/COMPETITION_GUIDE_0511V1.pdf">
               <el-icon style="position: relative;top: 2px"><download/></el-icon>
-             2024 WDSF ASIAN DANCESPORT FESTIVAL ENTRY GUIDE
+             2024 WDSF ASIAN DANCESPORT FESTIVAL COMPETITION GUIDE
             </a>
           </div>
         </div>

@@ -32,7 +32,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode" required>
-            <el-input v-model="form.idcCode" @blur="checkCode" :disabled="editgay&&form.idcType=='0'"/>
+            <el-input v-model="form.idcCode" @blur="giveBirthDay" :disabled="editgay&&form.idcType=='0'"/>
           </el-form-item>
           <el-form-item :label="language==0?'有效证件':'Valid Passport'" :required="form.idcType!='0'">
             <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" />
@@ -59,7 +59,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="language==0?'手机号码':'Phone'" prop="phone" required>
-            <el-input v-model="form.phone" type="number"/>
+            <el-input v-model="form.phone" type="text"/>
             <span class="tip">*若未成年人没有手机号，请填写家长号码</span>
           </el-form-item>
 
@@ -257,17 +257,15 @@ function getRegionsList() {
 }
 
 function checkCode() {
-
   if (form.value.idcType=='0' && form.value.idcCode) {
-    // giveBirthDay()
     var obj = {
       idcCode: form.value.idcCode,
       name: form.value.realName
     }
     match.checkIdcCode(obj).then(res => {
       if (res.data) {
-        form.value.birth = res.data.birth
-        form.value.sex = res.data.sex
+        // form.value.birth = res.data.birth
+        // form.value.sex = res.data.sex
       }
     })
   }
@@ -333,11 +331,17 @@ function submitForm() {
       if (groupId.value != 0) {
         // 团队
         form.value.groupId = groupId.value
-        match.savePersonForMyGroup(form.value).then(res => {
-          ElMessage.success(language.value == 0 ?'保存成功':'Save successful')
-          show.value = false
-          emit('submitForm')
-        })
+        if (form.value.idcType=='0' && form.value.idcCode) {
+          var obj = {
+            idcCode: form.value.idcCode,
+            name: form.value.realName
+          }
+          match.checkIdcCode(obj).then(res => {
+            if (res.data) {
+              saveGroupMember()
+            }
+          })
+        }
       } else {
         // 个人账号
         if (editgay.value) {
@@ -366,7 +370,13 @@ function submitForm() {
     }
   })
 }
-
+function saveGroupMember() {
+  match.savePersonForMyGroup(form.value).then(res => {
+    ElMessage.success(language.value == 0 ?'保存成功':'Save successful')
+    show.value = false
+    emit('submitForm')
+  })
+}
 function cancel() {
   show.value = false
 }

@@ -100,7 +100,7 @@
           </el-form-item>
 
           <el-form-item :label="language==0?'手机号码':'Phone'" prop="phone">
-            <el-input v-model="form.phone" type="number"/>
+            <el-input v-model="form.phone"  type="text"/>
           </el-form-item>
 
           <el-form-item :label="language==0?'详细地址':'Address'" prop="address">

@@ -24,7 +24,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="language==0?'证件号码':'ID NO.'" v-if="!isNational">
-          <el-input v-model="query.idcode" style="width: 120px;" clearable/>
+          <el-input v-model="query.idcCode" style="width: 120px;" clearable/>
         </el-form-item>
 <!--        <el-form-item label="角色">-->
 <!--          <el-input v-model="query.label" style="width: 120px;" clearable/>-->
@@ -70,11 +70,14 @@
       <!--          </div>-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <el-table-column :label="language==0?'操作':'Actions'" width="120" fixed="right" align="center">
+      <el-table-column :label="language==0?'操作':'Actions'" width="180" fixed="right" align="center">
         <template #default="scope">
           <el-button link type="primary" @click="editPerson(scope.row)">
             {{language==0?'编辑':'Edit'}}
           </el-button>
+          <el-button link  type="primary" @click="delperson(scope.row)">
+            {{language==0?'删除':'Delete'}}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -108,6 +111,7 @@ import AddCoach from '../components/addCoach'
 import AddWdsf from '../components/addWdsf'
 import Import from '../components/import'
 import {useStorage} from "@vueuse/core/index";
+import {ElMessage, ElMessageBox} from "element-plus";
 const language= useStorage('language',0)
 
 const {proxy} = getCurrentInstance()
@@ -215,7 +219,33 @@ function editPerson(row) {
     proxy.$refs['dialogAddCoach'].open(params)
   }
 }
-
+function delperson(p) {
+  //删除团队下的人
+  let text = ''
+  let t = '提示'
+  let s = '确定'
+  let c = '取消'
+  let msg = '操作成功'
+  if (language.value==0){
+    text = `确定删除${p.realName}吗？`
+  } else {
+    text = `Delete ${p.realName}?`
+    t = 'Tips'
+    s = 'Confirm'
+    c = 'Cancel'
+    msg = ' Successful！'
+  }
+  ElMessageBox.confirm(text, t, {
+    confirmButtonText: s,
+    cancelButtonText: c,
+    type: 'warning'
+  }).then(() => {
+    match.delPerson(p.id).then(res => {
+      ElMessage.success(msg)
+      getList()
+    })
+  })
+}
 function addMember() {
   console.log(isNational.value)
   const params = {

@@ -21,7 +21,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="language==0?'证件号码':'ID NO.'" v-if="!isNational">
-          <el-input v-model="query.idcode" style="width: 120px;" clearable/>
+          <el-input v-model="query.idcCode" style="width: 120px;" clearable/>
         </el-form-item>
 <!--        <el-form-item label="角色">-->
 <!--          <el-input v-model="query.label" style="width: 120px;" clearable/>-->

@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         '/dev-api': {
-          target: 'http://192.168.1.118:8081/',
+          target: 'http://192.168.1.131:8081/',
           // target: 'https://dance.itechtop.cn/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api',
           changeOrigin: true,