diff --git a/src/views/technology/process/content.vue b/src/views/technology/process/content.vue index 8dfc115..3ec3735 100644 --- a/src/views/technology/process/content.vue +++ b/src/views/technology/process/content.vue @@ -212,11 +212,14 @@ export default { const len = obj.split(',').length; console.log('切割的数组',obj.split(',')); a.forEach(item => { + const b = this.form.device.split(','); + const size = b.length; + console.log("size",size,b[size-1]) const item1 = item+','; console.log("打印item1",item1); this.checkDevice = this.form.device.search(item1) != -1; console.log("check的值",this.checkDevice); - if(this.checkDevice == true){ + if(this.checkDevice == true || b[size-1] == item){ console.log("重复添加",true); Message.warning('您已经添加过该设备,请勿重复添加!!!'); }else if(this.checkDevice == false){ diff --git a/src/views/technology/process/index.vue b/src/views/technology/process/index.vue index 3297075..bba5463 100644 --- a/src/views/technology/process/index.vue +++ b/src/views/technology/process/index.vue @@ -836,10 +836,13 @@ export default { const len = obj.split(",").length; console.log("切割的数组", obj.split(",")); a.forEach((item) => { + const b = this.form.equipment.split(','); + const size = b.length; + console.log("size",size,b[size-1]) const item1 = item+','; console.log("打印item1",item1); this.checkEquipment = this.form.equipment.search(item1) != -1; - if (this.checkEquipment == true) { + if (this.checkEquipment == true ||b[size-1] == item) { console.log("重复添加", true); Message.warning("您已经添加过该设备,请勿重复添加!!!"); } else if (this.checkEquipment == false) { diff --git a/src/views/technology/recipe/content.vue b/src/views/technology/recipe/content.vue index f026ba8..36f274c 100644 --- a/src/views/technology/recipe/content.vue +++ b/src/views/technology/recipe/content.vue @@ -320,14 +320,16 @@ export default { }else{ if(obj != undefined && obj != null){ const a = obj.split(','); - const len = obj.split(',').length; console.log('切割的数组',obj.split(',')); a.forEach(item => { + const b = this.form.device.split(','); + const size = b.length; + console.log("size",size,b[size-1]) const item1 = item+','; console.log("打印item1",item1); this.checkDevice = this.form.device.search(item1) != -1; console.log("check的值",this.checkDevice); - if(this.checkDevice == true){ + if(this.checkDevice == true ||b[size-1] == item){ console.log("重复添加",true); Message.warning('您已经添加过该设备,请勿重复添加!!!'); }else if(this.checkDevice == false){