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

src/pages/contract/coordination/details/index.tsx

@@ -301,28 +301,11 @@ const Details = (props: any) => {
 
           </div>
         </div>
+
         {
-          type === 'submitExamine' &&
-          <div className="btn" style={{ marginRight: "20px" }}>
-            <Button type="primary" onClick={() => submitExamine()}>审核</Button>
-          </div>
-        }
-        {
-          type === 'levelexamine' &&
-          <div className="btn" style={{ marginRight: "20px" }}>
-            <Button type="primary" onClick={() => submitExamine()}>审核</Button>
-          </div>
-        }
-        {
-          type === 'pageToBeExamineTwo' &&
-          <div className="btn" style={{ marginRight: "20px" }}>
-            <Button type="primary" onClick={() => submitExamine()}>审核</Button>
-          </div>
-        }
-        {
-          type === 'Sign' &&
+          type &&
           <div className="btn" style={{ marginRight: "20px" }}>
-            <Button type="primary" onClick={() => submitExamine()}>签订合同</Button>
+            <Button type="primary" onClick={() => submitExamine()}>{type === 'Sign' ? '签订合同' : '审核'}</Button>
           </div>
         }
       </Anchor>
@@ -335,12 +318,9 @@ const Details = (props: any) => {
         <Basic basicInfo={basicInfo} />
         {/* 执行情况 */}
         {
-          type == 'implement' &&
-          <SituationList contractId={contractId} />
-        }
-        {/* 采购材料 */}
-        {
-          type != 'implement' && <PurchaseList contractId={contractId} type={type} Refresh={Refresh} />
+          type == 'implement' ?
+            <SituationList contractId={contractId} />
+            : <PurchaseList contractId={contractId} type={type} Refresh={Refresh} />
         }
         {/* 付款计划 */}
         <PaymentCard IsShow={true} payPlanList={payPlanList} basics={basicInfo} contractId={contractId} />
@@ -370,12 +350,10 @@ const Details = (props: any) => {
         }
         {/* 流转记录 */}
         {
-          type != 'implement' && <CirculationList contractId={contractId} />
+          type != 'implement' ? <CirculationList contractId={contractId} /> : <DetailedList contractId={contractId} />
         }
         {/* 请款统计 */}
-        {
-          type == 'implement' && <DetailedList contractId={contractId} />
-        }
+
       </div>
       {/* 提交审核 */}
       <Modal footer={null} title={type == 'Sign' ? '签订合同' : '提交审核'} visible={Visible} onOk={() => setIsModalVisible(!Visible)} onCancel={() => setIsModalVisible(!Visible)}>

src/pages/contract/funds/bill/index.tsx

 import React, { useState, useRef, ReactNode } from 'react'
-import { history } from 'umi';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { Radio, Input, message, Modal, Card } from 'antd';
-import statuStyle from '../../common/colorTag'
 import { ColumnType } from 'antd/lib/table/interface';
 import { StandardTable } from 'god';
 import { SchemaBli } from '../schema';

src/pages/contract/funds/details/index.tsx

 
-import React, { useEffect, useState, useRef } from 'react';
-import { Anchor, Radio, Steps, Row, Col, Input, Button, message, Modal } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { Anchor, Radio, Steps, Input, Button, message, Modal } from 'antd';
 import style from './index.less';
 import { ArrowLeftOutlined } from '@ant-design/icons';
 import { history } from 'umi';
@@ -236,9 +236,7 @@ const BillDetails = (props: any) => {
           </div>
           <Materials applyId={applyId} type={type} />
         </div>
-
         <ColumnsList applyId={applyId} />
-
       </div>
       <Modal title="单据作废" visible={isModalVisible} onCancel={handleCancel} onOk={oninvalid}>
         <Radio.Group onChange={handleIsAllMemberChange} defaultValue={isAllMember} value={isAllMember}>

src/pages/contract/manage/QueryList/index.tsx

@@ -205,12 +205,10 @@ const QueryList = () => {
         } else {
           return res.data.innerList.map((item) => { return { label: item.message, value: item.code } })
         }
-
       }
       return [];
     }
   }
-
   return (
     <PageHeaderWrapper>
       <Card>

src/pages/contract/manage/add/addList.tsx

@@ -243,7 +243,7 @@ const addList = () => {
                 onClick={() => history.push('/memberCenter/contract/manage/add/addList/contracAdd')}
               >
                 新建
-            </Button>
+              </Button>
 
             </Space>,
             layouts: {

src/pages/contract/manage/details/index.tsx

-
-
-
-
 import React, { useEffect, useState, useRef } from 'react';
 import { StandardTable } from 'god';
-import { Anchor, Radio, Steps, Row, Table, Space, Typography, Button } from 'antd';
+import { Anchor, Radio, Steps, Table, Space, Typography, Button } from 'antd';
 import style from './index.less';
 import { ArrowLeftOutlined } from '@ant-design/icons';
 import { history } from 'umi';
 import { PublicApi } from '@/services/api';
 import ExamineFrom from '../../components/examine'
 import Basic from '../../components/detailCard/basic'
+import PaymentCard from '../../components/detailCard/PaymentCard'
 import {
   FileWordFilled
 } from '@ant-design/icons'
@@ -62,6 +59,7 @@ const Details = (props: any) => {
   /* 总金额 */
   const [tobidCount, settobidCount] = useState<number>(0);
   const [bidAmount, setbidAmount] = useState<number>(0);
+  const [btnText, setBtnText] = useState('审核');
   const [tabPane] = useState([
     { id: 'progress', title: '流转进度' },
     { id: 'process', title: '基本流程' },
@@ -178,7 +176,6 @@ const Details = (props: any) => {
       ...params,
       contractId
     }).then(res => {
-      // bidCount
       let tobidCount = 0;
       let bidAmount = 0;
       res.data.data.map(item => {
@@ -195,6 +192,8 @@ const Details = (props: any) => {
   const onExpand = expandedKeys => {
   };
   useEffect(() => {
+    let text = type == 'Signacontract' ? '签订合同' : '审核';
+    setBtnText(text);
     setTargetOffset(window.innerHeight / 6);
     getDetail()
     let data = {
@@ -321,30 +320,11 @@ const Details = (props: any) => {
         </div>
         <div>
           {
-            type === 'ManageSubmitExamine' &&
-            <div className="btn" style={{ marginRight: "20px" }}>
-              <Button type="primary" onClick={() => submitExamine()}>审核</Button>
-            </div>
-          }
-          {
-            type === 'ManageExamineStepOne' &&
-            <div className="btn" style={{ marginRight: "20px" }}>
-              <Button type="primary" onClick={() => submitExamine()}>审核</Button>
-            </div>
-          }
-          {
-            type === 'PageToBeExamineStepTwo' &&
-            <div className="btn" style={{ marginRight: "20px" }}>
-              <Button type="primary" onClick={() => submitExamine()}>审核</Button>
-            </div>
-          }
-          {
-            type === 'Signacontract' &&
+            type &&
             <div className="btn" style={{ marginRight: "20px" }}>
-              <Button type="primary" onClick={() => submitExamine()}>签订合同</Button>
+              <Button type="primary" onClick={() => submitExamine()}>{btnText}</Button>
             </div>
           }
-
         </div>
       </Anchor>
       <div id='content' className={style.card}>
@@ -406,46 +386,7 @@ const Details = (props: any) => {
           </div>
         </div>
         {/* 付款计划 */}
-        <div id='conditions' className='ant-card ant-card-bordered'>
-          <div className='ant-card-head'>
-            <div className='ant-card-head-wrapper'>
-              <div className='ant-card-head-wrapper'>
-                付款计划
-              </div>
-            </div>
-          </div>
-          <div className='ant-card-body '>
-            <Row gutter={[8, 8]}>
-              <div className={style.warp}>
-                {
-                  payPlanList.map((item: any, index: number) => {
-                    return (
-                      <div className={style.warp_item} key={index}>
-                        <div className={style.title}>付款比例</div>
-                        <div className={style.proportion}>{item.payRatio}%</div>
-                        <div className={style.Price}>¥{item.payAmount}</div>
-                        <div className={style.warp_List}>
-                          <div className={style.warp_ListItem}>
-                            <div className={style.label}>付款阶段</div>
-                            <div className={style.text}>{item.payStage}</div>
-                          </div>
-                          <div className={style.warp_ListItem}>
-                            <div className={style.label}>预计付款时间：</div>
-                            <div className={style.text}>{item.expectPayTime}</div>
-                          </div>
-                          <div className={style.warp_ListItem}>
-                            <div className={style.label}>付款方式：</div>
-                            <div className={style.text}>{item.payWayName}</div>
-                          </div>
-                        </div>
-                      </div>
-                    )
-                  })
-                }
-              </div>
-            </Row>
-          </div>
-        </div>
+        <PaymentCard IsShow={true} payPlanList={payPlanList} basics={basicInfo} contractId={contractId} />
         {/* 交易条件 */}
         <div id='docking' className='ant-card ant-card-bordered'>
           <div className='ant-card-head'>

src/pages/contract/manage/editing/components/information.tsx

@@ -19,7 +19,6 @@ const Information = (props: any) => {
    * */
   useEffect(() => {
     basic.sourceType = String(basic.sourceType);
-    console.log(basic)
     if (basic.contractNo) {
       if (oldContractId) {
         let data = { oldContractNo: basic.contractNo }

src/pages/member/memberQuery/index.tsx

@@ -153,12 +153,6 @@ const MemberQuery: React.FC<{}> = () => {
               </Button>
             )
           }
-          <Button
-            type="link"
-            onClick={() => handleJumpModifyDeposit(record)}
-          >
-            修改
-          </Button>
         </>
       ),
     },

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/addForm.tsx

@@ -193,7 +193,7 @@ export default AddQuotes
 //   /** 提交的接口 */
 //   fetchRequest?: () => Promise<unknown>,
 //   /** 本地缓存的名称 */
-//   spam?: string,
+//   spam?: string | boolean,
 //   /** 标题 */
 //   title?: string,
 // }

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/edit.tsx

@@ -10,4 +10,4 @@ const EditQuote: React.FC<{}> = () => {
     />
   )
 }
-export default EditQuote;
\ No newline at end of file
+export default EditQuote;

src/pages/transaction/purchaseAbility/purchasDoor/purchasInfo/index.tsx

@@ -385,10 +385,22 @@ const PurchasInfo: React.FC<PurchasInfoPropsType> = (props) => {
     setFormIsHalfFilledOut(true)
   }
 
+  const checkUrl = (url) => {
+    if (url && typeof url === 'string') {
+      if (url.indexOf('/') > -1) {
+        return url.replace('/', '').trim()
+      } else {
+        return `${url}`.trim()
+      }
+    }
+  }
+
   /** 获取店铺链接 */
   const handleMallSelectChange = (val, option) => {
     setDoor(option.children);
-    setResUrl(`${siteUrl}${option.url}`)
+    if (option.url) {
+      setResUrl(`${siteUrl}/${checkUrl(option.url)}`)
+    }
   }
 
   return (