Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/components/ruleConditionContainer/index.vue

@@ -71,7 +71,7 @@
             <el-select v-model="item.minArray" placeholder="选择值" clearable filterable multiple :disabled="disabled"
               @change="change($event, index, item)">
               <template #header>
-                <el-checkbox v-model="item.checkAll" :indeterminate="item.indeterminate"
+                <el-checkbox v-model="item.checkAll" :indeterminate="item.indeterminate" :disabled="disabled"
                   @change="(val) => handleCheckAll(item, index, val)">
                   全选
                 </el-checkbox>
@@ -137,7 +137,7 @@
           </el-icon>
         </el-col>
         <el-col :span="2">
-          <el-checkbox v-if="item.attrName === '车牌号'" @change="licenseNoSelect($event, item)">全选</el-checkbox>
+          <el-checkbox v-if="item.attrName === '车牌号'" :disabled="disabled" @change="licenseNoSelect($event, item)">全选</el-checkbox>
         </el-col>
       </el-row>
     </div>