diff --git a/src/route/proj/edit/ProjEditStep2.tsx b/src/route/proj/edit/ProjEditStep2.tsx
index 98409ae..1722cb0 100644
--- a/src/route/proj/edit/ProjEditStep2.tsx
+++ b/src/route/proj/edit/ProjEditStep2.tsx
@@ -1,16 +1,17 @@
import './proj-edit-step.css';
-import { Breadcrumb, Cascader, Col, DatePicker, Flex, message, Modal, Row, Spin, Select, Table, Space } from "antd";
+import { Breadcrumb, Radio, Cascader, Col, DatePicker, Flex, message, Modal, Row, Spin, Select, Table, Space } from "antd";
import { FolderAddOutlined } from '@ant-design/icons';
import locale from 'antd/es/date-picker/locale/zh_CN';
import { Link, useNavigate, useParams } from "react-router-dom";
import { useEffect, useState } from "react";
-import { get, put } from "../../../util/AjaxUtils.ts";
+import { get, put, post, del, downloadUrl } from "../../../util/AjaxUtils.ts";
import { Button, Form, Input } from 'antd';
import { AxiosResponse } from "axios";
import dayjs, { Dayjs } from 'dayjs';
import type { SearchProps } from 'antd/es/input/Search';
// import type { TableColumnsType } from 'antd';
import { ITree } from "../../../interfaces/dict/IDict.ts";
+
const { Search } = Input;
const { Column } = Table;
// 基本信息文件类型
@@ -29,14 +30,28 @@ type BelongPeopleType = {
authorNation: string;
authorProvince: string;
authorEstablishDate: Dayjs;
+ authorType: string;
+ nameEn: string;
+ isCrcAccount: string;
+ crcAccountPassword: string;
+ crcAccountUsername: string;
}
-interface DataType {
- key: React.Key;
- name: string;
- age: number;
- address: string;
- select: boolean;
+type ContactType = {
+ csaNo: string
+ gmtCreate: string
+ gmtModified: string
+ name: string
+ phone: string
+ projContactId: string
+ email: string
}
+// interface DataType {
+// key: React.Key;
+// name: string;
+// age: number;
+// address: string;
+// select: boolean;
+// }
interface Option {
value?: string | number | null;
label: React.ReactNode;
@@ -52,96 +67,74 @@ export default function ProjEditStep2() {
const [messageApi, contextHolder] = message.useMessage();
const [formInfo] = Form.useForm();
const [formBelong] = Form.useForm();
+ const [formContact] = Form.useForm()
const [loading, setLoading] = useState(false);
const [isEditModalOpen, setIsEditModalOpen] = useState(false);
const [isNewBelongOpen, setIsNewBelongOpen] = useState(false)
+ const [isContantOpen, steIsContantOpen] = useState(false)
const height = window.innerHeight - 220;
const dateFormat = 'YYYY年MM月DD日';
+ // 页面显示的所属者信息
+ const [authorName,setauthorName] = useState('')
+ const [authorIdCardType,setauthorIdCardType]= useState('')
+ const [authorIdCard,setauthorIdCard]= useState('')
+ const [authorType,setauthorType] = useState('')
+ // 所属者搜索关键字
+ // const [keywords, setKeyWords] = useState('')
+ const [type, setType] = useState('')
// 表格第几行数据
// const [clom, setClom] = useState('')
// 著作人搜索
const belongPeopleSearch: SearchProps['onSearch'] = (value, _e, info) => (
console.log(info?.source, value),
- alert(value)
+ // setKeyWords(value),
+ getSearchProjOwnerList(value, type)
);
// 申请人信息搜索 applicantPeopleSearch
const applicantPeopleSearch: SearchProps['onSearch'] = (value, _e, info) => (
console.log(info?.source, value),
- alert(value)
+ // alert(value),
+ getSearchProjContactList(value)
);
// 表格相关
// rowSelection object indicates the need for row selection
- const rowSelection = {
+ // 所属者表格选择触发
+ const belongRowSelection = {
// selectedRowKeys: React.Key[]
- onChange: (selectedRowKeys: React.Key[], selectedRows: DataType[]) => {
+ onChange: (selectedRowKeys: React.Key[], selectedRows: BelongDataType[]) => {
console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
// setClom(String(selectedRowKeys))
- setSelectedKeyst(selectedRowKeys)
+ // setbelongselectedKeys(selectedRowKeys)
+ },
+
+ };
+ // 联系人表格选择触发
+ const ContantRowSelection = {
+ // selectedRowKeys: React.Key[]
+ onChange: (selectedRowKeys: React.Key[], selectedRows: ContactDataType[]) => {
+ console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+ // setClom(String(selectedRowKeys))
+ // setSelectedKeyst(selectedRowKeys)
},
};
const datanew = []
- // 所属着表格数据
- const [tableBelongData, setTableBelongData] = useState([])
- const data: DataType[] = [
- {
- key: '1',
- name: 'John Brown',
- age: 32,
- address: 'New York No. 1 Lake Park',
- select: false
- },
- {
- key: '2',
- name: 'Jim Green',
- age: 42,
- address: 'London No. 1 Lake Park',
- select: true
-
- },
- {
- key: '3',
- name: 'Joe Black',
- age: 32,
- address: 'Sydney No. 1 Lake Park',
- select: false
-
- },
- {
- key: '4',
- name: 'Disabled User',
- age: 99,
- address: 'Sydney No. 1 Lake Park',
- select: false
-
- },
- {
- key: '5',
- name: '嘻嘻',
- age: 99,
- address: 'Sydney No. 1 Lake Park',
- select: false
-
- },
- {
- key: '6',
- name: '呵呵',
- age: 99,
- address: 'Sydney No. 1 Lake Park',
- select: false
-
- },
+ // 所属人表格数据
+ const [tableBelongData, setTableBelongData] = useState([])
+ // 联系人表格数据
+ const [tableContactData, setTableContactData] = useState([])
-
- ];
- const [selectedKeys, setSelectedKeyst] = useState(data.filter(item => item.select).map(item => item.key))
// const selectedKeys = data.filter(item => item.select).map(item => item.key);
- console.log('selectedKeys:', selectedKeys);
-
- // 创建所属者弹窗数据
+ // console.log('selectedKeys:', selectedKeys);
+ // 是否提供中国版账号
+ // 所属者id 关键字
+ const [projOwnerId, setProjOwnerId] = useState('')
+ // 联系人id 关键字
+ const [contactId, setContactId] = useState('')
+ // 所属者弹窗数据
const [belongTitle, setbelongTitle] = useState('')
const [areaArray, setAreaArray] = useState([]);
const listArea = (pId: string) => {
@@ -160,36 +153,72 @@ export default function ProjEditStep2() {
})
})
}
+ // 联系热弹窗数据
+ const [contactTitle, setContactTitle] = useState('')
-
- // 验证创建著作人表单信息
+ // 著作人表单信息 点击确定
const handleOk = () => {
formBelong.validateFields().then(() => {
// 如果验证通过，则执行确认操作
// 这里可以放置你的确认操作逻辑
- // alert(formBelong.getFieldValue('authorName'));
+ if (belongTitle === '编辑所属者') {
+ upProjOwner()
+ }
+ if (belongTitle === '创建所属者') {
+ newProjOwner()
+ }
// 关闭 弹窗
- setIsNewBelongOpen(false)
+ // setIsNewBelongOpen(false)
// 初始化数据
formBelong.resetFields(); // 重置表单字段为初始值
- // alert('嘻嘻')
}).catch(() => {
// 如果验证不通过，可以根据需要处理错误信息
// (errorInfo);
});
};
+ // 联系人人表单信息 点击确定
+ const contactHandleOk = () => {
+ // alert('联系热确定')
+ formContact.validateFields().then(() => {
+ // 如果验证通过，则执行确认操作
+ // 这里可以放置你的确认操作逻辑
+ if (contactTitle === '编辑联系人') {
+ upContact()
+ }
+ if (contactTitle === '创建联系人') {
+ newContact()
+ }
+ // 关闭 弹窗
+ // setIsNewBelongOpen(false)
+ // 初始化数据
+ formContact.resetFields(); // 重置表单字段为初始值
-
- useEffect(() => {
- // 基本信息页面信息
+ }).catch(() => {
+ // 如果验证不通过，可以根据需要处理错误信息
+ // (errorInfo);
+ });
+ };
+ // 从基本信息中获取到的两个表格默认选择的id 所属者id 联系人id
+ const [authorId, setAuthorId] = useState('')
+ const [applyConcatId, setApplyConcatId] = useState('')
+ // const [belongselectedKeys,setbelongselectedKeys] = useState(tableBelongData.filter(item => item.projOwnerId === authorId).map(item => item.projOwnerId));
+ // 获取页面基本信息信息
+ const getEditstep = () => {
get({
messageApi,
url: `/api/proj/get/edit-step2/${pathParams.projId}`,
onSuccess({ data }: AxiosResponse) {
- // console.log('基本信息',data);
+ // 获取默认所属人信息
+ setauthorName(data.authorName)
+ setauthorIdCardType(data.authorIdCardType)
+ setauthorIdCard(data.authorIdCard)
+ setauthorType(data.authorType)
+ console.log('基本信息', data);
+ setAuthorId(data.authorId)
+ setApplyConcatId(data.applyConcatId)
formInfo.setFieldsValue({
projSubName: data.projSubName,
projVersion: data.projVersion,
@@ -199,32 +228,199 @@ export default function ProjEditStep2() {
})
}
})
- // 所属者信息
+ }
+ // 获取所属者表格
+ const getProjOwnerList = () => {
get({
messageApi,
- url: `/api/proj/get/edit-step4/${pathParams.projId}`,
- onSuccess({data}: AxiosResponse) {
- console.log('所属者信息',data);
-
- }
- })
- // 所属者表格
- get({
- messageApi,
- // url: `/api/proj/get/edit-step2/${pathParams.projId}`,
-
- url: `/api/proj-owner/listpage`,
- // config: {
- // params: {
- // }
- // },
+ url: `/api/proj-owner/list/self`,
onSuccess({ data }: AxiosResponse) {
console.log('所属者表格', data);
+ setTableBelongData(data)
+ }
+ })
+ }
+ // 获取联系人表格
+ const getProjContactList = () => {
+ get({
+ messageApi,
+ url: `/api/proj-contact/list/self`,
+ onSuccess({ data }: AxiosResponse) {
+ console.log('联系人表格', data);
+ // setTableBelongData(data)
+ setTableContactData(data)
+ }
+ })
+ }
+ // 获取所属表格 带搜索
+ const getSearchProjOwnerList = (keywords: any, type: any) => {
+ get({
+ messageApi,
+ url: `/api/proj-owner/list/self?keywords=${keywords}&type=${type}`,
+ onSuccess({ data }: AxiosResponse) {
+ console.log('搜索所属者表格', data);
+ setTableBelongData(data)
+ }
+ })
+ }
+ // 获取联系人表格 带搜索
+ const getSearchProjContactList = (keywords: any) => {
+ get({
+ messageApi,
+ url: `/api/proj-contact/list/self?keywords=${keywords}`,
+ onSuccess({ data }: AxiosResponse) {
+ // console.log('联系人表格', data);
+ // setTableBelongData(data)
+ setTableContactData(data)
+ }
+ })
+ }
+ // 编辑所属者
+ const upProjOwner = () => {
+ const crcAccountPassword = Number(formBelong.getFieldValue('isCrcAccount')) == 1 ? formBelong.getFieldValue('crcAccountPassword') : ''
+ const crcAccountUsername = Number(formBelong.getFieldValue('isCrcAccount')) == 1 ? formBelong.getFieldValue('crcAccountUsername') : ''
+ put({
+ messageApi,
+ url: `/api/proj-owner/update/${projOwnerId}`,
+ body: {
+ crcAccountPassword: crcAccountPassword,
+ crcAccountUsername: crcAccountUsername,
+ idCardNo: formBelong.getFieldValue('authorIdCard'),
+ idCardType: formBelong.getFieldValue('authorIdCardType'),
+ isCrcAccount: Number(formBelong.getFieldValue('isCrcAccount')),
+ name: formBelong.getFieldValue('authorName'),
+ nameEn: formBelong.getFieldValue('nameEn') || '',
+ provinceCity: formBelong.getFieldValue('authorProvince').join(','),
+ type: formBelong.getFieldValue('authorType'),
+ },
+ onBefore() {
+ },
+ onSuccess() {
+ // console.log(data);
+ // alert('编辑成功')
+ messageApi.open({
+ type: 'success',
+ content: '编辑成功'
+ })
+ getProjOwnerList()
+
+ setIsNewBelongOpen(false)
+
+ },
+ onFinally() {
+ }
+ })
+ }
+ // 创建所属者
+ const newProjOwner = () => {
+ const crcAccountPassword = Number(formBelong.getFieldValue('isCrcAccount')) == 1 ? formBelong.getFieldValue('crcAccountPassword') : ''
+ const crcAccountUsername = Number(formBelong.getFieldValue('isCrcAccount')) == 1 ? formBelong.getFieldValue('crcAccountUsername') : ''
+ post({
+ messageApi,
+ url: '/api/proj-owner/save',
+ body: {
+ crcAccountPassword: crcAccountPassword,
+ crcAccountUsername: crcAccountUsername,
+ idCardNo: formBelong.getFieldValue('authorIdCard'),
+ idCardType: formBelong.getFieldValue('authorIdCardType'),
+ isCrcAccount: Number(formBelong.getFieldValue('isCrcAccount')),
+ name: formBelong.getFieldValue('authorName'),
+ nameEn: formBelong.getFieldValue('nameEn'),
+ provinceCity: formBelong.getFieldValue('authorProvince').join(','),
+ type: formBelong.getFieldValue('authorType'),
+ },
+ onBefore() {
+
+ },
+ onSuccess() {
+ messageApi.success('提交成功')
+ getProjOwnerList()
+
+ setIsNewBelongOpen(false)
+
+ },
+ onFinally() {
+ }
+ })
+ }
+ // 客服二维码
+ const [imgUrl, setImgUrl] = useState('')
+
+ // 点击创建联系热人获取随机客服
+ const getCas = () => {
+ get({
+ messageApi,
+ url: `/api/csa/get`,
+ onSuccess({ data }: AxiosResponse) {
+ console.log('随机客服信息二维码', data.casQrCode);
+ formContact.setFieldsValue({
+ csaNo: data.csaNo
+ });
+ if (data.casQrCode) {
+ const imgUrl = downloadUrl(data.casQrCode);
+ console.log('图片地址', imgUrl);
+ setImgUrl(imgUrl)
+ }
}
})
+ }
+ // 创建联系人
+ const newContact = () => {
+ post({
+ messageApi,
+ url: '/api/proj-contact/save',
+ body: {
+ csaNo: formContact.getFieldValue('csaNo'),
+ name: formContact.getFieldValue('name'),
+ phone: formContact.getFieldValue('phone'),
+ email: formContact.getFieldValue('email'),
+ },
+ onBefore() {
+ },
+ onSuccess() {
+ messageApi.success('提交成功')
+ getProjContactList()
+ steIsContantOpen(false)
+ },
+ onFinally() {
+ }
+ })
+ }
+ // 编辑联系人
+ const upContact = () => {
+ put({
+ messageApi,
+ url: `/api/proj-contact/update/${contactId}`,
+ body: {
+ csaNo: formContact.getFieldValue('csaNo'),
+ name: formContact.getFieldValue('name'),
+ phone: formContact.getFieldValue('phone'),
+ email: formContact.getFieldValue('email'),
+ },
+ onBefore() {
+ },
+ onSuccess() {
+ // console.log(data);
+ // alert('编辑成功')
+ messageApi.open({
+ type: 'success',
+ content: '编辑成功'
+ })
+ getProjContactList()
+ steIsContantOpen(false)
+
+ },
+ onFinally() {
+ }
+ })
+ }
+ useEffect(() => {
+ getEditstep()
+ getProjOwnerList()
+ getProjContactList()
listArea('0').then(data => {
const options: Option[] = data.map(item => {
return {
@@ -237,6 +433,7 @@ export default function ProjEditStep2() {
})
setAreaArray(options);
});
+
}, [])
return (
@@ -328,19 +525,6 @@ export default function ProjEditStep2() {
- {/* * 公司名称:
@@ -360,16 +544,6 @@ export default function ProjEditStep2() {
* 公司英文名称:
@@ -413,19 +587,22 @@ export default function ProjEditStep2() {
+ {/*
+
*/}
+
+
当前所属者:
+ {authorName}/{authorIdCardType}/{authorIdCard}
{/* 表格 */}
@@ -447,53 +628,84 @@ export default function ProjEditStep2() {
-
+