|
|
@@ -300,16 +300,23 @@
|
|
|
class="often-content"
|
|
|
v-model="checkedmData[index].checkedCities"
|
|
|
@change="
|
|
|
- handleCheckedCitiesChange(checkedmData[index], index, cindex)
|
|
|
+ handleCheckedCitiesChange(checkedmData[index],cele.cities, index, cindex)
|
|
|
"
|
|
|
>
|
|
|
<el-checkbox
|
|
|
class="often-content-child"
|
|
|
v-for="city in cele.cities"
|
|
|
:label="city.name"
|
|
|
- :key="city"
|
|
|
+ :key="city.city"
|
|
|
>{{ city.name }}</el-checkbox
|
|
|
>
|
|
|
+ <!-- <el-checkbox
|
|
|
+ class="often-content-child"
|
|
|
+ v-for="city in cele.cities"
|
|
|
+ :label="city"
|
|
|
+ :key="city"
|
|
|
+ >{{ city }}</el-checkbox
|
|
|
+ > -->
|
|
|
</el-checkbox-group>
|
|
|
</div>
|
|
|
</span>
|
|
|
@@ -844,6 +851,7 @@ export default {
|
|
|
checkAll: false,
|
|
|
isIndeterminate: false,
|
|
|
checkedCities: [],
|
|
|
+ option:[]
|
|
|
};
|
|
|
});
|
|
|
},
|
|
|
@@ -985,14 +993,19 @@ export default {
|
|
|
this.checkedmData[index].isIndeterminate = false;
|
|
|
this.checkedmData = [...this.checkedmData];
|
|
|
},
|
|
|
- handleCheckedCitiesChange(value, index, cindex) {
|
|
|
- console.log(index,this.checkedmData[index],1111111111111111)
|
|
|
+ handleCheckedCitiesChange(value,cities, index, cindex) {
|
|
|
+ if(value.checkedCities.length>0){
|
|
|
+ value.checkedCities.forEach(ele=>{
|
|
|
+ this.checkedmData[index].option.push(cities.find(val=>val.name==ele))
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ let checkedCount = value.checkedCities.length;
|
|
|
+ this.checkedmData[index].checkAll =checkedCount === this.conditiondata[index].options[cindex].cities.length;
|
|
|
+ this.checkedmData[index].isIndeterminate = checkedCount > 0 && checkedCount < this.conditiondata[index].options[cindex].cities.length;
|
|
|
+ this.checkedmData = [...this.checkedmData];
|
|
|
+ console.log(value,this.checkedmData,1111111111111111)
|
|
|
|
|
|
- let checkedCount = value.checkedCities.length;
|
|
|
- this.checkedmData[index].checkAll =checkedCount === this.conditiondata[index].options[cindex].cities.length;
|
|
|
- this.checkedmData[index].isIndeterminate = checkedCount > 0 && checkedCount < this.conditiondata[index].options[cindex].cities.length;
|
|
|
- // this.checkedmData = [...this.checkedmData];
|
|
|
- console.log(this.checkedmData,1111111111111111)
|
|
|
},
|
|
|
conditionSave() {
|
|
|
this.dialogVisible = false;
|