Merge remote-tracking branch 'origin/master'

yangwl
wws 1 year ago
commit 03bca4a89c

@ -207,7 +207,7 @@ export default {
console.log("device是空if获取的device",this.form.device); console.log("device是空if获取的device",this.form.device);
this.form.device = obj; this.form.device = obj;
}else{ }else{
if(obj != undefined && obj != null){ if(obj != undefined && obj != null && obj != "" ){
const a = obj.split(','); const a = obj.split(',');
const len = obj.split(',').length; const len = obj.split(',').length;
console.log('切割的数组',obj.split(',')); console.log('切割的数组',obj.split(','));

@ -831,13 +831,13 @@ export default {
}, },
// //
onItemSelectedEquipment(obj) { onItemSelectedEquipment(obj) {
if (this.form.equipment == null) { if (this.form.equipment == null || this.form.equipment == "") {
console.log("equipment是空if获取的obj", obj); console.log("equipment是空if获取的obj", obj);
console.log("device是空if获取的equipment", this.form.equipment); console.log("device是空if获取的equipment", this.form.equipment);
this.form.equipment = obj; this.form.equipment = obj;
this.selectMaterielListtag = obj.split(","); this.selectMaterielListtag = obj.split(",");
} else { } else {
if (obj != undefined && obj != null) { if (obj != undefined && obj != null && obj != "") {
const a = obj.split(","); const a = obj.split(",");
const len = obj.split(",").length; const len = obj.split(",").length;
console.log("切割的数组", obj.split(",")); console.log("切割的数组", obj.split(","));

@ -318,7 +318,7 @@ export default {
console.log("device是空if获取的device",this.form.device); console.log("device是空if获取的device",this.form.device);
this.form.device = obj; this.form.device = obj;
}else{ }else{
if(obj != undefined && obj != null){ if(obj != undefined && obj != null && obj != ""){
const a = obj.split(','); const a = obj.split(',');
console.log('切割的数组',obj.split(',')); console.log('切割的数组',obj.split(','));
a.forEach(item => { a.forEach(item => {
@ -347,7 +347,7 @@ export default {
console.log("material是空if获取的material",this.form.material); console.log("material是空if获取的material",this.form.material);
this.form.material = obj; this.form.material = obj;
}else{ }else{
if(obj != undefined && obj != null){ if(obj != undefined && obj != null && obj !=""){
const a = obj.split(','); const a = obj.split(',');
const len = obj.split(',').length; const len = obj.split(',').length;
console.log('切割的数组',obj.split(',')); console.log('切割的数组',obj.split(','));

Loading…
Cancel
Save