34186cd5 by 杨炀

no message

1 parent faeca840
...@@ -243,7 +243,7 @@ const data = reactive({ ...@@ -243,7 +243,7 @@ const data = reactive({
243 currProjectId: '', 243 currProjectId: '',
244 openTour: false, 244 openTour: false,
245 isNational: false, 245 isNational: false,
246 languageSource:'',singlePersonEntryLimit:'' 246 languageSource:'',singlePersonEntryLimit:'',doublePersonEntryLimit:''
247 }) 247 })
248 const { 248 const {
249 activeTeam, 249 activeTeam,
...@@ -271,7 +271,7 @@ const { ...@@ -271,7 +271,7 @@ const {
271 tableType, 271 tableType,
272 zuQuery, 272 zuQuery,
273 openTour, currProjectId, 273 openTour, currProjectId,
274 tourCurrent, isNational,languageSource,singlePersonEntryLimit 274 tourCurrent, isNational,languageSource,singlePersonEntryLimit,doublePersonEntryLimit
275 } = toRefs(data) 275 } = toRefs(data)
276 const nextButtonProps = ref({}) 276 const nextButtonProps = ref({})
277 const matchId = ref(route.query.matchId) 277 const matchId = ref(route.query.matchId)
...@@ -306,6 +306,7 @@ function getMatch(id) { ...@@ -306,6 +306,7 @@ function getMatch(id) {
306 id: id 306 id: id
307 }).then(res => { 307 }).then(res => {
308 singlePersonEntryLimit.value = res.data.singlePersonEntryLimit 308 singlePersonEntryLimit.value = res.data.singlePersonEntryLimit
309 doublePersonEntryLimit.value = res.data.doublePersonEntryLimit
309 noPhotoCanSign.value = res.data.noPhotoCanSign 310 noPhotoCanSign.value = res.data.noPhotoCanSign
310 coachOrLeaderFlag.value = res.data.coachOrLeaderFlag 311 coachOrLeaderFlag.value = res.data.coachOrLeaderFlag
311 extraform.value = JSON.parse(res.data.participantsInfo) 312 extraform.value = JSON.parse(res.data.participantsInfo)
...@@ -584,6 +585,7 @@ let hasPlevel='' ...@@ -584,6 +585,7 @@ let hasPlevel=''
584 let hasAlmighty={} 585 let hasAlmighty={}
585 let hasPpropertyLength=0 586 let hasPpropertyLength=0
586 let isDanNum=0 587 let isDanNum=0
588 let isShuangNum=0
587 watch(projectIds, (newVal, oldVal) => { 589 watch(projectIds, (newVal, oldVal) => {
588 let currProject = {} 590 let currProject = {}
589 if (newVal.length > oldVal.length) { 591 if (newVal.length > oldVal.length) {
...@@ -601,6 +603,7 @@ watch(projectIds, (newVal, oldVal) => { ...@@ -601,6 +603,7 @@ watch(projectIds, (newVal, oldVal) => {
601 hasPlevel='' 603 hasPlevel=''
602 hasAlmighty={} 604 hasAlmighty={}
603 isDanNum = 0 605 isDanNum = 0
606 isShuangNum = 0
604 hasPpropertyLength=0 607 hasPpropertyLength=0
605 for(let hh of projectList.value){ 608 for(let hh of projectList.value){
606 if(projectIds.value.indexOf(hh.id)>-1&&hh.pproperty){ 609 if(projectIds.value.indexOf(hh.id)>-1&&hh.pproperty){
...@@ -616,6 +619,9 @@ watch(projectIds, (newVal, oldVal) => { ...@@ -616,6 +619,9 @@ watch(projectIds, (newVal, oldVal) => {
616 if(projectIds.value.indexOf(hh.id)>-1&&hh.singleFlag=='1'){ 619 if(projectIds.value.indexOf(hh.id)>-1&&hh.singleFlag=='1'){
617 isDanNum += 1 620 isDanNum += 1
618 } 621 }
622 if(projectIds.value.indexOf(hh.id)>-1&&hh.doubleSingleProjectFlag=='1'){
623 isShuangNum += 1
624 }
619 } 625 }
620 console.log(hasPproperty,hasPlevel,hasPpropertyLength) 626 console.log(hasPproperty,hasPlevel,hasPpropertyLength)
621 filterProjectList(currProject) 627 filterProjectList(currProject)
...@@ -630,7 +636,8 @@ function filterProjectList(currProject){ ...@@ -630,7 +636,8 @@ function filterProjectList(currProject){
630 (pp.pproperty==hasPproperty)&&((pp.danceTypeDetailStr.split(',').length>=4&&hasPpropertyLength<4)||(pp.danceTypeDetailStr.split(',').length<4&&hasPpropertyLength>=4)) 636 (pp.pproperty==hasPproperty)&&((pp.danceTypeDetailStr.split(',').length>=4&&hasPpropertyLength<4)||(pp.danceTypeDetailStr.split(',').length<4&&hasPpropertyLength>=4))
631 ||(hasPproperty&&pp.pproperty&&pp.pproperty!=hasPproperty) 637 ||(hasPproperty&&pp.pproperty&&pp.pproperty!=hasPproperty)
632 ||(hasPlevel&&pp.plevel&&pp.plevel!=hasPlevel) 638 ||(hasPlevel&&pp.plevel&&pp.plevel!=hasPlevel)
633 ||(isDanNum==Number(singlePersonEntryLimit.value) && pp.singleFlag=='1') 639 ||(isDanNum==Number(singlePersonEntryLimit.value) && pp.singleFlag=='1'&&projectIds.value.indexOf(pp.id)==-1)
640 ||(isShuangNum==Number(doublePersonEntryLimit.value) && pp.doubleSingleProjectFlag=='1'&&projectIds.value.indexOf(pp.id)==-1)
634 ){ 641 ){
635 pp.disabled = true 642 pp.disabled = true
636 } else if((hasAlmighty.almightyFlag=='1'&&pp.almightyFlag=='1') 643 } else if((hasAlmighty.almightyFlag=='1'&&pp.almightyFlag=='1')
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 <!-- </el-table-column>--> 72 <!-- </el-table-column>-->
73 <el-table-column :label="language==0?'操作':'Actions'" width="180" fixed="right" align="center"> 73 <el-table-column :label="language==0?'操作':'Actions'" width="180" fixed="right" align="center">
74 <template #default="scope"> 74 <template #default="scope">
75 <el-button link v-if="!isNational&&(!scope.row.picUrl||!scope.row.phone)" type="danger" @click="editPerson(scope.row)"> 75 <el-button link v-if="!isNational&&(!scope.row.phone)" type="danger" @click="editPerson(scope.row)">
76 {{language==0?'完善信息':'Complete'}} 76 {{language==0?'完善信息':'Complete'}}
77 </el-button> 77 </el-button>
78 <el-button link v-else type="primary" @click="editPerson(scope.row)"> 78 <el-button link v-else type="primary" @click="editPerson(scope.row)">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!