diff --git a/src/components/BelongPeople/BelongPeople.tsx b/src/components/BelongPeople/BelongPeople.tsx index 27f8942..e2bc8fc 100644 --- a/src/components/BelongPeople/BelongPeople.tsx +++ b/src/components/BelongPeople/BelongPeople.tsx @@ -293,7 +293,7 @@ export default function BelongPeople(props: propsInfo) { isCrcAccount: Number(formBelong.getFieldValue('isCrcAccount')), name: formBelong.getFieldValue('authorName'), nameEn: formBelong.getFieldValue('nameEn') || '', - provinceCity: formBelong.getFieldValue('authorProvince').join(','), + provinceCity: formBelong.getFieldValue('authorProvince') ? formBelong.getFieldValue('authorProvince').join(',') : '', type: formBelong.getFieldValue('authorType'), }, onBefore() { @@ -330,7 +330,7 @@ export default function BelongPeople(props: propsInfo) { isCrcAccount: Number(formBelong.getFieldValue('isCrcAccount')), name: formBelong.getFieldValue('authorName'), nameEn: formBelong.getFieldValue('nameEn'), - provinceCity: formBelong.getFieldValue('authorProvince').join(','), + provinceCity: formBelong.getFieldValue('authorProvince') ? formBelong.getFieldValue('authorProvince').join(',') : '', type: formBelong.getFieldValue('authorType'), }, onBefore() { @@ -650,7 +650,7 @@ export default function BelongPeople(props: propsInfo) { record.idCardType === 'ID_CARD' ? '身份证' : '营业执照' )} /> - + {/* */} -
+
+ style={{ backgroundColor: 'var(--color-primary)' }} + disabled={idCardFrontImgArray.length > 0}>上传 - - { + */} + {/* { userInfoType == 'PERSONAL' ? ( { if (info.file.status === 'uploading') { @@ -288,25 +405,25 @@ export default function UserEdit(props: IUserEditProps) { }} > + style={{ backgroundColor: 'var(--color-primary)' }} + disabled={idCardBackImgArray.length > 0}>上传 ) : <> } - - + */} + {/* label="证件开始时间" name="idCardStartDate" - rules={[{required: true, message: '请选择证件开始时间'}]} + // rules={[{ required: true, message: '请选择证件开始时间' }]} > @@ -314,72 +431,72 @@ export default function UserEdit(props: IUserEditProps) { label="证件结束时间" name="idCardEndDate" - rules={[{required: true, message: '请选择证件结束时间'}]} + // rules={[{ required: true, message: '请选择证件结束时间' }]} > - - { + */} + {/* { userInfoType == 'ENTERPRISE' ? ( - + label="成立时间" name="establishDate" - rules={[{required: true, message: '请选择成立时间'}]} + // rules={[{ required: true, message: '请选择成立时间' }]} > ) : <> - } - - + } */} + {/* + - + - - + */} + {/* - - - + */} + {/* */} + - - + + {/* */} {contextHolder} ) diff --git a/src/interfaces/proj/ICardProj.ts b/src/interfaces/proj/ICardProj.ts index ede4c3c..289534e 100644 --- a/src/interfaces/proj/ICardProj.ts +++ b/src/interfaces/proj/ICardProj.ts @@ -17,7 +17,8 @@ export interface ICardProjBuy { handleClick(title: string, additional: { pkg: boolean, - videoDemo: boolean + videoDemo: boolean, + urgent:boolean }): void; } @@ -28,5 +29,6 @@ export interface ICardProj { buyArray: ICardProjBuy[]; newArray:ICardProjBodyLine[]; isShow:number - isClickable:number + isClickable:number, + details:string } \ No newline at end of file diff --git a/src/interfaces/proj/IProj.ts b/src/interfaces/proj/IProj.ts index a110960..06da0d4 100644 --- a/src/interfaces/proj/IProj.ts +++ b/src/interfaces/proj/IProj.ts @@ -30,7 +30,8 @@ export enum ProjChargeType { export enum ProjAdditionalType { PKG = 'PKG', - VIDEO_DEMO = 'VIDEO_DEMO' + VIDEO_DEMO = 'VIDEO_DEMO', + URGENT = 'URGENT' } export interface IProjCharge { diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx index eb75c75..5e73c98 100644 --- a/src/layout/head/Head.tsx +++ b/src/layout/head/Head.tsx @@ -36,22 +36,22 @@ export default function Head() { authorId: '', authorProvinceCity: '' }) - + const setValue = () => { // console.log(value); } - const setConcatValue = ()=> { - + const setConcatValue = () => { + } // 联系人弹窗 const [contactModal, setContactModal] = useState(false) - const [concatPeopleInfo,setConcatPeopleInfo] = useState({ - applyConcatId:'', - applyContactCsaNo:'', - applyContactEmail:'', - applyContactName:'', - applyContactPhone:'', - applyContactCompany:'' + const [concatPeopleInfo, setConcatPeopleInfo] = useState({ + applyConcatId: '', + applyContactCsaNo: '', + applyContactEmail: '', + applyContactName: '', + applyContactPhone: '', + applyContactCompany: '' }) useEffect(() => { reloadUser(messageApi, globalDispatchContext).then((data) => { @@ -152,7 +152,7 @@ export default function Head() { {/*
*/}
-
{ +
{ window.open('https://www.aimzhu.com/operator/route/agreementportal/view?agreementId=c0c5683a-bef3-40c3-8395-900a362ea234&title=系统操作流程') }}> 系统操作流程 @@ -178,14 +178,17 @@ export default function Head() {
{ - if (!globalContext.user.hasUserInfo) { + if (!globalContext.user.hasUserInfo ) { messageApi.info('请完善个人信息'); return; } setIsSelfModalOpen(false) + // console.log('用户信息',globalContext.user.hasUserInfo); + }}> { modal.confirm({ @@ -289,7 +292,7 @@ export default function Head() { }}> - {setContactModal(false)} } setConcatPeopleInfo={setConcatPeopleInfo} concatPeopleInfo={concatPeopleInfo} setConcatValue={setConcatValue}> + { setContactModal(false) }} setConcatPeopleInfo={setConcatPeopleInfo} concatPeopleInfo={concatPeopleInfo} setConcatValue={setConcatValue}> {contextHolder} diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index 4ec9b5b..7f0a065 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -32,6 +32,7 @@ export default function Index() { // 关键字 const [keywords, setKeywords] = useState(''); const [type, setType] = useState('') + const [chargeAdditionals,setchargeAdditionals] = useState('') // const indexListContext = useContext(IndexListContext); @@ -348,7 +349,9 @@ export default function Index() { nav('/home', { state: { keyword: value, - name: type + name: type, + chargeAdditionals:chargeAdditionals, + } }) } @@ -359,7 +362,8 @@ export default function Index() { nav('/home', { state: { keyword: '', - name: type + name: type, + chargeAdditionals:chargeAdditionals, } }) } @@ -441,6 +445,7 @@ export default function Index() { nav('/home', { state: { keyword: keywords, + chargeAdditionals:chargeAdditionals, name: value } }) @@ -454,6 +459,32 @@ export default function Index() { ]} defaultValue="" // placeholder={'选择类型'} + /> + @@ -1201,10 +1201,17 @@ export default function ProjEditStep2(props: any) { // label="公司英文名" name="nameEn" - // rules={[{ required: true, message: belongShow == 'PERSONAL' ? '请输入英文名' : '请输入公司英文名称' }]} + // rules={[{ required: true, message: belongShow == 'PERSONAL' ? '请输入英文名' : '请输入公司英文名称' }]} + rules={[ + { required: true, message: belongShow == 'PERSONAL' ? '请输入英文名' : '请输入公司英文名称' }, + { + pattern: /^[A-Za-z]+$/, + message: '请输入正确的英文名' + } + ]} > @@ -1242,7 +1249,7 @@ export default function ProjEditStep2(props: any) {
-
{belongShow == 'PERSONAL' ? '身份证号' : '营业执照号'}:
+
{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'}
// label="证件号" @@ -1250,7 +1257,7 @@ export default function ProjEditStep2(props: any) { rules={[{ required: true, message: '请输入证件号' }]} > @@ -1268,10 +1275,10 @@ export default function ProjEditStep2(props: any) { // label="省市" name="authorProvince" - rules={[{ required: true, message: '请选择省市' }]} + // rules={[{ required: true, message: '请选择省市' }]} > { const targetOption = selectedOptions[selectedOptions.length - 1]; diff --git a/src/route/proj/edit/ProjEditStep2Show.tsx b/src/route/proj/edit/ProjEditStep2Show.tsx index 2af9003..35a8a96 100644 --- a/src/route/proj/edit/ProjEditStep2Show.tsx +++ b/src/route/proj/edit/ProjEditStep2Show.tsx @@ -689,7 +689,7 @@ export default function ProjEditStep2() { record.idCardType === 'ID_CARD' ? '身份证' : '营业执照' )} /> - + {/* */} diff --git a/src/route/proj/edit/proj-edit-step.css b/src/route/proj/edit/proj-edit-step.css index b0fd5c5..9019c21 100644 --- a/src/route/proj/edit/proj-edit-step.css +++ b/src/route/proj/edit/proj-edit-step.css @@ -150,10 +150,11 @@ } .blongsmallTitle { - width: 132px; + width: 140px; text-align: end; /* background-color: #555555; */ margin-right: 10px; + } .blongSmallNameR { diff --git a/src/route/proj/proj-create.css b/src/route/proj/proj-create.css index b687028..e602b8f 100644 --- a/src/route/proj/proj-create.css +++ b/src/route/proj/proj-create.css @@ -20,7 +20,7 @@ display: none; } */ .proj-create .proj { - margin-top: 33px; + margin-top: 20px; } .proj-create .test{ /* height: 30p; */ diff --git a/src/util/AjaxUtils.ts b/src/util/AjaxUtils.ts index 3d817a8..e6656e2 100644 --- a/src/util/AjaxUtils.ts +++ b/src/util/AjaxUtils.ts @@ -3,15 +3,16 @@ import type {MessageInstance} from "antd/es/message/interface"; export const Axios = axios; -axios.defaults.baseURL = 'http://192.168.0.103:7025/copyright'; +axios.defaults.baseURL = 'http://192.168.0.15:7025/copyright'; // axios.defaults.baseURL = 'http://192.168.43.145:7025/copyright'; // axios.defaults.baseURL = 'http://127.0.0.1:7025/copyright'; // axios.defaults.baseURL = 'https://www.aimzhu.com/copyright'; // axios.defaults.baseURL = '/copyright'; // export const WebSocketBaseUrl: string = 'ws://127.0.0.1:7025/copyright'; -export const WebSocketBaseUrl: string = 'ws://192.168.0.103:7025/copyright'; +export const WebSocketBaseUrl: string = 'ws://192.168.0.15:7025/copyright'; // export const WebSocketBaseUrl: string = '/copyright'; export const DevUserId: string = '80d3365e-0597-4988-979e-18ef1c3ec671'; // 18634604067 +// export const DevUserId: string = 'eb9a82a6-6ed3-4ba0-90e6-d836cefff915'; // 15042810561 // export const DevUserId: string = 'c2438eb8-2685-49a9-bf02-5111a5192d96'; // 18647109157 // export const DevUserId: string = '';