faeca840 by 杨炀

no message

1 parent 009b1bb5
......@@ -243,7 +243,7 @@ const data = reactive({
currProjectId: '',
openTour: false,
isNational: false,
languageSource:''
languageSource:'',singlePersonEntryLimit:''
})
const {
activeTeam,
......@@ -271,7 +271,7 @@ const {
tableType,
zuQuery,
openTour, currProjectId,
tourCurrent, isNational,languageSource
tourCurrent, isNational,languageSource,singlePersonEntryLimit
} = toRefs(data)
const nextButtonProps = ref({})
const matchId = ref(route.query.matchId)
......@@ -291,7 +291,7 @@ function getAthletesList() {
athletesList.value = res.rows
if(!isNational.value){
for(let ath of athletesList.value){
if(!ath.picUrl||!ath.phone){
if(!ath.phone){
ath.disabled = true
} else {
ath.disabled = false
......@@ -305,6 +305,7 @@ function getMatch(id) {
match.getMatchById({
id: id
}).then(res => {
singlePersonEntryLimit.value = res.data.singlePersonEntryLimit
noPhotoCanSign.value = res.data.noPhotoCanSign
coachOrLeaderFlag.value = res.data.coachOrLeaderFlag
extraform.value = JSON.parse(res.data.participantsInfo)
......@@ -582,6 +583,7 @@ let hasPproperty=''
let hasPlevel=''
let hasAlmighty={}
let hasPpropertyLength=0
let isDanNum=0
watch(projectIds, (newVal, oldVal) => {
let currProject = {}
if (newVal.length > oldVal.length) {
......@@ -598,6 +600,7 @@ watch(projectIds, (newVal, oldVal) => {
hasPproperty=''
hasPlevel=''
hasAlmighty={}
isDanNum = 0
hasPpropertyLength=0
for(let hh of projectList.value){
if(projectIds.value.indexOf(hh.id)>-1&&hh.pproperty){
......@@ -610,6 +613,9 @@ watch(projectIds, (newVal, oldVal) => {
if(projectIds.value.indexOf(hh.id)>-1&&hh.almightyFlag=='1'){
hasAlmighty = hh
}
if(projectIds.value.indexOf(hh.id)>-1&&hh.singleFlag=='1'){
isDanNum += 1
}
}
console.log(hasPproperty,hasPlevel,hasPpropertyLength)
filterProjectList(currProject)
......@@ -621,11 +627,10 @@ watch(projectIds, (newVal, oldVal) => {
function filterProjectList(currProject){
for(let pp of projectList.value){
if(
(currProject.pproperty&&pp.pproperty&&(pp.pproperty!=currProject.pproperty))
||(currProject.plevel&&pp.plevel&&(pp.plevel!=currProject.plevel))
||(pp.pproperty==hasPproperty)&&(pp.danceTypeDetailStr.split(',').length<hasPpropertyLength)
(pp.pproperty==hasPproperty)&&((pp.danceTypeDetailStr.split(',').length>=4&&hasPpropertyLength<4)||(pp.danceTypeDetailStr.split(',').length<4&&hasPpropertyLength>=4))
||(hasPproperty&&pp.pproperty&&pp.pproperty!=hasPproperty)
||(hasPlevel&&pp.plevel&&pp.plevel!=hasPlevel)
||(isDanNum==Number(singlePersonEntryLimit.value) && pp.singleFlag=='1')
){
pp.disabled = true
} else if((hasAlmighty.almightyFlag=='1'&&pp.almightyFlag=='1')
......
......@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => {
},
'/dev-api': {
// target: 'http://192.168.1.118:8081/',
target: 'http://192.168.1.131:8081/',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'http://192.168.1.131:8081/',
target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!