Skip to content

J
jinfa-platform
Commit c1c73f69 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

feat: 添加条件判断渲染

parent 3cde9dd2
Hide whitespace changes
Inline Side-by-side
Showing with 627 additions and 355 deletions
src/pages/member/memberPrComingClassify/detail.tsx
View file @ c1c73f69
......@@ -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<{}> = () => {
}))
: []
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'investigateInfo',
name: '考察信息',
},
(
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<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
{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 @ c1c73f69
......@@ -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<{}> = () => {
}))
: []
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'investigateInfo',
name: '考察信息',
},
(
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<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyChange1/detail.tsx
View file @ c1c73f69
......@@ -75,14 +75,26 @@ const MemberPrVerifyChange1Detail: React.FC<{}> = () => {
}
: null
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'qualificationInfo',
name: '资质证明',
},
(
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<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
{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 @ c1c73f69
......@@ -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
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'qualificationInfo',
name: '资质证明',
},
(
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<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
{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 @ c1c73f69
......@@ -75,14 +75,26 @@ const MemberPrVerifyChange2Detail: React.FC<{}> = () => {
}
: null
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'qualificationInfo',
name: '资质证明',
},
(
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<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
{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 @ c1c73f69
......@@ -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
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'qualificationInfo',
name: '资质证明',
},
(
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<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
{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 @ c1c73f69
......@@ -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
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'qualificationInfo',
name: '资质证明',
},
(
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<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
{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 @ c1c73f69
......@@ -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
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'qualificationInfo',
name: '资质证明',
},
(
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<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification
dataSource={memberInfo?.qualities}
id="qualificationInfo"
/>
</Col>
{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 @ c1c73f69
......@@ -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<{}> = () => {
}))
: []
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
name: '分类信息',
},
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -200,28 +218,34 @@ const MemberPrVerifyComing1Detail: React.FC<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
/>
</Col>
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComing1/verify.tsx
View file @ c1c73f69
......@@ -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<{}> = () => {
}))
: []
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
name: '分类信息',
},
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -242,28 +260,34 @@ const MemberPrVerifyComing1Verify: React.FC<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
/>
</Col>
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComing2/detail.tsx
View file @ c1c73f69
......@@ -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<{}> = () => {
}))
: []
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
name: '分类信息',
},
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -200,28 +218,34 @@ const MemberPrVerifyComing2Detail: React.FC<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
/>
</Col>
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComing2/verify.tsx
View file @ c1c73f69
......@@ -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<{}> = () => {
}))
: []
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
name: '分类信息',
},
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -242,28 +260,34 @@ const MemberPrVerifyComing2Verify: React.FC<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
/>
</Col>
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComingConfirm/detail.tsx
View file @ c1c73f69
......@@ -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<{}> = () => {
}))
: []
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
name: '分类信息',
},
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -200,28 +218,34 @@ const MemberPrVerifyComingConfirmDetail: React.FC<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
/>
</Col>
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
src/pages/member/memberPrVerifyComingConfirm/verify.tsx
View file @ c1c73f69
......@@ -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<{}> = () => {
}))
: []
),
{
key: 'incomingInfo',
name: '入库信息',
},
{
key: 'investigateInfo',
name: '考察信息',
},
{
key: 'ClassifyInfo',
name: '分类信息',
},
(
memberInfo
&& memberInfo.depositDetails
&& memberInfo.depositDetails.length
? {
key: 'incomingInfo',
name: '入库信息',
}
: null
),
(
memberInfo
&& memberInfo.inspection
&& memberInfo.inspection.inspectDay
? {
key: 'investigateInfo',
name: '考察信息',
}
: null
),
(
memberInfo
&& memberInfo.classfication
&& memberInfo.classfication.code
? {
key: 'classifyInfo',
name: '分类信息',
}
: null
),
{
key: 'flowRecords',
name: '流转记录',
......@@ -242,28 +260,34 @@ const MemberPrVerifyComingConfirmVerify: React.FC<{}> = () => {
}
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
{memberInfo && memberInfo.depositDetails && memberInfo.depositDetails.length ? (
<Col span={24}>
<MemberDocIncomingInfo
dataSource={memberInfo?.depositDetails}
id="incomingInfo"
/>
</Col>
) : null}
{/* 考察信息 */}
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
{memberInfo && memberInfo.inspection && memberInfo.inspection.inspectDay ? (
<Col span={24}>
<MemberInvestigateInfo
dataSource={memberInfo?.inspection}
id="investigateInfo"
/>
</Col>
) : null}
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="ClassifyInfo"
/>
</Col>
{memberInfo && memberInfo.classfication && memberInfo.classfication.code ? (
<Col span={24}>
<MemberDocCategory
dataSource={memberInfo?.classfication}
id="classifyInfo"
/>
</Col>
) : null}
{/* 流转记录 */}
<Col span={24}>
......
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