diff --git a/api/app/lib/models/user.js b/api/app/lib/models/user.js index 9d7999a..02245a9 100644 --- a/api/app/lib/models/user.js +++ b/api/app/lib/models/user.js @@ -97,7 +97,7 @@ module.exports = dc => { autoIncrement: false }, structure: { - type: DataTypes.STRING, + type: DataTypes.JSON, allowNull: true, defaultValue: null, comment: "结构物", diff --git a/web/client/src/sections/organization/components/userModal.js b/web/client/src/sections/organization/components/userModal.js index 4988b85..443f651 100644 --- a/web/client/src/sections/organization/components/userModal.js +++ b/web/client/src/sections/organization/components/userModal.js @@ -1,7 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { Spin, Card, Modal, TreeSelect, message } from 'antd'; -import ProForm, { ProFormText, ModalForm, ProFormSwitch, ProFormTreeSelect } from '@ant-design/pro-form'; +import ProForm, { ProFormText, ModalForm, ProFormSwitch, ProFormTreeSelect ,ProFormSelect} from '@ant-design/pro-form'; const UserModal = (props) => { const { visible, modalType, depData, onVisibleChange, onConfirm, editData ,tableList} = props @@ -105,10 +105,11 @@ const UserModal = (props) => { /> - { }} fieldProps={{ + mode: 'multiple', fieldNames: { label: 'title', }, @@ -132,7 +134,25 @@ const UserModal = (props) => { return opts }} expandedKeys={["title"]} - /> + /> */} + handleChange(val), + // }} + + request={async () => { + console.log(tableList); + const opts = tableList?.map(i=>({label:i.name,value:i.id})) + return opts + }} + placeholder="请选择结构物" + rules={[{ required: true, message: '结构物不能为空' }]} + /> +