国内赛

杨炀
Showing 7 changed files with 59 additions and 19 deletions
src/viewsPc/center/myMember.vue
src/viewsPc/guide/index.vue
src/viewsPc/match/components/addCoach.vue
src/viewsPc/match/components/addCoach_en.vue
src/viewsPc/match/components/allSportsmanList.vue
src/viewsPc/match/components/allSportsmanListForPersonal.vue
vite.config.js
--- a/src/viewsPc/center/myMember.vue
View file @d718563
+++ b/src/viewsPc/center/myMember.vue
View file @d718563
@@ -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;">
--- a/src/viewsPc/guide/index.vue
View file @d718563
+++ b/src/viewsPc/guide/index.vue
View file @d718563
@@ -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>
--- a/src/viewsPc/match/components/addCoach.vue
View file @d718563
+++ b/src/viewsPc/match/components/addCoach.vue
View file @d718563
@@ -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.birth = res.data.birth
-        form.value.sex = res.data.sex
+        // 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 => {
+        if (form.value.idcType=='0' && form.value.idcCode) {
-          ElMessage.success(language.value == 0 ?'保存成功':'Save successful')
+          var obj = {
-          show.value = false
+            idcCode: form.value.idcCode,
-          emit('submitForm')
+            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
 }
--- a/src/viewsPc/match/components/addCoach_en.vue
View file @d718563
+++ b/src/viewsPc/match/components/addCoach_en.vue
View file @d718563
@@ -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">
--- a/src/viewsPc/match/components/allSportsmanList.vue
View file @d718563
+++ b/src/viewsPc/match/components/allSportsmanList.vue
View file @d718563
@@ -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 = {
--- a/src/viewsPc/match/components/allSportsmanListForPersonal.vue
View file @d718563
+++ b/src/viewsPc/match/components/allSportsmanListForPersonal.vue
View file @d718563
@@ -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/>-->
--- a/vite.config.js
View file @d718563
+++ b/vite.config.js
View file @d718563
@@ -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,