修改bug

src/pages/contract/contractexecution/details/detailedList.tsx

@@ -16,7 +16,7 @@ const DetailedList: React.FC<Iprops> = ({
   const ref = useRef({});
   const columnsList: any = [
     {
-      title: '请款次数', dataIndex: 'name', key: 'name', align: 'center',
+      title: '请款次数', dataIndex: 'name', key: 'name', align: 'left',
       render: (text: any, record: any, index: number) => {
         return (
           <span>{index + 1}</span>
@@ -24,7 +24,7 @@ const DetailedList: React.FC<Iprops> = ({
       },
     },
     {
-      title: '请款单号/摘要', dataIndex: 'applyNo', align: 'center',
+      title: '请款单号/摘要', dataIndex: 'applyNo', align: 'left',
       render: (text: any, record: any) => {
         return (
           <div>
@@ -38,9 +38,17 @@ const DetailedList: React.FC<Iprops> = ({
         );
       }
     },
-    { title: '请款时间', dataIndex: 'applyTime', align: 'center', },
     {
-      title: '请款金额', dataIndex: 'applyAmount', align: 'center',
+      title: '请款单状态', dataIndex: 'statusName', key: 'statusName', align: 'left',
+      render: (text: any) => {
+        return (
+          <span>{text}</span>
+        )
+      },
+    },
+    { title: '请款时间', dataIndex: 'applyTime', align: 'left', },
+    {
+      title: '请款金额', dataIndex: 'applyAmount', align: 'left',
       render: (text: any, record: any, index: number) => {
         return (
           <span>￥{text}</span>
@@ -48,9 +56,9 @@ const DetailedList: React.FC<Iprops> = ({
       },
     },
 
-    { title: '付款时间', dataIndex: 'payTime', align: 'center', },
+    { title: '付款时间', dataIndex: 'payTime', align: 'left', },
     {
-      title: '付款金额', dataIndex: 'payAmount', align: 'center',
+      title: '付款金额', dataIndex: 'payAmount', align: 'left',
       render: (text: any, record: any, index: number) => {
         return (
           <span>￥{text}</span>
@@ -59,7 +67,7 @@ const DetailedList: React.FC<Iprops> = ({
     },
     {
       title: '付款方式', dataIndex: 'payWayName',
-      align: 'center',
+      align: 'left',
     },
   ];
   /* 请款统计 */
@@ -70,7 +78,6 @@ const DetailedList: React.FC<Iprops> = ({
         contractId,
       }).then(res => {
         if (res.code === 1000) {
-          console.log(res, '这个是什么玩意')
           resolve(res.data)
         } else {
 

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

@@ -121,6 +121,24 @@ const Details = (props: any) => {
             { label: '合同有效期：', extra: `${basics.startTime}至${basics.endTime}` },
           ],
         }
+        if (basics.sourceId) {
+          switch (basics.sourceType) {
+            case 1: {
+              if (basics.turn && basics.sourceId) {
+                basicInfo.col2[1].url = `/memberCenter/procurementAbility/confirmOffer/offerInquire/preview?id=${basics.sourceId}&turn=${basics.turn}`
+              }
+              break;
+            };
+            case 2: {
+              basicInfo.col2[1].url = `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${basics.sourceId}`
+              break;
+            };
+            case 3: {
+              basicInfo.col2[1].url = `/memberCenter/procurementAbility/purchaseBid/search/detail?id=${basics.sourceId}&number=${basics.sourceNo}`
+              break;
+            };
+          }
+        }
         setpayPlanList(payPlanList)
         setbasicInfo(basicInfo)
       }
@@ -343,7 +361,6 @@ const Details = (props: any) => {
       current: current,
       pageSize: pageSize,
     }
-    console.log(data)
     getContracInfoList(data)
   };
 
@@ -394,11 +411,7 @@ const Details = (props: any) => {
         {/* 基本信息 */}
         <BasicInfo basicInfo={basicInfo} />
         {/* 付款计划 */}
-        <PaymentCard
-          payPlanList={payPlanList}
-          basics={basics}
-          contractId={contractId}
-        />
+        <PaymentCard payPlanList={payPlanList} basics={basicInfo} contractId={contractId} />
         {/* 执行情况 */}
         <div id='docking' className='ant-card ant-card-bordered'>
           <div className='ant-card-head'>

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

@@ -16,7 +16,7 @@ const DetailedList: React.FC<Iprops> = ({
   const ref = useRef({});
   const columnsList: any = [
     {
-      title: '请款次数', dataIndex: 'name', key: 'name', align: 'center',
+      title: '付款次数', dataIndex: 'name', key: 'name', align: 'center',
       render: (text: any, record: any, index: number) => {
         return (
           <span>{index + 1}</span>
@@ -83,8 +83,8 @@ const DetailedList: React.FC<Iprops> = ({
       <div className='ant-card-head'>
         <div className='ant-card-head-wrapper'>
           <div className='ant-card-head-wrapper'>
-            请款统计
-              </div>
+            合同付款情况统计
+          </div>
         </div>
       </div>
       <div className='ant-card-body'>

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

@@ -341,7 +341,10 @@ const Details = (props: any) => {
             : <PurchaseList contractId={contractId} type={type} Refresh={Refresh} />
         }
         {/* 付款计划 */}
-        <PaymentCard IsShow={true} payPlanList={payPlanList} basics={basicInfo} contractId={contractId} />
+        {
+          type != 'implement' &&
+          <PaymentCard IsShow={true} payPlanList={payPlanList} basics={basicInfo} contractId={contractId} />
+        }
         {/* 交易条件 */}
         {
           type != 'implement' &&

src/pages/contract/funds/addbill/add.tsx

@@ -16,7 +16,7 @@ const { TabPane } = Tabs;
 
 
 const Add: React.FC<{}> = (props: any) => {
-  const { location: { query: { sourceType, paymentId } } } = props;
+  const { location: { query: { sourceType, paymentId, type } } } = props;
   console.log(sourceType)
   const currentBasic = useRef<any>({});
   const detailData = useRef<any>({});
@@ -29,7 +29,14 @@ const Add: React.FC<{}> = (props: any) => {
     setid(data.selectRow.id)
     console.log(data)
   }
+  useEffect(() => {
+    // contract
+    PublicApi.getContractApplyAmountGetDetail({ applyId: paymentId }).then((res) => {
+      console.log(res)
+    }).catch((err) => {
 
+    });
+  }, [])
   const TabList = [
     {
       name: '基本信息', components:
@@ -38,6 +45,7 @@ const Add: React.FC<{}> = (props: any) => {
           getcontractId={getflag}
           sourceType={sourceType}
           paymentId={paymentId}
+          type={type}
         />
     },
     {
@@ -68,9 +76,10 @@ const Add: React.FC<{}> = (props: any) => {
   }
 
 
+
   return (
     <PageHeaderWrapper
-      title="新建请款单"
+      title={type ? '修改请款单' : '新建请款单'}
       onBack={() => history.goBack()}
       backIcon={<ReutrnEle description="返回" />}
       extra={[

src/pages/contract/funds/addbill/components/info.tsx

@@ -241,7 +241,6 @@ const AddInfo = (props: any) => {
         key = item
       }
     })
-    console.log(key);
     const basicsData = basics;
     basicsData.applyAmount = key.payAmount;
     basicsData.payWay = key.payWay;

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

@@ -86,14 +86,27 @@ const AddbillList: React.FC<{}> = () => {
       // 修改时不允许修改请款单号、合同编号，修改后状态更新为待提交审核，待提交审核、审核不通过(一级) 、审核不通过(二级)状态的可以修改
       // 状态, 1.待提交审核, 2.待审核(一级), 3.审核不通过(一级), 4.待审核(二级), 5.审核不通过(二级), 6.待提交财务付款, 7.待付款, 8.已付款, 9.已作废
       // 删除：只有内部状态为待提交审核状态且从未提交审核的才可以删除，删除前需要提示，确认后才能删除
+      let node;
+      let edit = <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => history.push(`/memberCenter/contract/funds/addbill/Add?paymentId=${record.id}&type=edit`)}>修改</span>;
+      switch (record.status) {
+        case 1:
+          node = edit;
+          break;
+        case 3:
+          node = edit
+          break;
+        case 5:
+          node = edit
+          break;
+        default:
+          break;
+      }
       return (
         <>
           {
             record.status == 1 && <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => isModal(record)}>提交</span>
           }
-          {
-            record.status != 3 || record.status != 5 && <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }}>修改</span>
-          }
+          {node}
           {
             record.status == 1 &&
             <Popconfirm

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

@@ -21,7 +21,7 @@ const BillDetails = (props: any) => {
   const { location: { query: { applyId, type } } } = props
   const [tabPane] = useState([
     { id: 'progress', title: '流转进度' },
-    { id: 'process', title: '基本流程' },
+    { id: 'process', title: '基本信息' },
     { id: 'materials', title: '请款明细' },
     { id: 'record', title: '流转记录' },
   ])