Browse Source

选择用户数据范围 根据组织设置可选用户

qin_26
liwenxuan 2 months ago
parent
commit
e05205493f
  1. 4
      src/components/DesignForm/assembly/index.ts
  2. 79
      src/components/DesignForm/formControlPropertiNew.vue
  3. 2
      src/widget/lowcodetransfer/lowcodeTransfer.vue

4
src/components/DesignForm/assembly/index.ts

@ -1043,7 +1043,9 @@ export default [
iconFont: 'fa-user-o',
control: {
// 组件所有属性
modelValue: ''
modelValue: '',
range:[],
queryBy:'org'
},
config: {}, // 其他配置信息
styles: {

79
src/components/DesignForm/formControlPropertiNew.vue

@ -15,6 +15,8 @@ import { ElMessage } from "element-plus";
import { formatNumber } from "@/api/DesignForm/utils";
import { getOrgTreeList } from "@/api/hr/org/index";
import { orgInfo } from "@/api/hr/org/type";
import {
PublicAtrr,
formStruct,
@ -851,6 +853,14 @@ const attrList = computed(() => {
vIf: state.isSearch,
vShow: ["orgCentent"],
},
{
label: "数据范围",
value: config.expandUser,
path: "config.expand-user",
type: "expand-user",
vIf: state.isSearch,
vShow: ["expand-user"],
},
/* {
label: "添加时间水印",
value: config.lowcodeImage,
@ -2068,6 +2078,8 @@ watch(
.toString();
}else if(controlData.value.type === "orgCentent"){
haveOrgTreeInfo()
}else if(controlData.value.type === "expand-user"){
}
// start
// console.log(controlData.value.name)
@ -2386,6 +2398,10 @@ import AssociatedFormsTinyace from "@/widget/associatedforms/associatedFormsTiny
import AssociatedFormsTinyaceRange from "@/widget/associatedforms/associatedFormsTinyaceRange.vue";
import AssociatedFormsFillRole from "@/widget/associatedforms/associatedFormsFillRole.vue";
import AssociatedFormsChildFillRole from "@/widget/associatedforms/associatedFormsChildFillRole.vue";
import TransferSelectUserRange from "@/widget/lowcodetransfer/lowcodeTransfer1.vue";
const transferSelectUserRangeData = ref({"type":"lowcodeTransfer","unitName":"请选择","iconFont":"fa-arrows-h","control":{"modelValue":[],"fixedOptions":[{"id":"thefirstrootnode","label":"根节点1","unitName":"","disabled":false,"children":[]},{"id":"thesecondrootnode","label":"根节点2","unitName":"","disabled":false,"children":[]}]},"config":{"transferName":"请选择","transferDataSource":"数据源","apiUrl":"/javasys/lowCode/transfer/getOrgAndManTree","method":"post"},"name":"lowcodeTransfer1758525493710","item":{"label":"穿梭框"},"styles":{"divStyle":{"divbox":"all","transparency":100},"labelStyle":{"divbox":"all","transparency":100},"inputStyle":{"transparency":100}}})
const treeDefaultProps = {
//
@ -4044,6 +4060,31 @@ watch(
}
);
//
const userRangeDialogFlag = ref(false)
function handleUserRangeDialogFlag(){
userRangeDialogFlag.value = true
}
function checkedIdListChangedIndex(val:any){
//console.log(val)
controlData.value.control.range = val
}
let componentKey = 0
function reRenderComponent() {
componentKey++;
}
function handleExpandTabChange(){
controlData.value.control.range = []
}
/**
@ 作者: 秦东
@ 时间: 2024-12-23 10:39:48
@ -4479,6 +4520,13 @@ const aiAgentList = ref([
</el-row>
<el-row v-else-if="item.type === 'expand-user'">
{{controlData.control.range}}
<el-button @click="handleUserRangeDialogFlag">可选用户设置</el-button>
</el-row>
@ -5632,6 +5680,37 @@ const aiAgentList = ref([
</el-tab-pane>
</el-tabs>
</div>
<el-dialog
v-model="userRangeDialogFlag"
title="可选用户设置"
top="20px"
style="margin-top:70px;margin-left:270px;height:650px;width:750px"
>
<el-tabs v-model="controlData.control.queryBy" class="demo-tabs" @tab-change="handleExpandTabChange" >
<el-tab-pane label="根据组织筛选" name="org">
<TransferSelectUserRange v-if="controlData.control.queryBy=='org'" :key="componentKey" :data="transferSelectUserRangeData" :selected-value="controlData.control.range" @checked-id-list-changed="checkedIdListChangedIndex" @re-render-component="reRenderComponent" />
</el-tab-pane>
<el-tab-pane label="根据角色筛选" name="role">
<div style="width: 600px;">
根据角色筛选
</div>
</el-tab-pane>
</el-tabs>
<div style="position: absolute; top:587px;left:616px">
<el-button type="primary" @click="userRangeDialogFlag = false">
确定
</el-button>
</div>
</el-dialog>
<!-- 轮播图设置弹窗 20240122 start -->
<el-dialog

2
src/widget/lowcodetransfer/lowcodeTransfer.vue

@ -478,7 +478,7 @@ const filterNode = (value, data, node) => {
}
// tag
const handleCloseTag = (tag) => {
checkedIdList.value = checkedIdList.value.filter(item => item !== tag.data.id);
if (!treeRef?.value) return
checkList.value = checkList.value.filter(item => {
treeRef.value.setChecked(tag, false)

Loading…
Cancel
Save