Skip to content

J
jinfa-platform
Commit dec0c946 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

parents 3dd79f80 c1c73f69
Show whitespace changes
Inline Side-by-side
Showing with 492 additions and 118 deletions
src/components/NiceForm/components/AntUpload/index.tsx
View file @ dec0c946
......@@ -133,7 +133,7 @@ const normalizeFileList = fileList => {
...file,
uid: file.uid || `${index}`,
status: getState(file.response) || getState(file),
url: getURL(file) || getURL(file?.response),
url: getURL(file) || getURL(file?.response)|| getURL(file?.response?.data),
thumbUrl: getImageByUrl(
getThumbURL(file) || getThumbURL(file?.response),
{
......
src/pages/member/components/QualitiesUploadFormItem/effects.ts 0 → 100644
View file @ dec0c946
/*
* @Author: XieZhiXiong
* @Date: 2021-06-15 13:38:56
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-15 14:10:11
* @Description: 联动逻辑
*/
import { FormEffectHooks, FormPath } from '@formily/antd';
const {
onFieldInputChange$,
} = FormEffectHooks;
export const useBusinessEffects = (context, actions, fieldName: string) => {
const {
setFieldState,
} = actions;
// 如果勾选了长期有效，则清空 到期日
onFieldInputChange$(`${fieldName}.*.permanent`).subscribe(fieldState => {
const { name, value } = fieldState;
if (value && value.length) {
setFieldState(
FormPath.transform(name, /\d/, $1 => {
return `${fieldName}.${$1}.expireDay`
}),
state => {
state.value = '';
}
);
}
});
// 如果选择了到期日，则清空 有效期
onFieldInputChange$(`${fieldName}.*.expireDay`).subscribe(fieldState => {
const { name, value } = fieldState;
if (value && value.length) {
setFieldState(
FormPath.transform(name, /\d/, $1 => {
return `${fieldName}.${$1}.permanent`
}),
state => {
state.value = [];
}
);
}
});
}
\ No newline at end of file
src/pages/member/components/QualitiesUploadFormItem/index.less
View file @ dec0c946
......@@ -15,3 +15,8 @@
background-color: @descriptions-bg;
}
}
.del-btn {
position: relative;
top: -10px;
}
\ No newline at end of file
src/pages/member/components/QualitiesUploadFormItem/index.tsx
View file @ dec0c946
......@@ -2,12 +2,12 @@
* @Author: XieZhiXiong
* @Date: 2021-06-01 16:13:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-07 16:18:24
* @LastEditTime: 2021-06-15 11:53:20
* @Description: 资质证明上传组件
*/
import React from 'react';
import { Row, Col, Button } from 'antd';
import { PlusOutlined } from '@ant-design/icons';
import { PlusOutlined, CloseCircleOutlined } from '@ant-design/icons';
import { ArrayList } from '@formily/react-shared-components';
import { Schema, SchemaField } from '@formily/antd';
import { toArr, FormPath } from '@formily/shared';
......@@ -16,6 +16,12 @@ import {
} from '@/constants';
import styles from './index.less';
const expireDayTitle = (
<span style={{ marginTop: 40 }}>
到期日
</span>
);
const schema = new Schema({
type: 'object',
properties: {
......@@ -39,6 +45,12 @@ const schema = new Schema({
},
accept: '.doc, .docx, .xls, .xlsx, .pot, .pps, .vsd, .wps, .dps, .pdf, .txt, .png, .jpg, .rar, .zip',
},
'x-rules': [
{
required: true,
message: '请上传资质证明',
},
],
},
MEGA_LAYOUT2: {
type: 'object',
......@@ -46,8 +58,13 @@ const schema = new Schema({
properties: {
expireDay: {
type: 'string',
title: '到期日',
title: expireDayTitle,
'x-component': 'DatePicker',
'x-component-props': {
style: {
marginTop: 20,
},
},
},
permanent: {
type: 'string',
......@@ -75,7 +92,8 @@ const QualitiesUploadFormItem = (props) => {
} = props;
const { colSpan } = (props.props['x-component-props'] || {});
const onAdd = () => mutators.push(schema.getEmptyValue())
const onAdd = () => mutators.push(schema.getEmptyValue());
const onRemove = index => mutators.remove(index);
const span = colSpan ? {
span: colSpan,
......@@ -89,17 +107,29 @@ const QualitiesUploadFormItem = (props) => {
<ArrayList value={value}>
<Row
gutter={{ sm: 44, md: 88, lg: 88 }}
style={{
width: '100%',
}}
>
{toArr(value).map((item, index) => (
<Col key={index} {...span}>
<Row
gutter={50}
align="middle"
>
<Col flex={1}>
<SchemaField
path={FormPath.parse(path).concat(index)}
schema={schema}
/>
</Col>
<Col>
<Button
onClick={() => onRemove(index)}
type="link"
icon={<CloseCircleOutlined style={{ fontSize: 20 }} />}
className={styles['del-btn']}
/>
</Col>
</Row>
</Col>
))}
{editable && (
<Col {...span}>
......
src/pages/member/memberPrComingClassify/detail.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-25 14:35:56
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-03 10:52:22
* @LastEditTime: 2021-06-15 16:50:55
* @Description: 待入库分类详情
*/
import React, { useState, useEffect } from 'react';
......@@ -85,14 +85,26 @@ const MemberPrComingClassify: React.FC<{}> = () => {
}))
: []
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -195,20 +207,24 @@ const MemberPrComingClassify: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrComingClassify/verify.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-25 14:36:14
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-03 17:07:31
* @LastEditTime: 2021-06-15 16:51:23
* @Description: 入库分类
*/
import React, { useState, useEffect } from 'react';
......@@ -124,14 +124,26 @@ const MemberPrComingClassifyVerify: React.FC<{}> = () => {
}))
: []
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -243,20 +255,24 @@ const MemberPrComingClassifyVerify: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrComingInvestigate/components/VerifyComingInvestigateDrawer/index.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-24 17:47:32
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-25 10:14:05
* @LastEditTime: 2021-06-15 10:54:53
* @Description: 审核Form抽屉
*/
import React from 'react';
......@@ -115,7 +115,7 @@ const VerifyComingInvestigateDrawer: React.FC<IProps> = (props: IProps) => {
return (
<Drawer
title="入库资料审核"
title="入库考察审核"
width={600}
onClose={handleClose}
visible={visible}
......
src/pages/member/memberPrVerifyChange1/detail.tsx
View file @ dec0c946
......@@ -75,14 +75,26 @@ const MemberPrVerifyChange1Detail: React.FC<{}> = () => {
}
: null
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.qualities
&& memberInfo.qualities.length
? {
key: 'qualificationInfo',
name: '资质证明',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -157,20 +169,24 @@ const MemberPrVerifyChange1Detail: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
{memberInfo && memberInfo.qualities && memberInfo.qualities.length ? (
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyChange1/verify.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-26 10:26:37
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-04 14:11:16
* @LastEditTime: 2021-06-15 16:55:55
* @Description: 审核会员变更(一级)
*/
import React, { useState, useEffect } from 'react';
......@@ -108,14 +108,26 @@ const MemberPrVerifyChange1Verify: React.FC<{}> = () => {
}
: null
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.qualities
&& memberInfo.qualities.length
? {
key: 'qualificationInfo',
name: '资质证明',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -199,20 +211,24 @@ const MemberPrVerifyChange1Verify: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
{memberInfo && memberInfo.qualities && memberInfo.qualities.length ? (
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyChange2/detail.tsx
View file @ dec0c946
......@@ -75,14 +75,26 @@ const MemberPrVerifyChange2Detail: React.FC<{}> = () => {
}
: null
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.qualities
&& memberInfo.qualities.length
? {
key: 'qualificationInfo',
name: '资质证明',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -157,20 +169,24 @@ const MemberPrVerifyChange2Detail: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
{memberInfo && memberInfo.qualities && memberInfo.qualities.length ? (
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyChange2/verify.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-26 10:26:37
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-26 10:34:39
* @LastEditTime: 2021-06-15 16:56:42
* @Description: 审核会员变更(二级)
*/
import React, { useState, useEffect } from 'react';
......@@ -108,14 +108,26 @@ const MemberPrVerifyChange2Verify: React.FC<{}> = () => {
}
: null
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.qualities
&& memberInfo.qualities.length
? {
key: 'qualificationInfo',
name: '资质证明',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -199,20 +211,24 @@ const MemberPrVerifyChange2Verify: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
{memberInfo && memberInfo.qualities && memberInfo.qualities.length ? (
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyChangeConfirm/detail.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-26 10:26:33
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-04 14:26:56
* @LastEditTime: 2021-06-15 16:03:06
* @Description: 待确认会员变更详情
*/
import React, { useState, useEffect } from 'react';
......@@ -75,14 +75,26 @@ const MemberPrVerifyChangeConfirmDetail: React.FC<{}> = () => {
}
: null
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.qualities
&& memberInfo.qualities.length
? {
key: 'qualificationInfo',
name: '资质证明',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -157,20 +169,24 @@ const MemberPrVerifyChangeConfirmDetail: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
{memberInfo && memberInfo.qualities && memberInfo.qualities.length ? (
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyChangeConfirm/verify.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-26 10:26:37
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-07 15:35:44
* @LastEditTime: 2021-06-15 16:24:29
* @Description: 确认会员变更
*/
import React, { useState, useEffect } from 'react';
......@@ -108,14 +108,26 @@ const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
}
: null
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.qualities
&& memberInfo.qualities.length
? {
key: 'qualificationInfo',
name: '资质证明',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -199,20 +211,24 @@ const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
{memberInfo && memberInfo.qualities && memberInfo.qualities.length ? (
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComing1/detail.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-25 18:02:45
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-03 17:42:01
* @LastEditTime: 2021-06-15 16:29:16
* @Description: 待审核入库(一级)详情
*/
import React, { useState, useEffect } from 'react';
......@@ -86,18 +86,36 @@ const MemberPrVerifyComing1Detail: React.FC<{}> = () => {
}))
: []
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -200,28 +218,34 @@ const MemberPrVerifyComing1Detail: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComing1/verify.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-25 18:02:54
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-03 17:46:52
* @LastEditTime: 2021-06-15 16:30:05
* @Description: 审核入库(一级)
*/
import React, { useState, useEffect } from 'react';
......@@ -119,18 +119,36 @@ const MemberPrVerifyComing1Verify: React.FC<{}> = () => {
}))
: []
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -242,28 +260,34 @@ const MemberPrVerifyComing1Verify: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComing2/detail.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-25 18:02:45
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-25 18:09:26
* @LastEditTime: 2021-06-15 16:30:46
* @Description: 待审核入库(二级)详情
*/
import React, { useState, useEffect } from 'react';
......@@ -86,18 +86,36 @@ const MemberPrVerifyComing2Detail: React.FC<{}> = () => {
}))
: []
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -200,28 +218,34 @@ const MemberPrVerifyComing2Detail: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComing2/verify.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-25 18:02:54
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-03 17:53:32
* @LastEditTime: 2021-06-15 16:31:24
* @Description: 审核入库(二级)
*/
import React, { useState, useEffect } from 'react';
......@@ -119,18 +119,36 @@ const MemberPrVerifyComing2Verify: React.FC<{}> = () => {
}))
: []
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -242,28 +260,34 @@ const MemberPrVerifyComing2Verify: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComingConfirm/detail.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-25 18:02:45
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-25 18:29:32
* @LastEditTime: 2021-06-15 16:23:04
* @Description: 待确认入库
*/
import React, { useState, useEffect } from 'react';
......@@ -86,18 +86,36 @@ const MemberPrVerifyComingConfirmDetail: React.FC<{}> = () => {
}))
: []
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -200,28 +218,34 @@ const MemberPrVerifyComingConfirmDetail: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComingConfirm/verify.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-25 18:02:54
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-03 18:02:19
* @LastEditTime: 2021-06-15 16:29:38
* @Description: 确认入库
*/
import React, { useState, useEffect } from 'react';
......@@ -119,18 +119,36 @@ const MemberPrVerifyComingConfirmVerify: React.FC<{}> = () => {
}))
: []
),
{
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
},
{
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
},
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -242,28 +260,34 @@ const MemberPrVerifyComingConfirmVerify: React.FC<{}> = () => {
}
{/* 入库信息 */}
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComingData/components/UploadQualificationsDrawer/index.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-06-01 20:03:23
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-04 20:47:18
* @LastEditTime: 2021-06-15 13:54:42
* @Description: 补充资质证明抽屉
*/
import React from 'react';
......@@ -16,6 +16,7 @@ import {
import { DatePicker, Checkbox } from '@formily/antd-components'
import NiceForm from '@/components/NiceForm';
import { schema } from './schema';
import { useBusinessEffects } from '../../../components/QualitiesUploadFormItem/effects';
import QualitiesUpload from '../../../components/QualitiesUpload';
import QualitiesUploadFormItem from '../../../components/QualitiesUploadFormItem';
......@@ -123,8 +124,8 @@ const UploadQualificationsDrawer: React.FC<IProps> = (props: IProps) => {
QualitiesUpload,
QualitiesUploadFormItem,
}}
effects={() => {
effects={(context, actions) => {
useBusinessEffects(context, actions, 'qualities');
}}
actions={formActions}
schema={schema}
......
src/pages/member/memberPrVerifyComingData/components/VerifyComingDataDrawer/index.tsx
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-24 17:47:32
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-09 10:54:28
* @LastEditTime: 2021-06-15 11:16:16
* @Description: 审核Form抽屉
*/
import React, { useEffect } from 'react';
......@@ -181,6 +181,21 @@ const VerifyComingDataDrawer: React.FC<IProps> = (props: IProps) => {
});
}, [channelInfo]);
useEffect(() => {
if (!channelValue) {
return;
}
let {
channelLevel,
} = channelValue;
if (!channelLevel) {
formActions.setFieldState('INVESTIGATE_INFO', state => {
FormPath.setIn(state, 'visible', false);
});
}
}, [channelValue]);
const handleClose = () => {
if (onClose) {
onClose();
......
src/pages/member/memberQuery/applyMember/index.tsx
View file @ dec0c946
......@@ -22,6 +22,7 @@ import NiceForm from '@/components/NiceForm';
import MellowCard from '@/components/MellowCard';
import { PublicApi } from '@/services/api';
import schema, { GroupItem } from './schema';
import { useBusinessEffects } from '../../components/QualitiesUploadFormItem/effects';
import ComingAgreement from './components/ComingAgreement';
import RegisterInfo from './components/RegisterInfo';
import SubmitSuccess from './components/SubmitSuccess';
......@@ -337,7 +338,7 @@ const MemberQueryApplyMember: React.FC = () => {
RegisterInfo: <RegisterInfo upperMemberId={upperMemberId} upperRoleId={upperRoleId} />,
SubmitSuccess: <SubmitSuccess />,
}}
effects={($, { setFieldState }) => {
effects={($, actions) => {
onStepNext$().subscribe(() => {
stepRef.current += 1;
setCurrenStep(stepRef.current);
......@@ -354,6 +355,8 @@ const MemberQueryApplyMember: React.FC = () => {
setUnsaved(true);
}
});
useBusinessEffects($, actions, 'step4.qualities');
}}
schema={schema(depositInfo, validateId)}
/>
......
src/pages/member/memberQuery/applyMember/schema.ts
View file @ dec0c946
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-26 17:00:39
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-07 11:58:03
* @LastEditTime: 2021-06-15 14:05:18
* @Description:
*/
import { ISchema } from '@formily/antd';
......
src/pages/member/memberQuery/index.tsx
View file @ dec0c946
......@@ -121,12 +121,6 @@ const MemberQuery: React.FC<{}> = () => {
</Button>
)
}
<Button
type="link"
onClick={() => handleJumpModify(record)}
>
变更
</Button>
{/* 商户会员、渠道会员 且外部审核状态为不通过才可以 再次申请 */}
{
record.showUpdate && (
......
src/utils/auth.ts
View file @ dec0c946
......@@ -2,10 +2,14 @@ import { isDev } from '@/constants'
import { GetMemberLoginRegetResponse } from '@/services/memberApi'
export interface AuthInfo {
userId: number,
memberId: number,
name: string,
token: string,
userId?: number,
memberId?: number,
name?: string,
token?: string,
company?: string,
validateMsg?: string,
validateStatus?: number,
validateStatusDesc?: string,
}
export const setAuth = (info: AuthInfo) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment