Browse Source

关联表单-数据填充规则-v0.24

lwx_v6
liwenxuan 1 year ago
parent
commit
6e0627d7e3
  1. 4
      src/components/DesignForm/formControlPropertiNew.vue
  2. 48
      src/widget/associatedforms/associatedFormsChildFillRole.vue
  3. 4
      src/widget/associatedforms/associatedFormsFillRole.vue

4
src/components/DesignForm/formControlPropertiNew.vue

@ -4515,11 +4515,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: 800px" width="80%" > <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'">
<div style="height:600px;border:1px solid white;overflow-y:auto;"> <div style="height:300px;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> <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: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;"><!-- #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">

48
src/widget/associatedforms/associatedFormsChildFillRole.vue

@ -1,29 +1,31 @@
<template> <template>
<div style="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;"> <div style="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;padding-top: 16px;">
<el-button :icon="Close" size="small" circle type="info" plain style="float: right;margin-top: -22px;margin-right: -22px" @click="delRole"/> <el-button :icon="Close" size="small" circle type="info" plain style="float: right;margin-top: -22px;margin-right: -22px" @click="delRole"/>
<el-tree-select <el-tree-select
v-model="selectedChildTable1" v-model="selectedChildTable1"
style="width: 290px;" :data="childTableList" placeholder="请选择关联表单子表" style="width: 290px;" :data="childTableList" placeholder="请选择关联表单子表"
check-strictly :render-after-expand="false" filterable @change="selectedChildTableChanged" /><!-- check-strictly :render-after-expand="false" filterable @change="selectedChildTableChanged" /><!--
<span style="margin-left: 8px;margin-right: 8px;">的值填充到</span> <span style="margin-left: 8px;margin-right: 8px;">的值填充到</span>
<el-tree-select <el-tree-select
v-model="rightValue1" style="width: 290px;" :data="rightTreeSource" v-model="rightValue1" style="width: 290px;" :data="rightTreeSource"
check-strictly :render-after-expand="false" filterable @change="rightChanged" /> check-strictly :render-after-expand="false" filterable @change="rightChanged" />
<Delete style="width: 22px; height: 22px; margin-right: 35px;cursor: pointer; color: #50A6FF;margin-top: 10px; display: block; float:right" @click="delRole" /> --> <Delete style="width: 22px; height: 22px; margin-right: 35px;cursor: pointer; color: #50A6FF;margin-top: 10px; display: block; float:right" @click="delRole" /> -->
<el-button type="primary" @click="innerVisible = true"> <!-- <el-button type="primary" @click="innerVisible = true">
open open
</el-button> </el-button> -->
<!-- <el-button v-if="selectedChildTable1===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataRangeDialoghandle" >设置筛选条件选填</el-button>
<div v-if="selectedChildTable1!==''" style="width:100%; cursor: pointer;" @click="associatedFormsDataRangeDialoghandle" v-html="controlData.control.dataRangeConditionHtml"></div> --> <el-button style="padding-top: 5px; width: 290px;margin-left: 85px;height: 30px;" type="info" plain append-to-body="true" modal="true" @click="filterConditionDialoghandle = true" >设置筛选条件选填</el-button>
</div> <!-- <div v-if="selectedChildTable1!==''" style="width:100%; cursor: pointer;" @click="associatedFormsDataRangeDialoghandle" v-html="controlData.control.dataRangeConditionHtml"></div> -->
</div>
<el-dialog
v-model="innerVisible" <el-dialog
v-model="filterConditionDialoghandle"
width="500" width="500"
title="Inner Dialog" :show-close="true"
title="筛选条件"
append-to-body append-to-body
> >
{{ currentKey }} {{ currentKey }}
@ -33,7 +35,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { Close } from '@element-plus/icons-vue' import { Close } from '@element-plus/icons-vue'
const innerVisible = ref(false) const filterConditionDialoghandle = ref(false)
const props = defineProps({ const props = defineProps({
childTableList: { childTableList: {
type: Object, type: Object,

4
src/widget/associatedforms/associatedFormsFillRole.vue

@ -2,11 +2,11 @@
<div style="margin-bottom: 15px; height: 40px; line-height: 40px;"> <div style="margin-bottom: 15px; height: 40px; line-height: 40px;">
<el-tree-select <el-tree-select
v-model="leftValue1" style="width: 290px;" :data="leftTreeSource" placeholder="关联表单主表字段" v-model="leftValue1" style="width: 270px;" :data="leftTreeSource" placeholder="关联表单主表字段"
check-strictly :render-after-expand="false" filterable @change="leftChanged" /> check-strictly :render-after-expand="false" filterable @change="leftChanged" />
<span style="margin-left: 8px;margin-right: 8px;">的值填充到</span> <span style="margin-left: 8px;margin-right: 8px;">的值填充到</span>
<el-tree-select <el-tree-select
v-model="rightValue1" style="width: 290px;" :data="rightTreeSource" v-model="rightValue1" style="width: 270px;" :data="rightTreeSource"
check-strictly :render-after-expand="false" placeholder="当前表单字段" filterable @change="rightChanged" /> check-strictly :render-after-expand="false" placeholder="当前表单字段" filterable @change="rightChanged" />
<Delete style="width: 22px; height: 22px; margin-right: 35px;cursor: pointer; color: #50A6FF;margin-top: 10px; display: block; float:right" @click="delRole" /> <Delete style="width: 22px; height: 22px; margin-right: 35px;cursor: pointer; color: #50A6FF;margin-top: 10px; display: block; float:right" @click="delRole" />
</div> </div>

Loading…
Cancel
Save