Merge branch 'devCop' into dev

zhangmeng
Showing 7 changed files with 54 additions and 46 deletions
src/viewsPc/match/components/addAccompany.vue
src/viewsPc/match/components/addCoach.vue
src/viewsPc/match/components/addCoach_en.vue
src/viewsPc/match/components/addSportman_en.vue
src/viewsPc/match/components/addWdsf.vue
src/viewsPc/match/components/checkOcr.vue
src/viewsPc/register/personal.vue
--- a/src/viewsPc/match/components/addAccompany.vue
View file @cc15a2a
+++ b/src/viewsPc/match/components/addAccompany.vue
View file @cc15a2a
 <template>
  <el-dialog
-      v-model="show" :title="title" width="800px" append-to-body close-icon="CircleClose" center
+    v-model="show" :close-on-click-modal="false" :title="title" append-to-body center
-      :close-on-click-modal="false" class="pcloginpop"
+    class="pcloginpop"
-      destroy-on-close
+    close-icon="CircleClose" destroy-on-close
+    width="800px"
  >
-<!--    随性人员-->
-    <div class="pd10"></div>
+    <!--    随性人员-->
-    <el-form ref="dialogRef" :model="form" :rules="language==0?rules:rules_cn" label-width="160px" inline>
+    <div class="pd10" />
+    <el-form ref="dialogRef" :model="form" :rules="language==0?rules:rules_cn" inline label-width="160px">
      <el-row :gutter="30">
        <el-col :lg="24">
          <el-form-item :label="language==0?'姓氏':'surname'" prop="xing" required>
-            <el-input v-model="form.xing"/>
+            <el-input v-model="form.xing" />
          </el-form-item>
          <el-form-item :label="language==0?'名':'name'" prop="ming" required>
-            <el-input v-model="form.ming"/>
+            <el-input v-model="form.ming" />
          </el-form-item>
          <!--          <el-form-item :label="language==0?'证件类型':'ID type'" prop="idcType" required>-->
          <!--            <el-select v-model="form.idcType" style="width: 100%;">-->
@@ -27,16 +29,16 @@
          <!--            </el-select>-->
          <!--          </el-form-item>-->
          <el-form-item :label="language==0?'护照号':'PassPort Number'" prop="idcCode" required>
-            <el-input v-model="form.idcCode"/>
+            <el-input v-model="form.idcCode" />
          </el-form-item>
          <el-form-item :label="language==0?'护照文件':'Passport File'" required>
-            <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/>
+            <file-upload v-model="form.passportUrl" :button-text="'Upload'" :is-show-tip="false" :limit="1" />
          </el-form-item>
          <el-form-item :label="language==0?'出生日期':'Date of Birth'" prop="birth" required>
            <el-date-picker
              v-model="form.birth"
-                style="width: 100%;"
+              format="YYYY-MM-DD"
-                type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+              style="width: 100%;" type="date" value-format="YYYY-MM-DD"
            />
          </el-form-item>
          <el-form-item :label="language==0?'性别':'sex'" prop="sex">
@@ -48,7 +50,7 @@
          <el-form-item :label="language==0?'主要会员角色':'roles'" prop="labelArr">
            <el-select v-model="form.labelArr" multiple>
-              <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?l.label:l.enlabel"/>
+              <el-option v-for="l in labels" :key="l.value" :label="language==0?l.label:l.enlabel" :value="l.value" />
            </el-select>
          </el-form-item>
@@ -58,7 +60,7 @@
    </el-form>
    <template #footer>
      <div class="dialog-footer text-center">
-        <el-button type="primary" class="btn-lineG w200px" round @click="submitForm">{{
+        <el-button class="btn-lineG w200px" round type="primary" @click="submitForm">{{
          language == 0 ? '确定' : 'Save'
        }}
        </el-button>
@@ -68,16 +70,16 @@
 </template>
 <script setup>
-import {reactive, ref, toRefs, watch} from 'vue'
+import { reactive, ref, toRefs, watch } from 'vue'
-import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
+import { getCurrentInstance, nextTick, onMounted } from '@vue/runtime-core'
 import * as match from '@/apiPc/match'
-import {ElMessage} from 'element-plus'
+import { ElMessage } from 'element-plus'
-import {nationList} from '@/assets/js/data'
+import { nationList } from '@/assets/js/data'
 import _ from 'lodash'
-import cache from "@/plugins/cache";
+import cache from '@/plugins/cache'
-import {useStorage} from "@vueuse/core/index";
+import { useStorage } from '@vueuse/core/index'
-const language= useStorage('language',0)
+const language = useStorage('language', 0)
 const certificates = ref([
  {
    value: '0',
@@ -92,42 +94,42 @@ const certificates = ref([
    label: language.value == 0 ? '其他' : 'Other'
  }
 ])
-const {proxy} = getCurrentInstance()
+const { proxy } = getCurrentInstance()
 const emit = defineEmits(['submitForm'])
 const data = reactive({
  form: {
    idcType: '1',
-    sex:'0'
+    sex: '0'
  },
  rules: {
-    xing: [{required: true, message: '必填', trigger: 'blur'}],
+    xing: [{ required: true, message: '必填', trigger: 'blur' }],
-    ming: [{required: true, message: '必填', trigger: 'blur'}],
+    ming: [{ required: true, message: '必填', trigger: 'blur' }],
-    idcCode: [{required: true, message: '必填', trigger: 'blur'}],
+    idcCode: [{ required: true, message: '必填', trigger: 'blur' }],
-    birth: [{required: true, message: '必填', trigger: 'change'}],
+    birth: [{ required: true, message: '必填', trigger: 'change' }],
-    sex: [{required: true, message: '必填', trigger: 'change'}],
+    sex: [{ required: true, message: '必填', trigger: 'change' }],
-    labelArr: [{required: true, message: '必填', trigger: 'blur'}]
+    labelArr: [{ required: true, message: '必填', trigger: 'blur' }]
  },
  rules_cn: {
-    xing: [{required: true, message: 'required', trigger: 'blur'}],
+    xing: [{ required: true, message: 'required', trigger: 'blur' }],
-    ming: [{required: true, message: 'required', trigger: 'blur'}],
+    ming: [{ required: true, message: 'required', trigger: 'blur' }],
-    idcCode: [{required: true, message: 'required', trigger: 'blur'}],
+    idcCode: [{ required: true, message: 'required', trigger: 'blur' }],
-    birth: [{required: true, message: 'required', trigger: 'change'}],
+    birth: [{ required: true, message: 'required', trigger: 'change' }],
-    address: [{required: true, message: 'required', trigger: 'blur'}],
+    address: [{ required: true, message: 'required', trigger: 'blur' }],
-    sex: [{required: true, message: 'required', trigger: 'change'}],
+    sex: [{ required: true, message: 'required', trigger: 'change' }],
-    labelArr: [{required: true, message: 'required', trigger: 'blur'}]
+    labelArr: [{ required: true, message: 'required', trigger: 'blur' }]
  },
  show: false,
  labels: [
    // {value: '0', label: '运动员', enlabel: 'Athletes'},
-    {value: '1', label: '教练', enlabel: 'Coach'},
+    { value: '1', label: '教练', enlabel: 'Coach' },
-    {value: '2', label: '领队', enlabel: 'Head of team'},
+    { value: '2', label: '领队', enlabel: 'Head of team' },
-    {value: '4', label: '队医', enlabel: 'Team doctor'},
+    { value: '4', label: '队医', enlabel: 'Team doctor' },
-    {value: '5', label: '翻译', enlabel: 'Interpreter'},
+    { value: '5', label: '翻译', enlabel: 'Interpreter' },
-    {value: '6', label: '官员', enlabel: 'Official'},
+    { value: '6', label: '官员', enlabel: 'Official' },
-    {value: '3', label: '其他', enlabel: 'Other'}
+    { value: '3', label: '其他', enlabel: 'Other' }
  ],
  title: 'Add accompanying personnel',
-  cptId:''
+  cptId: ''
 })
 const {
  form,
@@ -157,7 +159,7 @@ const open = (params) => {
    })
  }
 }
-defineExpose({open})
+defineExpose({ open })
 watch(show, (value) => {
  if (!value) {
    form.value = {}
@@ -172,7 +174,7 @@ function submitForm() {
    ElMessage.warning('Please upload  your passport file')
    return
  }
-  if(Array.isArray(form.value.passportUrl)){
+  if (Array.isArray(form.value.passportUrl)) {
    form.value.passportUrl = form.value.passportUrl[0].url
  }
  proxy.$refs['dialogRef'].validate((valid) => {
--- a/src/viewsPc/match/components/addCoach.vue
View file @cc15a2a
+++ b/src/viewsPc/match/components/addCoach.vue
View file @cc15a2a
@@ -420,6 +420,7 @@ function submitForm() {
 }
 function saveGroupMember() {
+  form.value.personId = null
  match.savePersonForMyGroup(form.value).then(res => {
    ElMessage.success(language.value == 0 ? '保存成功' : 'Save successful')
    show.value = false
--- a/src/viewsPc/match/components/addCoach_en.vue
View file @cc15a2a
+++ b/src/viewsPc/match/components/addCoach_en.vue
View file @cc15a2a
@@ -493,6 +493,7 @@ function submitForm() {
        // 团队
        form.value.groupId = groupId.value
        form.value.ocrFlag = '1'
+        form.value.personId = null
        match.savePersonForMyGroup(form.value).then(res => {
          ElMessage.success(language.value == 0 ? '保存成功' : 'Save successful')
          show.value = false
--- a/src/viewsPc/match/components/addSportman_en.vue
View file @cc15a2a
+++ b/src/viewsPc/match/components/addSportman_en.vue
View file @cc15a2a
@@ -375,6 +375,7 @@ function submitForm() {
      if (groupId.value != 0) {
        // 团队
        form.value.groupId = groupId.value
+        form.value.personId = null
        match.savePersonForMyGroup(form.value).then(res => {
          ElMessage.success(language.value == 0 ? '保存成功' : 'Save successful')
          show.value = false
--- a/src/viewsPc/match/components/addWdsf.vue
View file @cc15a2a
+++ b/src/viewsPc/match/components/addWdsf.vue
View file @cc15a2a
@@ -346,6 +346,7 @@ function addPersonal() {
 function addGroupMember() {
  form.value.groupId = groupId
+  form.value.personId = null
  match.savePersonForMyGroup(form.value).then(res => {
    ElMessage.success(language.value == 0 ? '保存成功' : 'Save successful')
    show.value = false
--- a/src/viewsPc/match/components/checkOcr.vue
View file @cc15a2a
+++ b/src/viewsPc/match/components/checkOcr.vue
View file @cc15a2a
--- a/src/viewsPc/register/personal.vue
View file @cc15a2a
+++ b/src/viewsPc/register/personal.vue
View file @cc15a2a
@@ -79,7 +79,9 @@
                    @response="ocrSuccess"
                  />
                  <div class="tip">
-                    <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等</span>
+                    <span
+                      v-if="language==0"
+                    >请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等</span>
                    <span v-else>Please upload a scanned copy of your valid passport for verification of identity information,
                      application of visa invitation letter and purchasing insurance etc.</span>
                  </div>