no message

@@ -28,7 +28,7 @@
             <div class="leftboderTT">{{ language == 0 ? '预约信息' : 'Reservation information' }}</div>
             <div class="border-rr mt20 pd20">
               <el-form :model="form" :label-width="language == 0 ?'100':'160'" :rules="rules" ref="formRef">
-                <el-form-item :label="language==0?'入住日期':'Check-in date'" required>
+                <el-form-item :label="language==0?'入住日期':'Check-in&Check-out'" required>
 
                   <el-date-picker @change="getDaysBetween"
                                   v-model="rzRange"

@@ -121,7 +121,11 @@ function addMember() {
     groupId: groupId.value
   }
   if(language.value==1){
+    if(group.type == '4'){
+      proxy.$refs['dialogAddWDSF'].open(params)
+    } else {
       proxy.$refs['dialogAddCoachEn'].open(params)
+    }
   } else {
     proxy.$refs['dialogAddCoach'].open(params)
   }
@@ -161,7 +165,7 @@ function editCoach(row,title) {
   }
   if(row.label=='0'&&row.wdsfMin){
       proxy.$refs['dialogAddWDSF'].open(params)
-  } else if(row.idcType == '0'){
+  } else if(row.idcType == '0'||group.type!='4'){
     proxy.$refs['dialogAddCoach'].open(params)
   } else {
     proxy.$refs['dialogAddCoachEn'].open(params)

@@ -96,7 +96,8 @@
 
           <div class="content" v-if="activeName==8">
             <label>点击下载：</label>
-            <a target="_blank" class="text-primary"  href="/file/COMPETITION_GUIDE_0511V1.pdf">
+<!--            <a target="_blank" class="text-primary"  href="/file/COMPETITION_GUIDE_0511V1.pdf">-->
+              <a @click="showBuilding" class="text-primary">
               <el-icon style="position: relative;top: 2px"><download/></el-icon>
               2024 WDSF亚洲体育舞蹈节参赛指南
             </a>
@@ -199,7 +200,8 @@
           <div class="content" v-if="activeName==71"><el-empty description="no data"></el-empty></div>
           <div class="content" v-if="activeName==8">
             <label>Download：</label>
-            <a target="_blank" class="text-primary" href="/file/COMPETITION_GUIDE_0511V1.pdf">
+<!--            <a target="_blank" class="text-primary" href="/file/COMPETITION_GUIDE_0511V1.pdf">-->
+            <a @click="showBuilding" class="text-primary">
               <el-icon style="position: relative;top: 2px"><download/></el-icon>
              2024 WDSF ASIAN DANCESPORT FESTIVAL COMPETITION GUIDE
             </a>

@@ -145,14 +145,6 @@
               {{ language == 0 ? '预览报名信息' : 'Preview Registration Information' }}
             </el-button>
           </div>
-<!--          <div class="text-center mt20">-->
-<!--            <el-button type="primary" class="" plain round @click="submitForm(0)">-->
-<!--              {{ language == 0 ? '保存暂不提交审核' : 'Save, Do Not Submit for Review Yet' }}-->
-<!--            </el-button>-->
-<!--            <el-button type="primary" class="btn-lineG w200px" round @click="submitForm(1)">-->
-<!--              {{ language == 0 ? '提交审核' : 'Submit for review' }}-->
-<!--            </el-button>-->
-<!--          </div>-->
         </div>
       </el-card>
     </div>
@@ -168,7 +160,7 @@
 <script setup>
 import {ref, reactive, toRefs} from 'vue'
 import * as match from '@/apiPc/match'
-import {getCurrentInstance, onMounted} from '@vue/runtime-core'
+import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
 import DialogEditWdsf from './components/addWdsf'
 import DialogEditAccompany from './components/addAccompany'
 import AddCoachEn from './components/addCoach_en'
@@ -213,11 +205,9 @@ const data = reactive({
   extraTableHead: [],
   activeTeam: '',
   names: {},
-  choosedchoosed: [],
-  mateChosed: [],
   projectIds: [],
   projectList: [],
-  choosed2List: [], projectQuery: {}, tableType: 1,
+  athletesList: [], projectQuery: {}, tableType: 1,
   isNational:true,
   cantBao: {
     flag: false,
@@ -236,12 +226,11 @@ const {
   coachOrLeaderFlag,
   noPhotoCanSign,
   projectIds,
-  mateChosed,
   activeStep,
   projectList,
   loadingProject,
   projectQuery,
-  tableType,cantBao
+  tableType,cantBao,athletesList
 } = toRefs(data)
 const matchId = ref(route.query.matchId)
 let signInfoType = null
@@ -249,7 +238,6 @@ const form = ref({})
 const showPersonList = ref(false)
 const signEndTime = ref('')
 const userId = ref('')
-const myId = ref('')
 onMounted(() => {
   if (useUserStore().user) {
     userId.value = useUserStore().user.userId
@@ -257,6 +245,7 @@ onMounted(() => {
   getSignInfoList()
   getMatch(matchId.value)
   getMyInfo()
+  // getAthletesList()
   getMyMemberTable()
   getMySignInfo()
 })
@@ -275,13 +264,27 @@ function getMyInfo() {
     } else {
       choosedList.value = [form.value]
     }
-    myId.value = res.data.id
     getProjectList()
   }).catch(err => {
     router.push({name: 'home'})
   })
 }
-
+const getAthletesList = () => {
+  getPerPersonList({label:'0',},userId.value).then(res => {
+    athletesList.value = res.rows
+    if(res.total <= 2){
+      choosedList.value = athletesList.value
+      for (var a of choosedList.value){
+        if(!a.passportUrl){
+          cantBao.value.flag = true
+          cantBao.value.name = a.realName
+        } else {
+          cantBao.value.flag = false
+        }
+      }
+    }
+  })
+}
 function getMyMemberTable() {
   match.getPerPersonList({cptId: matchId.value, searchLabels: '1,2,3,4,5,6'}, userId.value).then(res => {
     myMemberTable.value = res.rows
@@ -302,6 +305,7 @@ function addAccompany() {
 function changeMeDone(mateId) {
   console.log(mateId)
   // getMyInfo()
+  getAthletesList()
   getProjectList()
 }
 
@@ -404,22 +408,6 @@ function submitForm(n) {
       commit()
     })
   }
-  // if (n == 0) {
-  //   ElMessageBox.confirm(language.value==0?`您当前的操作为暂存，并不是提交审核，
-  //     必须在报名截止时间${signEndTime.value}之前完成提交。
-  //     您也可以在个人中心-我的报名中，找到这条报名，点击提交审核。`:
-  //           `Your current operation is temporary and not submitted for review,
-  //           Submission must be completed before the registration deadline${signEndTime.value}。
-  //           You can also find this registration in the My Registration section of your personal center and click submit for review.`,
-  //       language.value == 0 ? '提示' : 'Tip', {
-  //         confirmButtonText: language.value == 0 ? '去个人中心' : 'Go My Registration ',
-  //         cancelButtonText: language.value == 0 ? '知道了' : 'OK',
-  //         type: 'warning'
-  //       }).then((res) => {
-  //     console.log(res)
-  //     router.push({name: 'myMatch'})
-  //   })
-  // }
 }
 
 function commit() {
@@ -514,7 +502,7 @@ function delperson(p) {
     match.delPerson(p.id).then(res => {
       ElMessage.success(msg)
       getMyMemberTable()
-      getMyInfo()
+      // getMyInfo()
     })
   })
 }
@@ -607,7 +595,7 @@ function editPerson() {
 
 function editMate(obj) {
   proxy.$refs['dialogEditWdsfRef'].open({
-    title: language.value == 0 ? '编辑舞伴' : 'Edit My Mate',
+    title: language.value == 0 ? '编辑' : 'Edit',
     isMe: false,
     form: obj || {},
     cptId:matchId.value,
@@ -615,24 +603,6 @@ function editMate(obj) {
   })
 }
 
-function changeMate(e) {
-  console.log(e, mateChosed.value,form.value.danceMate.passportUrl)
-  if(form.value.danceMate.passportUrl==''||!form.value.danceMate.passportUrl){
-    mateChosed.value = []
-    ElMessageBox.confirm(language.value == 0 ? '请先上传舞伴的有效证件' : 'Please upload the valid certificate of the teammate',
-        language.value == 0 ? '提示' : 'Tip',
-        {
-          confirmButtonText: language.value == 0 ? '确定' : 'Yes',
-          cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
-        }).then(()=>{
-          editMate(form.value.danceMate)
-          return
-       }).catch(()=>{
-          return
-    })
-  }
-  getProjectList()
-}
 
 function switchTabletype() {
   if (tableType.value == 0) {

@@ -24,8 +24,8 @@
                 <div style="margin: 0 4px 10px;display: flex">
                   <el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable
                              @change="changechoosed">
-                    <el-option v-for="c in athletesList" :key="c.id" :label="c.realName" :value="c.id">
-                      <div class="flexOption">
+                    <el-option v-for="c in athletesList" :key="c.id" :label="c.realName" :value="c.id"  :disabled="c.disabled">
+                      <div class="flexOption" style="width: 100%">
                         {{ c.realName }}
                         <img v-if="c.sex=='0'" src="@/assets/img/female.png"/>
                         <img v-if="c.sex=='1'" src="@/assets/img/male.png"/>
@@ -33,7 +33,8 @@
                         {{c.representing}}
                          {{c.ageGroup}}
                          {{c.division}}
-
+<!--                        @click="editPerson(c.id)"-->
+                          <span v-if="c.disabled" class="text-danger po-right">需补全信息</span>
                         <!--                        -{{ c.age }}-->
                       </div>
                     </el-option>
@@ -284,6 +285,15 @@ function getAthletesList() {
   // athletesList.value
   match.getGroupPersonList({label: '0'}, groupId.value).then(res => {
     athletesList.value = res.rows
+    if(!isNational.value){
+      for(let ath of athletesList.value){
+        if(!ath.picUrl||!ath.phone){
+          ath.disabled = true
+        } else {
+          ath.disabled = false
+        }
+      }
+    }
   })
 }
 
@@ -857,4 +867,5 @@ watch(choosedchoosed, (newVal, oldVal) => {
   --el-input-icon-color:var(--el-color-primary);
 }
 :deep(.el-select__tags-text){color: #000;font-size: 14px;}
+.po-right{position: absolute;right: 0;}
 </style>

@@ -18,8 +18,8 @@
             <span v-if="form.wdsfMin">{{form.wdsfMin}}</span>
             <el-input v-else v-model="form.wdsfMin" type="number"/>
           </el-form-item>
-          <el-form-item :label="language==0?'姓名':'Name'" prop="realName" :disabled="editgay&&form.idcType=='0'" required>
-            <el-input v-model="form.realName"/>
+          <el-form-item :label="language==0?'姓名':'Name'" prop="realName"  required>
+            <el-input v-model="form.realName" :disabled="editgay&&form.idcType=='0'"/>
           </el-form-item>
           <el-form-item :label="language==0?'证件类型':'ID type'" prop="idcType" required>
             <el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay&&form.idcType=='0'">

@@ -72,7 +72,10 @@
       <!--      </el-table-column>-->
       <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)">
+          <el-button link v-if="!isNational&&(!scope.row.picUrl||!scope.row.phone)" type="danger" @click="editPerson(scope.row)">
+            {{language==0?'完善信息':'Complete'}}
+          </el-button>
+          <el-button link v-else type="primary" @click="editPerson(scope.row)">
             {{language==0?'编辑':'Edit'}}
           </el-button>
           <el-button link  type="primary" @click="delperson(scope.row)">

@@ -64,6 +64,12 @@ function submit(res) {
     if(res.data.noRealNameColumn.length>0){
       proxy.$modal.msgError(`${res.data.noRealNameColumn}${language.value == 0? '实名未通过' : 'No real name'}`)
     }
+    if(res.data.noExistColumn.length>0){
+      proxy.$modal.msgError(`${res.data.noExistColumn}${language.value == 0? 'WDSF会员号不存在' : 'WDSF MIN does not exist'}`)
+    }
+    if(res.data.alreadyUseColumn.length>0){
+      proxy.$modal.msgError(`${res.data.alreadyUseColumn}${language.value == 0? 'WDSF会员号已录入' : 'WDSF MIN has been entered'}`)
+    }
 
     if(res.data.errIdcTypeColumn.length==0&&res.data.errSexColumn.length==0&&
         res.data.incompleteColumn.length==0&&res.data.repeatInFileColumn.length==0&&