|
|
@ -2618,8 +2618,9 @@ function addChildFillRole(){ |
|
|
//子表填充规则要受到子表数量的限制 |
|
|
//子表填充规则要受到子表数量的限制 |
|
|
//currentChildTableCount |
|
|
//currentChildTableCount |
|
|
//controlData.value.control.fillRoles.child.length |
|
|
//controlData.value.control.fillRoles.child.length |
|
|
if(controlData.value.control.fillRoles.child.length<currentChildTableCount){ |
|
|
if(controlData.value.control.fillRoles.child.length<currentChildTableCount){ |
|
|
let onlyNumber = uuidv4().replaceAll('-','').toString(); //获取唯一编码 |
|
|
let onlyNumber = uuidv4().replaceAll('-','').toString(); //获取唯一编码 |
|
|
|
|
|
let onlyNumber1 = uuidv4().replaceAll('-','').toString(); //获取唯一编码 |
|
|
controlData.value.control.fillRoles.child.push({ |
|
|
controlData.value.control.fillRoles.child.push({ |
|
|
id: onlyNumber, |
|
|
id: onlyNumber, |
|
|
tableKey: '', |
|
|
tableKey: '', |
|
|
@ -2632,7 +2633,11 @@ function addChildFillRole(){ |
|
|
mathsString:'', |
|
|
mathsString:'', |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
childRoles:[] |
|
|
childRoles:[{ |
|
|
|
|
|
leftValue: '', |
|
|
|
|
|
rightValue: '', |
|
|
|
|
|
id: onlyNumber1, |
|
|
|
|
|
}] |
|
|
}) |
|
|
}) |
|
|
}else{ |
|
|
}else{ |
|
|
alert("当前关联表单共 "+controlData.value.control.fillRoles.child.length+" 张子表,不可再添加") |
|
|
alert("当前关联表单共 "+controlData.value.control.fillRoles.child.length+" 张子表,不可再添加") |
|
|
@ -4298,13 +4303,13 @@ const radioChangeSet = (val:any) => { |
|
|
<div class="common-layout"> |
|
|
<div class="common-layout"> |
|
|
<el-container> |
|
|
<el-container> |
|
|
<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;"> |
|
|
<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;"> |
|
|
<el-input |
|
|
<!-- <el-input |
|
|
v-show="fieldTreeSearchFlag" |
|
|
v-show="fieldTreeSearchFlag" |
|
|
v-model="fieldTreeFilterText" |
|
|
v-model="fieldTreeFilterText" |
|
|
style="width:98%;margin: 3px;" |
|
|
style="width:98%;margin: 3px;" |
|
|
placeholder="搜索字段" |
|
|
placeholder="搜索字段" |
|
|
class="filter-tree" |
|
|
class="filter-tree" |
|
|
/> |
|
|
/> --> |
|
|
<el-tree |
|
|
<el-tree |
|
|
ref="fieldTreeRef" |
|
|
ref="fieldTreeRef" |
|
|
node-key="id" |
|
|
node-key="id" |
|
|
@ -4320,13 +4325,13 @@ const radioChangeSet = (val:any) => { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/> |
|
|
/> |
|
|
<el-input |
|
|
<!-- <el-input |
|
|
v-show="orgTreeSearchFlag" |
|
|
v-show="orgTreeSearchFlag" |
|
|
v-model="orgTreeFilterText" |
|
|
v-model="orgTreeFilterText" |
|
|
style="width:98%;margin: 3px;" |
|
|
style="width:98%;margin: 3px;" |
|
|
placeholder="搜索字段" |
|
|
placeholder="搜索字段" |
|
|
class="filter-tree" |
|
|
class="filter-tree" |
|
|
/> |
|
|
/> --> |
|
|
<el-tree |
|
|
<el-tree |
|
|
ref="orgTreeRef" |
|
|
ref="orgTreeRef" |
|
|
style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" |
|
|
style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" |
|
|
@ -4338,13 +4343,13 @@ const radioChangeSet = (val:any) => { |
|
|
|
|
|
|
|
|
@node-contextmenu="handleOrgTreeContextmenu" |
|
|
@node-contextmenu="handleOrgTreeContextmenu" |
|
|
/> |
|
|
/> |
|
|
<el-input |
|
|
<!-- <el-input |
|
|
v-show="roleTreeSearchFlag" |
|
|
v-show="roleTreeSearchFlag" |
|
|
v-model="roleTreeFilterText" |
|
|
v-model="roleTreeFilterText" |
|
|
style="width:98%;margin: 3px;" |
|
|
style="width:98%;margin: 3px;" |
|
|
placeholder="搜索字段" |
|
|
placeholder="搜索字段" |
|
|
class="filter-tree" |
|
|
class="filter-tree" |
|
|
/> |
|
|
/> --> |
|
|
<el-tree |
|
|
<el-tree |
|
|
ref="roleTreeRef" |
|
|
ref="roleTreeRef" |
|
|
style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" |
|
|
style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" |
|
|
@ -4415,13 +4420,13 @@ const radioChangeSet = (val:any) => { |
|
|
@node-collapse="handleFieldTreeCollapse" |
|
|
@node-collapse="handleFieldTreeCollapse" |
|
|
@node-contextmenu="handleFieldTreeContextmenuRange" |
|
|
@node-contextmenu="handleFieldTreeContextmenuRange" |
|
|
/> |
|
|
/> |
|
|
<el-input |
|
|
<!-- <el-input |
|
|
v-show="fieldTreeSearchFlag" |
|
|
v-show="fieldTreeSearchFlag" |
|
|
v-model="fieldTreeFilterText" |
|
|
v-model="fieldTreeFilterText" |
|
|
style="width:98%;margin: 3px;" |
|
|
style="width:98%;margin: 3px;" |
|
|
placeholder="搜索字段" |
|
|
placeholder="搜索字段" |
|
|
class="filter-tree" |
|
|
class="filter-tree" |
|
|
/> |
|
|
/> --> |
|
|
<el-tree |
|
|
<el-tree |
|
|
ref="fieldTreeRef" |
|
|
ref="fieldTreeRef" |
|
|
node-key="id" |
|
|
node-key="id" |
|
|
@ -4434,13 +4439,13 @@ const radioChangeSet = (val:any) => { |
|
|
@node-collapse="handleFieldTreeCollapse" |
|
|
@node-collapse="handleFieldTreeCollapse" |
|
|
@node-contextmenu="handleFieldTreeContextmenuRange" |
|
|
@node-contextmenu="handleFieldTreeContextmenuRange" |
|
|
/> |
|
|
/> |
|
|
<el-input |
|
|
<!-- <el-input |
|
|
v-show="orgTreeSearchFlag" |
|
|
v-show="orgTreeSearchFlag" |
|
|
v-model="orgTreeFilterText" |
|
|
v-model="orgTreeFilterText" |
|
|
style="width:98%;margin: 3px;" |
|
|
style="width:98%;margin: 3px;" |
|
|
placeholder="搜索字段" |
|
|
placeholder="搜索字段" |
|
|
class="filter-tree" |
|
|
class="filter-tree" |
|
|
/> |
|
|
/> --> |
|
|
<el-tree |
|
|
<el-tree |
|
|
ref="orgTreeRef" |
|
|
ref="orgTreeRef" |
|
|
style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" |
|
|
style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" |
|
|
@ -4452,13 +4457,13 @@ const radioChangeSet = (val:any) => { |
|
|
|
|
|
|
|
|
@node-contextmenu="handleOrgTreeContextmenuRange" |
|
|
@node-contextmenu="handleOrgTreeContextmenuRange" |
|
|
/> |
|
|
/> |
|
|
<el-input |
|
|
<!-- <el-input |
|
|
v-show="roleTreeSearchFlag" |
|
|
v-show="roleTreeSearchFlag" |
|
|
v-model="roleTreeFilterText" |
|
|
v-model="roleTreeFilterText" |
|
|
style="width:98%;margin: 3px;" |
|
|
style="width:98%;margin: 3px;" |
|
|
placeholder="搜索字段" |
|
|
placeholder="搜索字段" |
|
|
class="filter-tree" |
|
|
class="filter-tree" |
|
|
/> |
|
|
/> --> |
|
|
<el-tree |
|
|
<el-tree |
|
|
ref="roleTreeRef" |
|
|
ref="roleTreeRef" |
|
|
style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" |
|
|
style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" |
|
|
@ -4512,16 +4517,11 @@ const radioChangeSet = (val:any) => { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 数据填充规则弹窗 --> |
|
|
<!-- 数据填充规则弹窗 --> |
|
|
|
|
|
<el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:900px" width="50%" > |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:800px" width="50%" > |
|
|
|
|
|
|
|
|
|
|
|
<template v-if="controlData.type=='associatedForms'"> |
|
|
<template v-if="controlData.type=='associatedForms'"> |
|
|
|
|
|
<el-button style="font-size: large;margin-top: 10px;margin-bottom: 15px;" type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 主表填充规则</el-button> |
|
|
<div style="height:300px;border:1px solid white;overflow-y:auto;"> |
|
|
<div style="max-height:230px;border:1px solid white;overflow-y:auto;"> |
|
|
<el-button style="font-size: large;margin-top: 10px;margin-bottom: 15px;" type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 主表填充规则</el-button> |
|
|
<div style="background-color: #F0F0F0;padding: 12px;border-radius: 5px;padding-left:45px;padding-bottom: 10px;margin-right: 10px;"><!-- #F5F7FA #E6F3FE #F0F0F0 #F5F7FA--> |
|
|
<div style="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;"><!-- #F5F7FA --> |
|
|
|
|
|
<template v-for="(item, index) in controlData.control.fillRoles.master" :key="controlData.control.fillRoles.master[index].id"> |
|
|
<template v-for="(item, index) in controlData.control.fillRoles.master" :key="controlData.control.fillRoles.master[index].id"> |
|
|
<AssociatedFormsFillRole |
|
|
<AssociatedFormsFillRole |
|
|
v-model:left-value="controlData.control.fillRoles.master[index].leftValue" |
|
|
v-model:left-value="controlData.control.fillRoles.master[index].leftValue" |
|
|
@ -4533,44 +4533,51 @@ const radioChangeSet = (val:any) => { |
|
|
> |
|
|
> |
|
|
</AssociatedFormsFillRole> |
|
|
</AssociatedFormsFillRole> |
|
|
</template> |
|
|
</template> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
</div> |
|
|
|
|
|
<el-popover |
|
|
|
|
|
v-if="currentChildTableCount>0" |
|
|
<el-popover |
|
|
placement="right-start" |
|
|
v-if="currentChildTableCount>0" |
|
|
title="" |
|
|
placement="right-end" |
|
|
:width="200" |
|
|
title="" |
|
|
trigger="hover" |
|
|
:width="200" |
|
|
content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】" |
|
|
trigger="hover" |
|
|
> |
|
|
content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】; 若【设置筛选条件】,则仅填充满足筛选条件的子表数据" |
|
|
<template #reference> |
|
|
> |
|
|
<el-button style="font-size: large;margin-top: 23px;margin-bottom: 15px;" type="primary" link append-to-body="true" modal="true" @click="addChildFillRole">十 子表填充规则</el-button> |
|
|
<template #reference> |
|
|
</template> |
|
|
<el-button style="font-size: large;margin-top: 3px;margin-bottom: 15px;" type="primary" link append-to-body="true" modal="true" @click="addChildFillRole">十 子表填充规则</el-button> |
|
|
</el-popover> |
|
|
</template> |
|
|
<div v-if="currentChildTableCount>0" style="max-height: 330px;overflow-y:auto;padding-top: 7px;"> |
|
|
</el-popover> |
|
|
<template v-for="(item, index) in controlData.control.fillRoles.child" :key="controlData.control.fillRoles.child[index].id"> |
|
|
<div v-if="currentChildTableCount>0"><!-- asfasfChildTableList --> |
|
|
<AssociatedFormsChildFillRole |
|
|
<template v-for="(item, index) in controlData.control.fillRoles.child" :key="controlData.control.fillRoles.child[index].id"> |
|
|
v-model:selected-child-table="controlData.control.fillRoles.child[index].tableKey" |
|
|
<AssociatedFormsChildFillRole |
|
|
v-model:filter-condition="controlData.control.fillRoles.child[index].filterCondition" |
|
|
v-model:selected-child-table="controlData.control.fillRoles.child[index].tableKey" |
|
|
v-model:child-roles = "controlData.control.fillRoles.child[index].childRoles" |
|
|
:current-key="controlData.control.fillRoles.child[index].id" |
|
|
:asfasf-field-tree="asfasfFieldTree" |
|
|
:child-table-list="asfasfChildTableList" |
|
|
:tree-default-props="treeDefaultProps" |
|
|
@del-role = "delChildRole" |
|
|
:filter-node="filterNode" |
|
|
> |
|
|
:handle-field-tree-contextmenu-range="handleFieldTreeContextmenuRange" |
|
|
</AssociatedFormsChildFillRole> |
|
|
:org-and-man-tree="orgAndManTree" |
|
|
</template> |
|
|
:handle-org-tree-contextmenu-range = "handleOrgTreeContextmenuRange" |
|
|
</div> |
|
|
:role-tree="roleTree" |
|
|
|
|
|
:handle-role-tree-contextmenu-range="handleRoleTreeContextmenuRange" |
|
|
|
|
|
:associated-forms-current-form-field-tree= "associatedFormsCurrentFormFieldTree" |
|
|
|
|
|
:current-key="controlData.control.fillRoles.child[index].id" |
|
|
|
|
|
:child-table-list="asfasfChildTableList" |
|
|
|
|
|
@del-role = "delChildRole" |
|
|
|
|
|
> |
|
|
|
|
|
</AssociatedFormsChildFillRole> |
|
|
|
|
|
</template> |
|
|
</div> |
|
|
</div> |
|
|
</template> |
|
|
</template> |
|
|
<template #footer> |
|
|
<template #footer> |
|
|
<div class="dialog-footer"> |
|
|
<div class="dialog-footer"> |
|
|
<!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> --> |
|
|
<!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> --> |
|
|
<el-button type="primary" @click="handleDetermineFillRoles"> |
|
|
<el-button type="primary" @click="handleDetermineFillRoles"> |
|
|
确定 |
|
|
确定 |
|
|
</el-button> |
|
|
</el-button> |
|
|
</div> |
|
|
</div> |
|
|
</template> |
|
|
</template> |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|