|
|
@ -1131,7 +1131,6 @@ const controlChange = (obj: any, val: any) => { |
|
|
// select多选属性, |
|
|
// select多选属性, |
|
|
switch (obj.eventName) { |
|
|
switch (obj.eventName) { |
|
|
case "selectMultiple": |
|
|
case "selectMultiple": |
|
|
// |
|
|
|
|
|
if (val) { |
|
|
if (val) { |
|
|
// 多选,将值改为数组 |
|
|
// 多选,将值改为数组 |
|
|
controlData.value.control.modelValue = []; |
|
|
controlData.value.control.modelValue = []; |
|
|
@ -1140,21 +1139,21 @@ const controlChange = (obj: any, val: any) => { |
|
|
// 单选 |
|
|
// 单选 |
|
|
controlData.value.control.modelValue = ""; |
|
|
controlData.value.control.modelValue = ""; |
|
|
for (var i = 0; i < controlData.value.options.length; i++) { |
|
|
for (var i = 0; i < controlData.value.options.length; i++) { |
|
|
if (controlData.value.control.glxxsz[i] === undefined) { |
|
|
if (controlData.value.control.glxxsz[i] === undefined) { |
|
|
//新增了某个option |
|
|
//新增了某个option |
|
|
controlData.value.control.glxxsz.push({ |
|
|
controlData.value.control.glxxsz.push({ |
|
|
conditionField: controlData.value.name, |
|
|
conditionField: controlData.value.name, |
|
|
optionLabel: controlData.value.options[i].label, |
|
|
optionLabel: controlData.value.options[i].label, |
|
|
optionValue: controlData.value.options[i].value, |
|
|
optionValue: controlData.value.options[i].value, |
|
|
tableIndex: i, |
|
|
tableIndex: i, |
|
|
id: uuidv4().replaceAll("-", "").toString(), |
|
|
id: uuidv4().replaceAll("-", "").toString(), |
|
|
}); |
|
|
}); |
|
|
} else { |
|
|
} else { |
|
|
//修改了某个option |
|
|
//修改了某个option |
|
|
controlData.value.control.glxxsz[i].optionLabel = controlData.value.options[i].label; |
|
|
controlData.value.control.glxxsz[i].optionLabel = controlData.value.options[i].label; |
|
|
controlData.value.control.glxxsz[i].optionValue = controlData.value.options[i].value; |
|
|
controlData.value.control.glxxsz[i].optionValue = controlData.value.options[i].value; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
break; |
|
|
break; |
|
|
case "tableColumn1": |
|
|
case "tableColumn1": |
|
|
@ -2028,16 +2027,15 @@ watch( |
|
|
//实现关联表单设置可选字段中没有当前字段效果 start |
|
|
//实现关联表单设置可选字段中没有当前字段效果 start |
|
|
// console.log(controlData.value.name) |
|
|
// console.log(controlData.value.name) |
|
|
resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself)); |
|
|
resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself)); |
|
|
console.log(resDataForGlxxszExceptself1) |
|
|
// console.log(resDataForGlxxszExceptself1) |
|
|
|
|
|
|
|
|
for (let i = 0; i < resDataForGlxxszExceptself1.length; i++) { |
|
|
for (let i = 0; i < resDataForGlxxszExceptself1.length; i++) { |
|
|
let strArr: [string] = resDataForGlxxszExceptself1[i].id.split(":"); |
|
|
let strArr: [string] = resDataForGlxxszExceptself1[i].id.split(":"); |
|
|
console.log(strArr) |
|
|
// console.log(strArr) |
|
|
let str = strArr[strArr.length - 1]; |
|
|
let str = strArr[strArr.length - 1]; |
|
|
console.log(str) |
|
|
/* console.log(str) |
|
|
console.log(newVal) |
|
|
console.log(newVal) */ |
|
|
if (str == newVal) { |
|
|
if (str == newVal) { |
|
|
|
|
|
|
|
|
resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移,数组长度减1 |
|
|
resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移,数组长度减1 |
|
|
i--; // 如果不减,将漏掉一个元素 |
|
|
i--; // 如果不减,将漏掉一个元素 |
|
|
} |
|
|
} |
|
|
|