Merge branch 'devCop' into dev

# Conflicts:
#	vite.config.js

@@ -296,7 +296,7 @@ const data = reactive({
   projectQuery: {}, tableType: 1,
   projectQuery: {}, tableType: 1,
   currProjectId: '',
   currProjectId: '',
   openTour: false,
   openTour: false,
-  isNational: false,
+  isNational: false, // 是否为国际赛
   languageSource: '', singlePersonEntryLimit: '', doublePersonEntryLimit: ''
   languageSource: '', singlePersonEntryLimit: '', doublePersonEntryLimit: ''
 })
 })
 const {
 const {
@@ -349,15 +349,16 @@ function getAthletesList() {
   match.getGroupPersonList({ label: '0' }, groupId.value).then(res => {
   match.getGroupPersonList({ label: '0' }, groupId.value).then(res => {
     athletesList.value = res.rows
     athletesList.value = res.rows
     
     
-    if (!isNational.value) {
     for (const ath of athletesList.value) {
     for (const ath of athletesList.value) {
-        if (isNational.value && !ath.phone) {
-          ath.disabled = true
-        } else {
+      if (!isNational.value) {
         ath.disabled = false
         ath.disabled = false
+        ath.ocrFlag = 1
       }
       }
-      }
-      console.log(athletesList.value)
+      // if (isNational.value && !ath.phone) {
+      //   ath.disabled = true
+      // } else {
+      //   ath.disabled = false
+      // }
     }
     }
   })
   })
 }
 }
@@ -525,6 +526,7 @@ function chooseSportman() {
 }
 }
 
 
 function handelOption(id) {
 function handelOption(id) {
+  if (isNational.value) {
     const flag = choosedchoosed.value.some(v => v == id)
     const flag = choosedchoosed.value.some(v => v == id)
     if (flag) {
     if (flag) {
       const ocr = athletesList.value.find(v => v.id === id) || {}
       const ocr = athletesList.value.find(v => v.id === id) || {}
@@ -536,7 +538,7 @@ function handelOption(id) {
             : 'You can  complete athletes details through [Athlete Manage')
             : 'You can  complete athletes details through [Athlete Manage')
       }
       }
     }
     }
-  
+  }
   getProjectList()
   getProjectList()
 }
 }
 
 

@@ -97,7 +97,7 @@
       <el-table-column :label="language==0?'操作':'Actions'" align="center" fixed="right" width="180">
       <el-table-column :label="language==0?'操作':'Actions'" align="center" fixed="right" width="180">
         <template #default="scope">
         <template #default="scope">
           <el-button
           <el-button
-            v-if="(!isNational&&(!scope.row.phone))||scope.row.ocrFlag=='0'" link type="danger"
+            v-if="isNational&&scope.row.ocrFlag=='0'" link type="danger"
             @click="editPerson(scope.row)"
             @click="editPerson(scope.row)"
           >
           >
             {{ language == 0 ? '完善信息' : 'Complete' }}
             {{ language == 0 ? '完善信息' : 'Complete' }}
@@ -159,7 +159,7 @@ const data = reactive({
   title: '选择运动员',
   title: '选择运动员',
   noPhotoCanSign: 0,
   noPhotoCanSign: 0,
   total: 0,
   total: 0,
-  isNational: false
+  isNational: false// 是否国际赛
 })
 })
 const { query, tableData, show, title, loading, noPhotoCanSign, total, isNational } = toRefs(data)
 const { query, tableData, show, title, loading, noPhotoCanSign, total, isNational } = toRefs(data)
 const certificates = ref([
 const certificates = ref([