no message

杨炀
Showing 4 changed files with 56 additions and 27 deletions
src/viewsPc/center/myMember.vue
src/viewsPc/match/chooseCoach.vue
src/viewsPc/match/components/addCoach_en.vue
src/viewsPc/match/components/personTable.vue
--- a/src/viewsPc/center/myMember.vue
View file @f3b3387
+++ b/src/viewsPc/center/myMember.vue
View file @f3b3387
@@ -49,11 +49,14 @@
  <!--    添加人员-->
  <addCoach ref="dialogAddCoach" @submitForm="getList"/>
+  <add-coach-en ref="dialogAddCoachEn" @submitForm="getList"/>
+  <add-wdsf ref="dialogAddWDSF" @submitForm="getList"/>
  <Import ref="dialogImportProps" @submitForm="getList"/>
 </template>
 <script setup>
-import addCoach from '../match/components/addCoach'
+import AddCoachEn from '../match/components/addCoach_en'
+import AddCoach from '../match/components/addCoach'
 import personTable from '../match/components/personTable'
 import Import from '../match/components/import'
 import {ref, watch} from 'vue'
@@ -68,6 +71,7 @@ import {getGroupPersonList, getPerPersonList} from "@/apiPc/match";
 import PersonTable from "@/viewsPc/match/components/personTable";
 import useUserStore from "@/store/modules/user";
 import {useStorage} from "@vueuse/core/index";
+import AddWdsf from "@/viewsPc/match/components/addWdsf";
 const language= useStorage('language',0)
 const tableData = ref([])
 const labelArr = ref([])
@@ -116,7 +120,7 @@ function addMember() {
    id: 0,
    groupId: groupId.value
  }
-  proxy.$refs['dialogAddCoach'].open(params)
+  proxy.$refs['dialogAddCoachEn'].open(params)
 }
 function importSportman() {
@@ -150,7 +154,11 @@ function editCoach(row,title) {
    groupId: row.groupId,
    title: title
  }
-  proxy.$refs['dialogAddCoach'].open(params)
+  if(row.label=='0'&&row.wdsfMin){
+      proxy.$refs['dialogAddWDSF'].open(params)
+  } else {
+    proxy.$refs['dialogAddCoachEn'].open(params)
+  }
 }
 function delperson(p) {
--- a/src/viewsPc/match/chooseCoach.vue
View file @f3b3387
+++ b/src/viewsPc/match/chooseCoach.vue
View file @f3b3387
@@ -387,7 +387,7 @@ function editPerson(id) {
    groupId: groupId.value || 0
  }
  if(language.value==0){
-    proxy.$refs['dialogAddCoachRef'].open(obj)
+    proxy.$refs['dialogAddCoachRef_En'].open(obj)
  }else {
    proxy.$refs['dialogAddCoachRef_En'].open(obj)
  }
--- a/src/viewsPc/match/components/addCoach_en.vue
View file @f3b3387
+++ b/src/viewsPc/match/components/addCoach_en.vue
View file @f3b3387
@@ -32,13 +32,13 @@
            <el-input v-model="form.ming" :disabled="editDis"/>
          </el-form-item>
          <el-form-item :label="language==0?'性别':'Gender'" prop="sex">
-            <el-radio-group v-model="form.sex" :disabled="form.idcType=='0'">
+            <el-radio-group v-model="form.sex">
              <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio>
              <el-radio value="1">{{ language == 0 ? '男' : 'male' }}</el-radio>
            </el-radio-group>
          </el-form-item>
          <el-form-item :label="language==0?'所属国家/地区':'Nationality'" prop="countryId" required>
-            <el-select filterable v-model="form.countryId" style="width: 100%;">
+            <el-select filterable v-model="form.countryId" style="width: 100%;" @change="changeCountry">
              <el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName"
                         :value="item.id"/>
            </el-select>
@@ -67,11 +67,10 @@
                :is-show-tip="false"
            />
          </el-form-item>
-          <el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode">
-            <el-input v-model="form.idcCode" :disabled="editgay"/>
+          <el-form-item :label="language==0?'证件类型':'ID Type'" prop="idcType"
-          </el-form-item>
+                        :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1">
-          <el-form-item :label="language==0?'证件类型':'ID Type'" prop="idcType">
+            <el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay&&form.idcType!=''">
-            <el-select v-model="form.idcType" style="width: 100%;" :disabled="editgay">
              <el-option
                  v-for="item in certificates"
                  :key="item.value"
@@ -80,13 +79,18 @@
              />
            </el-select>
          </el-form-item>
-<!--          <el-form-item :label="language==0?'出生日期':'Birth'" prop="birth">-->
+          <el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode"
-<!--            <el-date-picker-->
+                        :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1">
-<!--                v-model="form.birth" :disabled="form.idcType=='0'"-->
+            <el-input v-model="form.idcCode" :disabled="editgay&&form.idcCode!=''" @blur="giveBirthDay"/>
-<!--                style="width: 100%;"-->
+          </el-form-item>
-<!--                type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"-->
+          <el-form-item :label="language==0?'出生日期':'Birth'" prop="birth"
-<!--            />-->
+                        :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1">
-<!--          </el-form-item>-->
+            <el-date-picker
+                v-model="form.birth" :disabled="form.idcType=='0'"
+                style="width: 100%;"
+                type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
          <el-form-item :label="language==0?'手机号码':'Phone'" prop="phone">
            <el-input v-model="form.phone" type="number"/>
@@ -133,10 +137,11 @@ import {checkWdsf, getCaptchaSms} from "@/apiPc/match";
 const language = useStorage('language', 0)
 const certificates = ref([
-  // {
+  {
-  //   value: '0',
+    value: '0',
-  //   label: language.value == 0 ? '居民身份证' : 'Resident ID card'
+    disabled: language.value == 0 ? false : true,
-  // },
+    label: language.value == 0 ? '居民身份证' : 'Resident ID card'
+  },
  {
    value: '1',
    label: language.value == 0 ? '护照' : 'Passport'
@@ -150,7 +155,7 @@ const {proxy} = getCurrentInstance()
 const emit = defineEmits(['submitForm'])
 const data = reactive({
  form: {
-    // countryId: 240
+    // countryId: 240,
    sex: '0'
  },
  rules: {
@@ -185,7 +190,7 @@ const data = reactive({
  countryList: [],
  regionsList: [],
  labels: [
-    // {value: '0', label: '运动员', enlabel: 'Athletes'},
+    {value: '0', label: '运动员', enlabel: 'Athletes'},
    {value: '1', label: '教练', enlabel: 'Coach'},
    {value: '2', label: '领队', enlabel: 'Leader'},
    {value: '4', label: '队医', enlabel: 'Nurse'},
@@ -306,6 +311,9 @@ function checkCard() {
      form.value.xing = res.data.surname
      form.value.ming = res.data.name
      form.value.representing = res.data.representing
+      form.value.ageGroup = res.data.ageGroup
+      form.value.division = res.data.division
+      form.value.status = res.data.status
      if (!form.value.sex) {
        form.value.sex = '0'
      }
@@ -337,7 +345,11 @@ function checkCode() {
  }
 }
+function changeCountry() {
+  if(  form.value.countryId = 240 ){
+    form.value.idcType = '0'
+  }
+}
 function giveBirthDay() {
  // 判断身份证正确性/赋值生日
  if (form.value.idcType == '0') {
--- a/src/viewsPc/match/components/personTable.vue
View file @f3b3387
+++ b/src/viewsPc/match/components/personTable.vue
View file @f3b3387
@@ -4,11 +4,20 @@
    <el-table-column type="index" :label="language==0?'序号':'Index'" width="80" align="center"/>
    <el-table-column :label="language==0?'姓氏':'Surname'" prop="xing" min-width="100"/>
    <el-table-column :label="language==0?'名':'Name'" prop="ming" min-width="100"/>
-    <el-table-column :label="language==0?'所属国家/地区':'Nationality'" prop="countryName" min-width="100"/>
+    <el-table-column :label="language==0?'所属国家/地区':'Nationality'" prop="countryName" min-width="110"/>
    <el-table-column :label="language==0?'性别':'Gender'" prop="sexStr"/>
    <!--    <el-table-column :label="language==0?'年龄':'Age'" prop="age"/>-->
    <el-table-column :label="language==0?'证件类型':'ID Type'" prop="idcTypeStr" :min-width="language==0?'80':'160'"/>
-    <el-table-column :label="language==0?'证件号码':'ID NO.'" prop="idcCode" width="200"/>
+    <el-table-column :label="language==0?'证件号码':'ID NO.'" prop="idcCode" width="200">
+      <template #default="scope">
+        <span v-if="scope.row.wdsfMin"></span>
+        <span v-else>{{ scope.row.idcCode }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column  align="center"  :label="language==0?'代表':'Representing'" prop="representing" min-width="120"/>
+    <el-table-column align="center" :label="language==0?'年龄组':'Age group'" prop="ageGroup" min-width="100"/>
+    <el-table-column align="center" :label="language==0?'舞种':'Division'" prop="division" min-width="100"/>
    <el-table-column :label="language==0?'出生日期':'Birth'" prop="birth" width="110"/>
    <el-table-column :label="language==0?'会员角色':'Role'" width="150">
      <template #default="scope">