Merge branch 'master_31795_20220325' into 'master-0401-合并'

4.1 提疑功能优化

See merge request eshop/fe_service_ebtp_frontend!8

src/pages/Tender/ProjectManager/MentionDoubtReply/components/MentionDoubtReply.tsx

@@ -55,6 +55,8 @@ const MentionDoubtReply: React.FC<{}> = () => {
     const actionRef = useRef<any>();
     const [bid, setBid] = useState<string>('');
     const [dissentDatasetId, setDissentDatasetId] = useState<string>('');
+    //提疑回复材料附件id
+    const [resultsDatasetId, setResultsDatasetId] = useState<string>('');
     //选择标段
     const [packageIdSelect, setPackageIdSelect] = useState<any[]>([]);
     //所有流程名
@@ -94,6 +96,16 @@ const MentionDoubtReply: React.FC<{}> = () => {
             title: flowName[moduleName.section] + '名称',
             dataIndex: 'packageName',
         },
+        {
+            title: '提疑时间',
+            dataIndex: 'dissentSendTime',
+            width: 120
+        },
+        {
+            title: '提疑回复时间',
+            dataIndex: 'proceedingResultsTime',
+            width: 120
+        },
         {
             title: '联系人',
             dataIndex: 'contactsName',
@@ -115,12 +127,12 @@ const MentionDoubtReply: React.FC<{}> = () => {
             valueType: 'option',
             render: (_: any, record: any) => [
                 String(record.dissentStatus) === '3' ?
-                [
+                    [
-                    <Button type="link" danger key="view" onClick={() => view(record)}>查看</Button>,
+                        <Button type="link" danger key="view" onClick={() => view(record)}>查看</Button>,
-                ] :
+                    ] :
-                [
+                    [
-                    <Button type="link" danger key="reply" onClick={() => reply(record)}>回复</Button>,
+                        <Button type="link" danger key="reply" onClick={() => reply(record)}>回复</Button>,
-                ]
+                    ]
                 // <Button type="link" danger key="view" onClick={() => view(record)}>查看</Button>
             ]
         },
@@ -134,9 +146,10 @@ const MentionDoubtReply: React.FC<{}> = () => {
         setWhetherReadonly(true);
         setBid(data.resultsDatasetId);
         setDissentDatasetId(data.dissentDatasetId);
+        setResultsDatasetId(data.resultsDatasetId);
         let packageList: any = [];
         let packageArr = data.packageName.split(",");
-        packageArr.map((item: any, index: any)=>{
+        packageArr.map((item: any, index: any) => {
             packageList.push({
                 "bidSectName": item,
                 "id": index
@@ -153,9 +166,10 @@ const MentionDoubtReply: React.FC<{}> = () => {
         setVisible(true);
         setBid(data.resultsDatasetId);
         setDissentDatasetId(data.dissentDatasetId);
+        setResultsDatasetId(data.resultsDatasetId);
         let packageList: any = [];
         let packageArr = data.packageName.split(",");
-        packageArr.map((item: any, index: any)=>{
+        packageArr.map((item: any, index: any) => {
             packageList.push({
                 "bidSectName": item,
                 "id": index
@@ -239,7 +253,7 @@ const MentionDoubtReply: React.FC<{}> = () => {
                                     label="证明材料附件"
                                     name="dissentDatasetId"
                                 >
-                                    <ExtendUpload bid={dissentDatasetId} btnName="上传附件" maxCount={1} uploadProps={{ disabled: true }} />
+                                    <ExtendUpload bid={dissentDatasetId} btnName="上传附件" maxCount={1} maxSize={30} uploadProps={{ disabled: true }} />
                                 </Form.Item>
                             </Col>
                             <Col span={12}>
@@ -256,14 +270,14 @@ const MentionDoubtReply: React.FC<{}> = () => {
                         <Form.Item
                             label="理由和依据"
                             name="reasonBasis"
-                            labelCol={ { span: 4 } }
+                            labelCol={{ span: 4 }}
                         >
                             <Input.TextArea bordered={false} readOnly className="input-invariable-grey input-text-resize" />
                         </Form.Item>
                         <Form.Item
                             label="事项内容说明"
                             name="proceedingExplain"
-                            labelCol={ { span: 4 } }
+                            labelCol={{ span: 4 }}
                         >
                             <Input.TextArea bordered={false} readOnly className="input-invariable-grey input-text-resize" />
                         </Form.Item>
@@ -285,26 +299,14 @@ const MentionDoubtReply: React.FC<{}> = () => {
                                 </Form.Item>
                             </Col>
                         </Row>
-                        {/* <Form.Item
-                            label="处理内容说明"
-                            name="resultsContent"
-                            rules={[{ required: true }]}
-                        >
-                            <Input.TextArea
-                                className={whetherReadonly ? "input-invariable-grey input-text-resize" : ""}
-                                maxLength={150}
-                                allowClear={true}
-                                readOnly={whetherReadonly}
-                                bordered={!whetherReadonly} />
-                        </Form.Item>
                         <Form.Item
-                            label="附件"
+                            label="提疑回复材料附件"
                             name="resultsDatasetId"
-                            rules={[{ required: true }]}
+                            labelCol={{ span: 4 }}
+                            extra={whetherReadonly ? null : "最多上传一个文件，每个最大30MB"}
                         >
-                            <ExtendUpload bid={bid} btnName="上传附件" maxCount={1} uploadProps={{ name: "resultsDatasetId", disabled: whetherReadonly }}>
+                            <ExtendUpload bid={resultsDatasetId} btnName="上传附件" maxCount={1} maxSize={30} uploadProps={{ disabled: whetherReadonly }} />
-                            </ExtendUpload>
+                        </Form.Item>
-                        </Form.Item> */}
                     </Form>
                 </>
             )
@@ -345,7 +347,7 @@ const MentionDoubtReply: React.FC<{}> = () => {
     }
 
     return (
-        <div style={{padding: '24px 24px 0px'}}>
+        <div style={{ padding: '24px 24px 0px' }}>
             <ProTable
                 rowKey="id"
                 size="small"

src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx

@@ -73,7 +73,7 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => {
     //所有流程名
     const flowName = getAllFlowNameByRoomType(bidMethodDict, roomType);
     // getbidQualification
-    //回复附件id
+    //提疑回复材料附件id
     const [resultsDatasetId, setResultsDatasetId] = useState<string>('');
     const [whetherToDisplayTheReply, setWhetherToDisplayTheReply] = useState<boolean>(false);
     const [bidSectionIsOptional, setBidSectionIsOptional] = useState<any[]>([]);
@@ -115,6 +115,16 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => {
             title: flowName[moduleName.section] + '名称',
             dataIndex: 'packageName',
         },
+        {
+            title: '提疑时间',
+            dataIndex: 'dissentSendTime',
+            width: 120
+        },
+        {
+            title: '提疑回复时间',
+            dataIndex: 'proceedingResultsTime',
+            width: 120
+        },
         {
             title: '联系人',
             dataIndex: 'contactsName',
@@ -442,38 +452,14 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => {
                                         >
                                             <Input.TextArea className="input-invariable-grey input-text-resize" bordered={false} readOnly />
                                         </Form.Item>
+                                        <Form.Item
+                                            label="提疑回复材料附件"
+                                            name="resultsDatasetId"
+                                        >
+                                            <ExtendUpload bid={resultsDatasetId} btnName="上传附件" maxCount={1} maxSize={30} uploadProps={{ disabled: true }} />
+                                        </Form.Item>
                                     </> : null
                             }
-                            {/* {
-                            whetherToDisplayTheReply && (
-                                <>
-                                    <Form.Item
-                                        label="回复处理结果"
-                                        name="proceedingResults"
-                                        rules={[{ required: true }]}
-                                    >
-                                        <Input.TextArea className="input-invariable-grey input-text-resize" bordered={false} readOnly />
-                                    </Form.Item>
-
-                                    <Form.Item
-                                        label="回复处理内容说明"
-                                        name="resultsContent"
-                                        rules={[{ required: true }]}
-                                    >
-                                        <Input.TextArea className="input-invariable-grey input-text-resize" bordered={false} readOnly />
-                                    </Form.Item>
-
-                                    <Form.Item
-                                        label="回复附件"
-                                        name="resultsDatasetId"
-                                        rules={[{ required: true }]}
-                                    >
-                                        <ExtendUpload bid={resultsDatasetId} btnName="上传附件" maxCount={1} uploadProps={{ disabled: true }}>
-                                        </ExtendUpload>
-                                    </Form.Item>
-                                </>
-                            )
-                        } */}
                         </Form>
                     </Spin>