From 36bbef41a65f47b35993ac1d6bc1dd6a8430ea45 Mon Sep 17 00:00:00 2001 From: zhengpengju Date: Fri, 25 Mar 2022 21:35:49 +0800 Subject: [PATCH] fix --- admin/src/pages/training/option/index.tsx | 69 ++++++----------------- 1 file changed, 18 insertions(+), 51 deletions(-) diff --git a/admin/src/pages/training/option/index.tsx b/admin/src/pages/training/option/index.tsx index 84cbf59..e12574b 100644 --- a/admin/src/pages/training/option/index.tsx +++ b/admin/src/pages/training/option/index.tsx @@ -180,9 +180,11 @@ const TableList: React.FC = () => { //mode: "multiple", multiple: true, treeNodeFilterProp: 'name', + labelInValue: true, fieldNames: { label: 'name', - //value: 'id' + key: 'id', + value: 'id' }, }, formItemProps: { @@ -195,6 +197,7 @@ const TableList: React.FC = () => { }, dataIndex: 'org_names', request: async () => { + /* const Value = await queryValueByKey({}); const orgId = Value['common.org.id'] ? Value['common.org.id'] : 0; // 平台全局设置 const tree = await queryOrgTree({ @@ -202,12 +205,12 @@ const TableList: React.FC = () => { org_type: 2, //school_type: 1, }) - setOrgTree(tree.table_List) + //setOrgTree(tree.table_List) console.log('orgId', orgId) console.log('tree.table_List', tree.table_List) + return getJsonTree(tree.table_List, orgId) + */ let treeData = [] - //return getJsonTree(tree.table_List, orgId) - // 获取省级以下的全部机构单位 const {table_List} = await getEduUnitList({ area_id: provinceId, @@ -229,12 +232,6 @@ const TableList: React.FC = () => { org_type: 1, get_next: 1 }); - treeData = cityData?.map(item=>({ - pId: Number(item?.pId), - name: item?.name, - id: Number(item?.id) - })); - const areaData = [] //const areaIds = []; // 区域Id数组，用于过滤接口返回的非区下单位的垃圾数据 for(let i=0; i< cityData?.length; i++){ @@ -243,19 +240,17 @@ const TableList: React.FC = () => { org_type: 2, get_next: 1 }); - - areaData.push(..._areaData?.map(item=>({ - pId: Number(item?.pId), - name: item?.name, - id: Number(item?.id), - children: [{ name:'hello', id:0}]//unitData?.filter(unit=>(Number(unit?.pId) === Number(item?.id))) - }))) - //areaIds.push(..._areaData?.map(item=>(Number(item?.id)))) + treeData.push({name:cityData[i]?.name, id:cityData[i]?.id, + children: _areaData?.map(item=>({ + pId: Number(item?.pId), + name: item?.name, + id: Number(item?.id), + children: unitData?.filter(unit=>(Number(unit?.pId) === Number(item?.id))) + })) + }) } - treeData.push(...areaData) console.log('tree',treeData) - console.log('json', getJsonTree(treeData, provinceId)) - return getJsonTree(treeData, provinceId) + return treeData }, sorter: false, hideInForm: false, @@ -338,7 +333,6 @@ const TableList: React.FC = () => { dataIndex: 'option', valueType: 'option', render: (_, record) => [ - { @@ -348,9 +342,6 @@ const TableList: React.FC = () => { > 编辑 , - - - { handleRemove([{ key: record?.train_id }]); // 调用批量删除函数（如果接口不支持批量需要在service中处理） @@ -360,8 +351,6 @@ const TableList: React.FC = () => { > 删除 - - ], }, ]; @@ -407,10 +396,7 @@ const TableList: React.FC = () => { } // delete value.date_time console.log('search', value); - const _data = await queryTrainList(value); - - return { current: _data?.page_number, data: _data?.data?.list, @@ -542,10 +528,7 @@ const TableList: React.FC = () => { labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} request={async () => { - const { data } = await querySubjectView({ train_id: currentRow?.train_id }); - - data.date_time = [currentRow.start_time, currentRow.end_time] data.org_names = [] data.target_list.map((e) => { @@ -557,7 +540,6 @@ const TableList: React.FC = () => { }) console.log("edit", data); - return data }} @@ -565,19 +547,16 @@ const TableList: React.FC = () => { // 表单处理 //console.log('columns:', columns); console.log('values1:', values, values.org_names.value); - //return false; - // values.attachment_json.response.file.response.url - // 处理机构数据。直接编辑与回显结构不够 let tree = [] if (typeof values.org_names[0] === 'number') { - // tree = values.org_names + // tree = values.org_names console.log('true values.org_names', tree, values) + tree = orgTree?.filter((item, idx, self) => { return (values?.org_names?.indexOf(item?.id) !== -1) }); console.log("tree,1111", tree); - tree.map((e, i) => { tree[i].org_id = e.id tree[i].org_name = e.name @@ -586,7 +565,6 @@ const TableList: React.FC = () => { delete tree[i].pId }) } else { - values.org_names.map((e) => { tree.push({ org_type: 2, @@ -596,18 +574,10 @@ const TableList: React.FC = () => { }) } - - - - console.log(321); console.log(tree, 'tree'); - - - const _data = { ...values, - end_time: values.date_time[1], start_time: values.date_time[0], target_list_json: JSON.stringify(tree), @@ -617,9 +587,7 @@ const TableList: React.FC = () => { delete _data.org_names // delete params.course_time // delete params.examination_time - console.log('_data', _data); - const res = await saveTrain(_data); // console.log(res, 'ressss'); if (res.code === 2000) { @@ -628,7 +596,6 @@ const TableList: React.FC = () => { } else { message.error(res.msg); } - }} submitter={{ render: (props, doms) => (