diff --git a/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue index 59aca823..95cf2311 100644 --- a/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue +++ b/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue @@ -27,7 +27,11 @@ terms: [ { terms: [ - { column: 'parentId$isnull', value: '1' }, + { + column: 'parentId$isnull', + value: '', + type: 'or', + }, { column: 'parentId$not', value: detail.id, @@ -43,6 +47,7 @@ type: 'and', }, ], + type: 'and', }, { terms: [ diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue index af70c3d1..b9f693d3 100644 --- a/src/views/device/Product/Save/index.vue +++ b/src/views/device/Product/Save/index.vue @@ -85,6 +85,7 @@ :value="form.deviceType" :options="deviceList" @change="changeDeviceType" + :disabled="disabled" >