|
|
|
@ -460,20 +460,14 @@ const TableList: React.FC = () => {
|
|
|
|
|
// 表单处理
|
|
|
|
|
//console.log('columns:', columns);
|
|
|
|
|
console.log('values1:', values, orgTree);
|
|
|
|
|
|
|
|
|
|
const tree = orgTree.filter((item, idx, self) => {
|
|
|
|
|
return (values.org_names.indexOf(item.id) !== -1)
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
tree.map((e, i) => {
|
|
|
|
|
tree[i].org_id = e.id
|
|
|
|
|
tree[i].org_name = e.name
|
|
|
|
|
delete tree[i].id
|
|
|
|
|
delete tree[i].name
|
|
|
|
|
delete tree[i].pId
|
|
|
|
|
const tree = []
|
|
|
|
|
values.org_names.map((e) => {
|
|
|
|
|
tree.push({
|
|
|
|
|
org_type: 2,
|
|
|
|
|
org_id: e.value,
|
|
|
|
|
org_name: e.label
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
console.log(321);
|
|
|
|
|
console.log(tree, 'tree');
|
|
|
|
|
const _data = {
|
|
|
|
|
...values,
|
|
|
|
|
end_time: values.date_time[1],
|
|
|
|
@ -545,26 +539,9 @@ const TableList: React.FC = () => {
|
|
|
|
|
|
|
|
|
|
onFinish={async (values: any) => {
|
|
|
|
|
// 表单处理
|
|
|
|
|
//console.log('columns:', columns);
|
|
|
|
|
console.log('values1:', values, values.org_names.value);
|
|
|
|
|
// 处理机构数据。直接编辑与回显结构不够
|
|
|
|
|
let tree = []
|
|
|
|
|
if (typeof values.org_names[0] === 'number') {
|
|
|
|
|
// 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
|
|
|
|
|
delete tree[i].id
|
|
|
|
|
delete tree[i].name
|
|
|
|
|
delete tree[i].pId
|
|
|
|
|
})
|
|
|
|
|
} else {
|
|
|
|
|
const tree = []
|
|
|
|
|
values.org_names.map((e) => {
|
|
|
|
|
tree.push({
|
|
|
|
|
org_type: 2,
|
|
|
|
@ -573,9 +550,6 @@ const TableList: React.FC = () => {
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
console.log(321);
|
|
|
|
|
console.log(tree, 'tree');
|
|
|
|
|
const _data = {
|
|
|
|
|
...values,
|
|
|
|
|
end_time: values.date_time[1],
|
|
|
|
@ -585,11 +559,10 @@ const TableList: React.FC = () => {
|
|
|
|
|
}
|
|
|
|
|
delete _data.date_time
|
|
|
|
|
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) {
|
|
|
|
|
handleUpdateModalVisible(false);
|
|
|
|
|
actionRef.current?.reloadAndRest?.();
|
|
|
|
|