|
@@ -482,10 +482,10 @@
|
|
|
<el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'protocoltype'" @keyup.native="lampKeydown($event)">
|
|
|
<el-option :key="0" label="mqtt" :value="0"></el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'poName'&&role != 2&&role != 4" @keyup.native="lampKeydown($event)">
|
|
|
+ <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'poName'" @keyup.native="lampKeydown($event)">
|
|
|
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in companyNavPO"></el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'supplierName'&&role != 2" @keyup.native="lampKeydown($event)">
|
|
|
+ <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'supplierName'" @keyup.native="lampKeydown($event)">
|
|
|
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in companyNavSupplier"></el-option>
|
|
|
</el-select>
|
|
|
|
|
@@ -4786,6 +4786,12 @@
|
|
|
if((list[key].model == 'network_id' && this.lightControlData.devicetype == '1')||(list[key].model == 'protocoltype' && this.lightControlData.devicetype == '0')){
|
|
|
list.splice(key,1)
|
|
|
}
|
|
|
+ if((role == 2||role == 4)&&list[key].model == 'poName'){
|
|
|
+ list.splice(key,1)
|
|
|
+ }
|
|
|
+ if((role == 2)&&list[key].model == 'supplierName'){
|
|
|
+ list.splice(key,1)
|
|
|
+ }
|
|
|
}
|
|
|
// this.lightControlListEN_for = list;
|
|
|
this.$set(this,'lightControlListEN_for',list)
|