|
|
|
@ -2166,7 +2166,7 @@ watch( |
|
|
|
{ |
|
|
|
id: "rootid_" + getAssociatedFormsCurrentFieldTreeData.label, |
|
|
|
//label: '当前表单', |
|
|
|
label: "当前表单-" + getAssociatedFormsCurrentFieldTreeData.treeAttrs.show, |
|
|
|
label: "当前表单-blibli----" + getAssociatedFormsCurrentFieldTreeData.treeAttrs.show, |
|
|
|
children: resDataForGlxxszExceptself1, |
|
|
|
treeAttrs: getAssociatedFormsCurrentFieldTreeData.treeAttrs, // |
|
|
|
}, |
|
|
|
@ -2712,7 +2712,7 @@ let getAssociatedFormsCurrentFieldTreeData: any; |
|
|
|
getAssociatedFormsCurrentFieldTree1(); |
|
|
|
function getAssociatedFormsCurrentFieldTree1() { |
|
|
|
getAssociatedFormsCurrentFieldTree().then(({ data }) => { |
|
|
|
// console.log(data) |
|
|
|
console.log("cfid为空----------------------->",data) |
|
|
|
getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data)); |
|
|
|
// console.log(getAssociatedFormsCurrentFieldTreeData) |
|
|
|
if (data.id === "cfid为空" || data.id === "masterTable为null") { |
|
|
|
@ -2930,7 +2930,7 @@ const zdtcszTree = computed(()=>{ |
|
|
|
datapropsformList = JSON.parse(JSON.stringify(props.formList)) |
|
|
|
} |
|
|
|
|
|
|
|
if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){ |
|
|
|
if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){ |
|
|
|
let datab = JSON.parse(JSON.stringify(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children)) |
|
|
|
let currentCompId = controlData.value.name |
|
|
|
const treeC = mergeAndFilterFormTrees(datapropsformList, datab,currentCompId); |
|
|
|
@ -3975,7 +3975,8 @@ const glxxszTree = computed(()=>{ |
|
|
|
} |
|
|
|
|
|
|
|
console.log(datapropsformList) |
|
|
|
if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){ |
|
|
|
console.log(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value) |
|
|
|
if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){ |
|
|
|
|
|
|
|
|
|
|
|
let datab = JSON.parse(JSON.stringify(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children)) |
|
|
|
|