no message
Showing
1 changed file
with
13 additions
and
9 deletions
| ... | @@ -93,7 +93,7 @@ | ... | @@ -93,7 +93,7 @@ |
| 93 | <div v-loading="loadingProject" id="projectbox" style="height: 50vh;overflow: auto;"> | 93 | <div v-loading="loadingProject" id="projectbox" style="height: 50vh;overflow: auto;"> |
| 94 | <el-checkbox-group v-model="projectIds" @change="changeProject"> | 94 | <el-checkbox-group v-model="projectIds" @change="changeProject"> |
| 95 | <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id" | 95 | <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id" |
| 96 | v-show="!c.disabled"> | 96 | v-show="!c.disabled" :disabled="c.disabled"> |
| 97 | <div class="flexBetween w100"> | 97 | <div class="flexBetween w100"> |
| 98 | <div class="l"> | 98 | <div class="l"> |
| 99 | {{ c.code }}:{{ c.name }}({{c.danceType}}) | 99 | {{ c.code }}:{{ c.name }}({{c.danceType}}) |
| ... | @@ -594,18 +594,22 @@ watch(projectIds, (newVal, oldVal) => { | ... | @@ -594,18 +594,22 @@ watch(projectIds, (newVal, oldVal) => { |
| 594 | if(newVal.length>0){ | 594 | if(newVal.length>0){ |
| 595 | console.log(currProject.pproperty,currProject.plevel) | 595 | console.log(currProject.pproperty,currProject.plevel) |
| 596 | for(let pp of projectList.value){ | 596 | for(let pp of projectList.value){ |
| 597 | console.log(pp.pproperty,pp.plevel) | 597 | if( |
| 598 | if((currProject.pproperty&&pp.pproperty&&(pp.pproperty!=currProject.pproperty))|| | 598 | (currProject.pproperty&&pp.pproperty&&(pp.pproperty!=currProject.pproperty))|| |
| 599 | currProject.plevel&&pp.plevel&&(pp.plevel!=currProject.plevel)|| | 599 | (currProject.plevel&&pp.plevel&&(pp.plevel!=currProject.plevel))|| |
| 600 | (currProject.pproperty&&pp.plevel&&currProject.pproperty=='A'&&pp.plevel!='6')|| | 600 | (currProject.pproperty&&pp.plevel&&currProject.pproperty=='A'&&pp.plevel!='6')|| |
| 601 | (currProject.pproperty&&pp.plevel&&currProject.pproperty=='B'&&(pp.plevel!='2'||pp.plevel!='4'))|| | 601 | (currProject.pproperty&&pp.plevel&&currProject.pproperty=='B'&&(pp.plevel!='2'&&pp.plevel!='4'))|| |
| 602 | (currProject.pproperty&&pp.plevel&&currProject.pproperty=='C'&&(pp.plevel!='2'||pp.plevel!='4'))|| | 602 | (currProject.pproperty&&pp.plevel&&currProject.pproperty=='C'&&(pp.plevel!='2'&&pp.plevel!='4'))|| |
| 603 | (currProject.plevel&&pp.pproperty&&currProject.plevel=='6'&&pp.pproperty!='A')|| | 603 | (currProject.plevel&&pp.pproperty&&currProject.plevel=='6'&&pp.pproperty!='A')|| |
| 604 | (currProject.plevel&&pp.pproperty&&currProject.plevel=='4'&&(pp.pproperty!='B'||pp.pproperty!='C'))|| | 604 | (currProject.plevel&&pp.pproperty&&currProject.plevel=='4'&&(pp.pproperty!='B'&&pp.pproperty!='C'))|| |
| 605 | (currProject.plevel&&pp.pproperty&&currProject.plevel=='2'&&(pp.pproperty!='B'||pp.pproperty!='C')) | 605 | (currProject.plevel&&pp.pproperty&&currProject.plevel=='2'&&(pp.pproperty!='B'&&pp.pproperty!='C')) |
| 606 | ){ | 606 | ){ |
| 607 | console.log(pp.pproperty,pp.plevel) | ||
| 607 | pp.disabled = true | 608 | pp.disabled = true |
| 608 | } else { | 609 | }else if((currProject.almightyFlag=='1'&&pp.almightyFlag=='1')&&(currProject.danceTypeDetailStr.split(',').length!=pp.danceTypeDetailStr.split(',').length)){ |
| 610 | console.log(pp.name) | ||
| 611 | pp.disabled = true | ||
| 612 | }else { | ||
| 609 | pp.disabled = false | 613 | pp.disabled = false |
| 610 | } | 614 | } |
| 611 | } | 615 | } | ... | ... |
-
Please register or sign in to post a comment