Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
f8237179 by zhangmeng
Options

国外不购买保险

1 parent 5f4bdea4
Inline Side-by-side
Showing 3 changed files with 119 additions and 82 deletions
src/viewsPc/match/chooseProject.vue
......@@ -171,7 +171,7 @@
{{ language == 0 ? '预览报名信息' : 'Preview Registration Information' }}
</el-button>
<span v-if="insuranceFlag!=0" class="checkbox">
<span v-if="language==0&& insuranceFlag!=0||language==1&&insuranceFlag==1" class="checkbox">
<el-checkbox
v-model="checked"
:label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
......@@ -480,7 +480,7 @@ function submitForm(n) {
}
function commit() {
if (insuranceFlag.value == 2 && checked.value == '0') {
if (language.value == 0 && insuranceFlag.value == 2 && checked.value == '0') {
ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事放帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
language.value == 0 ? '提示' : 'Tip', {
confirmButtonText: language.value == 0 ? '是' : 'Yes',
......
src/viewsPc/match/chooseSportsman.vue
......@@ -182,7 +182,7 @@
{{ language == 0 ? '预览报名信息' : 'Preview registration information' }}
</el-button>
<span v-if="insuranceFlag!=0" class="checkbox">
<span v-if="language==0&& insuranceFlag!=0||language==1&&insuranceFlag==1" class="checkbox">
<el-checkbox
v-model="checked"
:label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
......@@ -436,7 +436,7 @@ function submitForm() {
// cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
type: 'warning'
})
} else if (insuranceFlag.value == '2' && checked.value == 0) {
} else if (language.value == 0 && insuranceFlag.value == '2' && checked.value == 0) {
ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事放帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
language.value == 0 ? '提示' : 'Tip', {
confirmButtonText: language.value == 0 ? '是' : 'Yes',
......
src/viewsPc/match/components/allSportsmanListForPersonal.vue
<template>
<el-dialog v-model="show" :title="title" width="1000px" append-to-body @close="close" center>
<el-dialog
v-model="show" :title="title" append-to-body center width="1000px"
@close="close"
>
<div class="funcBtns">
<el-button type="primary" @click="addMember">
{{ language == 0 ? '添加选手' : 'Add Player' }}
</el-button>
</div>
<div class="from-Card">
<el-form :inline="true" :model="query" class="mt20" label-width="60" size="small">
<el-form-item :label="language==0?'姓名':'Name'">
<el-input v-model="query.realName" style="width: 120px;" clearable/>
<el-input v-model="query.realName" clearable style="width: 120px;" />
</el-form-item>
<el-form-item :label="language==0?'证件类型':'ID Type'" v-if="!isNational">
<el-select v-model="query.idcType" style="width: 100px;" clearable @change="getList" @clear="getList">
<el-form-item v-if="!isNational" :label="language==0?'证件类型':'ID Type'">
<el-select v-model="query.idcType" clearable style="width: 100px;" @change="getList" @clear="getList">
<el-option
v-for="item in certificates"
:key="item.value"
......@@ -20,41 +24,61 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="language==0?'证件号码':'ID NO.'" v-if="!isNational">
<el-input v-model="query.idcCode" style="width: 120px;" clearable/>
<el-form-item v-if="!isNational" :label="language==0?'证件号码':'ID NO.'">
<el-input v-model="query.idcCode" clearable style="width: 120px;" />
</el-form-item>
<!-- <el-form-item label="角色">-->
<!-- <el-input v-model="query.label" style="width: 120px;" clearable/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="角色">-->
<!-- <el-input v-model="query.label" style="width: 120px;" clearable/>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" @click="getList">{{language==0?'查询':'Search'}}</el-button>
<el-button type="primary" @click="getList">{{ language == 0 ? '查询' : 'Search' }}</el-button>
</el-form-item>
<el-form-item class="fr">
<el-button @click="resetChose" type="primary" plain>{{language==0?'清空选择':'Clear Selection'}}</el-button>
<el-button plain type="primary" @click="resetChose">{{ language == 0 ? '清空选择' : 'Clear Selection' }}
</el-button>
</el-form-item>
</el-form>
</div>
<p class="tip" v-if="language==0">报名单人项目只需选中需要报名的人员</p>
<p class="tip" v-if="language==1">To register for the individual project, simply select the person who needs to register</p>
<p v-if="language==0" class="tip">报名单人项目只需选中需要报名的人员</p>
<p v-if="language==1" class="tip">To register for the individual project, simply select the person who needs to
register</p>
<p v-if="noPhotoCanSign == 0" class="text-danger">{{ language==0?'*需上传照片才可报名':'*Please upload photo before sign up' }}</p>
<el-table ref="allSportmenTable" v-loading="loading" :data="tableData" height="60vh"
@selection-change="handleSelectionChange" :row-key="getRowKeys">
<el-table-column type="selection" :label="language==0?'选择':'Selection'" :reserve-selection="true" :selectable="selectable"/>
<!-- <el-table-column align="center" type="index" :label="language==0?'序号':'Index'" width="60" :selectable="selectable"/>-->
<el-table-column v-if="isNational" :label="language==0?'WDSF MIN':'WDSF MIN'" prop="wdsfMin" width="100"/>
<el-table-column align="center" :label="language==0?'姓氏':'Surname'" prop="xing" min-width="100"/>
<el-table-column align="center" :label="language==0?'名':'Name'" prop="ming" min-width="100"/>
<el-table-column align="center" v-if="isNational" :label="language==0?'代表':'Representing'" prop="representing" min-width="120"/>
<el-table-column align="center" v-if="!isNational" :label="language==0?'所属国家/地区':'Nationality'" prop="countryName" min-width="110"/>
<el-table-column :label="language==0?'性别':'Gender'" align="center" prop="sexStr"/>
<el-table-column align="center" v-if="isNational" :label="language==0?'年龄组':'Age group'" prop="ageGroup" min-width="100"/>
<el-table-column align="center" v-if="isNational" :label="language==0?'舞种':'Division'" prop="division" min-width="100"/>
<p v-if="noPhotoCanSign == 0" class="text-danger">
{{ language == 0 ? '*需上传照片才可报名' : '*Please upload photo before sign up' }}</p>
<el-table
ref="allSportmenTable" v-loading="loading" :data="tableData" :row-key="getRowKeys"
height="60vh" @selection-change="handleSelectionChange"
>
<el-table-column
:label="language==0?'选择':'Selection'" :reserve-selection="true" :selectable="selectable"
type="selection"
/>
<!-- <el-table-column align="center" type="index" :label="language==0?'序号':'Index'" width="60" :selectable="selectable"/>-->
<el-table-column v-if="isNational" :label="language==0?'WDSF MIN':'WDSF MIN'" prop="wdsfMin" width="100" />
<el-table-column :label="language==0?'姓氏':'Surname'" align="center" min-width="100" prop="xing" />
<el-table-column :label="language==0?'名':'Name'" align="center" min-width="100" prop="ming" />
<el-table-column
v-if="isNational" :label="language==0?'代表':'Representing'" align="center" min-width="120"
prop="representing"
/>
<el-table-column
v-if="!isNational" :label="language==0?'所属国家/地区':'Nationality'" align="center"
min-width="110" prop="countryName"
/>
<el-table-column :label="language==0?'性别':'Gender'" align="center" prop="sexStr" />
<el-table-column
v-if="isNational" :label="language==0?'年龄组':'Age group'" align="center" min-width="100"
prop="ageGroup"
/>
<el-table-column
v-if="isNational" :label="language==0?'舞种':'Division'" align="center" min-width="100"
prop="division"
/>
<el-table-column v-if="!isNational" :label="language==0?'年龄':'Age'" prop="age"/>
<el-table-column v-if="!isNational" :label="language==0?'出生日期':'Date of Birth'" prop="birth" width="130"/>
<el-table-column v-if="!isNational" :label="language==0?'证件类型':'ID Type'" prop="idcTypeStr" width="120"/>
<el-table-column v-if="!isNational" :label="language==0?'证件号码':'ID NO.'" prop="idcCode" width="200"/>
<el-table-column v-if="!isNational" :label="language==0?'年龄':'Age'" prop="age" />
<el-table-column v-if="!isNational" :label="language==0?'出生日期':'Date of Birth'" prop="birth" width="130" />
<el-table-column v-if="!isNational" :label="language==0?'证件类型':'ID Type'" prop="idcTypeStr" width="120" />
<el-table-column v-if="!isNational" :label="language==0?'证件号码':'ID NO.'" prop="idcCode" width="200" />
<!-- <el-table-column label="会员角色" width="200">-->
<!-- <template #default="scope">-->
<!-- <div>-->
......@@ -72,61 +96,68 @@
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="language==0?'操作':'Actions'" :width="language==0?180:200" fixed="right" align="center">
<el-table-column :label="language==0?'操作':'Actions'" :width="language==0?180:200" align="center" fixed="right">
<template #default="scope">
<span class="text-primary pointer" v-if="scope.row.passportUrl" @click="editPerson(scope.row)">
{{language==0?'编辑':'Edit'}}
<span v-if="scope.row.passportUrl" class="text-primary pointer" @click="editPerson(scope.row)">
{{ language == 0 ? '编辑' : 'Edit' }}
</span>
<span v-else class="text-danger pointer" @click="editPerson(scope.row)">{{language==0?'上传证件':'Upload Valid Passport'}}</span>
<span class="text-primary pd10 pointer" v-if="scope.row.userId=='0'&&mateId!=scope.row.id" @click="deletePerson(scope.row)">
{{language==0?'删除':'Delete'}}
<span
v-else class="text-danger pointer"
@click="editPerson(scope.row)"
>{{ language == 0 ? '上传证件' : 'Upload Valid Passport' }}</span>
<span
v-if="scope.row.userId=='0'&&mateId!=scope.row.id" class="text-primary pd10 pointer"
@click="deletePerson(scope.row)"
>
{{ language == 0 ? '删除' : 'Delete' }}
</span>
</template>
</el-table-column>
</el-table>
<paginationPc
v-show="total>0"
v-model:page="query.pageNum"
v-model:limit="query.pageSize"
v-model:page="query.pageNum"
:total="total"
@pagination="getList"
/>
<template #footer>
<div class="dialog-footer text-center">
<el-button type="primary" @click="submit">{{language==0?'确定':'Confirm'}}</el-button>
<el-button @click="cancel">{{language==0?'取消':'Cancel'}}</el-button>
<el-button type="primary" @click="submit">{{ language == 0 ? '确定' : 'Confirm' }}</el-button>
<el-button @click="cancel">{{ language == 0 ? '取消' : 'Cancel' }}</el-button>
</div>
</template>
</el-dialog>
<!-- 国内赛运动员-->
<add-coach ref="dialogAddCoach" @submitForm="getList"/>
<add-coach ref="dialogAddCoach" @submitForm="getList" />
<!-- 国际赛运动员-->
<add-wdsf ref="dialogAddWdsf" @submitForm="getList"/>
<Import ref="dialogImportProps" @submitForm="getList"/>
<add-wdsf ref="dialogAddWdsf" @submitForm="getList" />
<Import ref="dialogImportProps" @submitForm="getList" />
</template>
<script setup>
import {reactive, ref, toRefs, watch} from 'vue'
import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
import { reactive, ref, toRefs, watch } from 'vue'
import { getCurrentInstance, nextTick, onMounted } from '@vue/runtime-core'
import * as match from '@/apiPc/match'
import AddCoach from '../components/addCoach'
import AddWdsf from '../components/addWdsf'
import Import from '../components/import'
import {useStorage} from "@vueuse/core/index";
import {delPersonForPersonal, getPerPersonList} from "@/apiPc/match";
import useUserStore from "@/store/modules/user";
import {ElMessage, ElMessageBox} from "element-plus";
import _ from "lodash";
const language= useStorage('language',0)
import { useStorage } from '@vueuse/core/index'
import { delPersonForPersonal, getPerPersonList } from '@/apiPc/match'
import useUserStore from '@/store/modules/user'
import { ElMessage, ElMessageBox } from 'element-plus'
import _ from 'lodash'
const language = useStorage('language', 0)
const user = useUserStore().user
const {proxy} = getCurrentInstance()
const emit = defineEmits([ 'transfer'])
const { proxy } = getCurrentInstance()
const emit = defineEmits(['transfer'])
const data = reactive({
query: {
label:'0',
label: '0',
pageSize: 10,
pageNum:1
pageNum: 1
},
tableData: [],
show: false,
......@@ -134,10 +165,10 @@ const data = reactive({
title: '选择运动员',
noPhotoCanSign: 0,
total: 0,
isNational:false,
mateId:0
isNational: false,
mateId: 0
})
const {query, tableData, show, title, loading, noPhotoCanSign,total,isNational,mateId} = toRefs(data)
const { query, tableData, show, title, loading, noPhotoCanSign, total, isNational, mateId } = toRefs(data)
const certificates = ref([
{
value: '0',
......@@ -173,7 +204,7 @@ const reSetChoosed = () => {
for (const p of choosedList) {
choosedIds.push(p.id)
}
console.log(choosedIds,choosedList)
console.log(choosedIds, choosedList)
for (const n of tableData.value) {
if (choosedIds.indexOf(n.id) > -1) {
proxy.$refs['allSportmenTable'].toggleRowSelection(n, true)
......@@ -195,7 +226,7 @@ const selectable = (row) => {
}
const getList = () => {
loading.value = true
getPerPersonList(query.value,user.userId).then(res => {
getPerPersonList(query.value, user.userId).then(res => {
total.value = res.total
// const startIndex = (query.value.pageNum - 1) * query.value.pageSize;
// const endIndex = startIndex + query.value.pageSize;
......@@ -214,13 +245,13 @@ function handleSelectionChange(val) {
for (const p of val) {
choosedIds.push(p.id)
}
//判断是否队友
if(val.length==2){
if(val[0].sex!=val[1].sex){
checkTwo(val[0],val[1])
// 判断是否队友
if (val.length == 2) {
if (val[0].sex != val[1].sex) {
checkTwo(val[0], val[1])
}
}
if(val.length>0){
if (val.length > 0) {
const newVal = _.last(val)
match.signgetSignInfoConflict({
cptId: matchId,
......@@ -234,18 +265,20 @@ function handleSelectionChange(val) {
})
}
}
function checkTwo(a,b) {
match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId}).then(res=>{
if(!res.data){
if(isNational.value){
ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple')
function checkTwo(a, b) {
match.checkMate({ per1Id: a.id, per2Id: b.id, cptId: matchId }).then(res => {
if (!res.data) {
if (isNational.value) {
ElMessage.warning(language.value == 0 ? '他们不是固定组合' : 'They\'re not a couple')
} else {
ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴，无法报名:请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`)
ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴，无法报名:请重新选择` : `${a.realName} has already formed a dancer with another person, cannot sign up: please select again`)
}
proxy.$refs['allSportmenTable'].clearSelection()
}
})
}
function submit() {
if (choosedIds.length == 0) {
ElMessage.warning(language.value == 0 ? '请选择运动员' : 'Please select athletes')
......@@ -254,12 +287,15 @@ function submit() {
emit('transfer', choosedList)
show.value = false
}
function getRowKeys(row) {
return row.id
}
function close() {
choosedIds = []
}
function cancel() {
show.value = false
}
......@@ -268,11 +304,11 @@ function editPerson(row) {
console.log(isNational.value)
const params = {
id: row.id,
title: language.value == 0 ?'编辑人员':'Edit Person',
title: language.value == 0 ? '编辑人员' : 'Edit Person',
groupId: '0',
label: '0'
}
if (isNational.value){
if (isNational.value) {
proxy.$refs['dialogAddWdsf'].open(params)
} else {
proxy.$refs['dialogAddCoach'].open(params)
......@@ -282,27 +318,28 @@ function editPerson(row) {
function addMember() {
console.log(isNational.value)
const params = {
title: language.value == 0 ?'添加人员':'Add',
title: language.value == 0 ? '添加人员' : 'Add',
id: 0,
groupId: '0',
label: '0'
}
if (isNational.value){
if (isNational.value) {
proxy.$refs['dialogAddWdsf'].open(params)
} else {
proxy.$refs['dialogAddCoach'].open(params)
}
}
function deletePerson(p) {
let text = ''
let t = '提示'
let s = '确定'
let c = '取消'
let msg = '操作成功'
if (language.value==0){
text = `确定删除${p.realName}和${p.sex=='1'?'他':'她'}的舞伴吗？`
if (language.value == 0) {
text = `确定删除${p.realName}和${p.sex == '1' ? '他' : '她'}的舞伴吗？`
} else {
text = `Delete ${p.realName} ${p.sex=='1'?'he':'she'} and ${p.sex=='1'?'his':'hers'} dance mate?`
text = `Delete ${p.realName} ${p.sex == '1' ? 'he' : 'she'} and ${p.sex == '1' ? 'his' : 'hers'} dance mate?`
t = 'Tips'
s = 'Confirm'
c = 'Cancel'
......@@ -321,7 +358,7 @@ function deletePerson(p) {
}
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.el-form--inline .el-form-item {
width: auto;
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!