diff --git a/src/views/machine/model/modelCom.vue b/src/views/machine/model/modelCom.vue index 4b50ab0..8eaa92d 100644 --- a/src/views/machine/model/modelCom.vue +++ b/src/views/machine/model/modelCom.vue @@ -56,8 +56,7 @@ </el-tab-pane> </el-tabs> <div slot="footer" class="dialog-footer" > - <el-button type="primary" @click="comDiaLogCancel" >确定</el-button> - <el-button @click="comDiaLogCancel">退出</el-button> + <el-button type="primary" @click="comDiaLogCancel">退出</el-button> </div> </el-dialog> <el-dialog title="编辑组件属性" :visible.sync="editDiaLog" width="900px" append-to-body> @@ -141,7 +140,7 @@ export default { componentList:[], componentName:'', com_ros_code:'', - comShow:true + comShow:true, }; }, created() { @@ -183,12 +182,22 @@ export default { this.editDiaLog=true; this.getComponentPropertyList(row.model_id,row.ros_code); }, + //关闭机型设置 comDiaLogCancel(){ - this.comDiaLog=false + let hang=0; + for(let i=0;i<this.modelComponentList.length;i++){ + if(this.modelComponentList[i].isShow){ + hang=i+1; + this.$message.error('第'+hang+'行,数据未点击确定!'); + return; + } + } + this.comDiaLog=false; + }, //关闭组件属性 editDiaLogCancel(){ - this.editDiaLog=false + this.editDiaLog=false }, //编辑组件属性 editDiaLogSubmit(){ @@ -269,7 +278,7 @@ export default { return; } } - row.isShow = false; + let obj={ "model_id":this.modelId, "component_name":row.component_name, @@ -281,9 +290,10 @@ export default { addComponent([obj]).then((response) => { if(response.code==0){ this.$modal.msgSuccess("添加组件成功!"); - this.getModelComponentList(); + row.isShow = false; }else if(response.code==21001){ this.$message.error('该机型已有机器绑定,请重新填写!'); + row.isShow = true; } }) },