|
|
|
@ -5724,12 +5724,17 @@ const xTree = computed(()=>{ |
|
|
|
if(datapropsformList&&datapropsformList.length==0){ |
|
|
|
datapropsformList = JSON.parse(JSON.stringify(props.formList)) |
|
|
|
} |
|
|
|
|
|
|
|
console.log("datapropsformList------------------>",datapropsformList) |
|
|
|
console.log("associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf------------------>",associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value) |
|
|
|
|
|
|
|
console.log("datapropsformList------------------>",associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value && 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 |
|
|
|
//console.log(currentCompId) |
|
|
|
console.log(currentCompId) |
|
|
|
const treeC = mergeAndFilterAssociatedForms(datapropsformList, datab); |
|
|
|
console.log(treeC) |
|
|
|
return treeC |
|
|
|
}else{ |
|
|
|
return [] |
|
|
|
@ -6149,6 +6154,7 @@ const asfsCurrentTable = computed(()=>{ |
|
|
|
count++ |
|
|
|
} |
|
|
|
}); |
|
|
|
console.log("xTree.value------------------>",xTree.value) |
|
|
|
if(count>0){ |
|
|
|
result = currentTable[0].children |
|
|
|
}else{ |
|
|
|
@ -8668,7 +8674,7 @@ const updataBase = (val: any) => { |
|
|
|
/> |
|
|
|
</div> |
|
|
|
<div style="width: 100%; padding: 20px; overflow-x: auto;"> |
|
|
|
|
|
|
|
|
|
|
|
<el-table |
|
|
|
:data="zdtcszTableData" |
|
|
|
border |
|
|
|
@ -8817,8 +8823,25 @@ const updataBase = (val: any) => { |
|
|
|
:close-on-press-escape="false" |
|
|
|
style="--el-dialog-padding-primary: 20px; border-radius: 8px; box-shadow: 0 2px 16px rgba(0,0,0,0.08); border: none; " |
|
|
|
> |
|
|
|
{{controlData.control}} |
|
|
|
|
|
|
|
<div style="display: flex; margin-bottom: 20px; margin-top: 20px;width: 100%;"> |
|
|
|
<span style="font-size: larger; margin-left: 35px; margin-right: 15px">选择关联表单</span> |
|
|
|
<el-tree-select |
|
|
|
v-model="controlData.control.preFill.asf" |
|
|
|
style="width: 60%" |
|
|
|
:data="asfsCurrentTable" |
|
|
|
clearable |
|
|
|
/> |
|
|
|
</div> |
|
|
|
<div v-if="preFillDialogFlag" style="display: flex; margin-bottom: 20px; margin-top: 20px;width: 100%;"> |
|
|
|
<span style="font-size: larger; margin-left: 35px; margin-right: 15px" |
|
|
|
>选择填充记录</span><!-- controlData.control.preFill.ids --> |
|
|
|
<AssociatedformsForCreate |
|
|
|
style="width: 60%" |
|
|
|
@value-changed="tablePreFillValueChanged" |
|
|
|
:data="asfPropsData" |
|
|
|
:ids = "controlData.control.preFill?.ids?controlData.control.preFill.ids:[]" |
|
|
|
/> |
|
|
|
</div> |
|
|
|
<template #footer> |
|
|
|
<div class="dialog-footer"> |
|
|
|
<el-button type="primary" @click="preFillDialogDetermine"> 确定 </el-button> |
|
|
|
|