修改bug

src/pages/contract/components/detailCard/PaymentCard/index.tsx

@@ -17,7 +17,7 @@ export interface Iprops extends IAntdSchemaFormProps {
   contractId: any,
   children?: React.ReactNode,
   title?: string,
-
+  payItem?: React.ReactNode
 
 }
 
@@ -27,7 +27,8 @@ const PaymentCard: React.FC<Iprops> = ({
   basics,
   contractId,
   children,
-  title
+  title,
+  payItem
 }) => {
   /* 非手工单进入请款 */
   const like = (sourceType, item) => {
@@ -71,6 +72,7 @@ const PaymentCard: React.FC<Iprops> = ({
                         <div className={style.label}>付款方式：</div>
                         <div className={style.text}>{item.payWayName}</div>
                       </div>
+                      {payItem ? payItem : null}
                     </div>
                   </div>
                 )
@@ -87,6 +89,8 @@ PaymentCard.defaultProps = {
   payPlanList: [],
   basics: {},
   contractId: 0,
+  children: null,
+  payItem: null
 }
 
 export default PaymentCard;

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

@@ -72,13 +72,12 @@ const Details = (props: any) => {
             { label: '合同编号', extra: basics.contractNo ? basics.contractNo : '', },
             { label: '合同摘要', extra: basics.contractAbstract ? basics.contractAbstract : '' },
             { label: '外部状态', extra: basics.outerStatusName ? basics.outerStatusName : '', type: 'StatusTag' },
-            { label: '内部状态', extra: basics.innerStatusName ? basics.innerStatusName : '' },
+
           ],
           col2: [
             { label: '寻源类型', extra: basics.sourceTypeName ? basics.sourceTypeName : '' },
             { label: '对应单据', extra: basics.sourceNo ? basics.sourceNo : '' },
-            { label: '授标会员', extra: basics.partyAName ? basics.partyAName : '' },
-            { label: '授标金额', extra: basics.totalAmount ? `￥${basics.totalAmount}` : '' },
+
           ],
           col3: [
             { label: '合同有效期：', extra: `${basics.startTime}至${basics.endTime}` },
@@ -87,6 +86,20 @@ const Details = (props: any) => {
         if (type) {
           basicInfo.col1[0].url = `/memberCenter/contract/coordination/coordinationList/details?contractId=${contractId}`
         }
+        if (type != 'implement') {
+          basicInfo.col1.push({ label: '内部状态', extra: basics.innerStatusName ? basics.innerStatusName : '' })
+          basicInfo.col2.push(
+            { label: '授标会员', extra: basics.partyAName ? basics.partyAName : '' },
+            { label: '授标金额', extra: basics.totalAmount ? `￥${basics.totalAmount}` : '' },
+          )
+        } else {
+          basicInfo.col2.push(
+            { label: '合同甲方：', extra: basics.partyAName ? basics.partyAName : '' },
+          )
+          basicInfo.col3.unshift(
+            { label: '合同金额：', extra: basics.totalAmount ? `￥${basics.totalAmount}` : '' },
+          )
+        }
         if (basics.sourceId) {
           switch (basics.sourceType) {
             case 1: {
@@ -360,6 +373,24 @@ const Details = (props: any) => {
             payPlanList={payPlanList}
             basics={basicInfo}
             contractId={contractId}
+            payItem={
+              <div style={{
+                display: 'flex',
+              }}>
+                <div style={{
+                  fontSize: '12px',
+                  fontWeight: 400,
+                  color: '#909399',
+                  flex: 0.5,
+                }}>支付方式：</div>
+                <div style={{
+                  fontSize: '12px',
+                  fontWeight: 400,
+                  color: '#303133',
+                  flex: 1,
+                }}>线下支付方式：线下支付线上确认</div>
+              </div>
+            }
           />
         }
         {/* 交易条件 */}

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

@@ -56,14 +56,32 @@ const purchaseList: React.FC<Iprops> = ({
       { title: '单位', dataIndex: 'unit', align: 'center', },
       { title: '采购数量', dataIndex: 'purchaseCount', align: 'center', },
       { title: '含税', dataIndex: 'isHasTaxName', align: 'center', },
-      { title: '税率', dataIndex: 'taxRate', align: 'center', },
-      { title: '单价(含税)', dataIndex: 'price', align: 'center', },
+      {
+        title: '税率', dataIndex: 'taxRate', align: 'center',
+        render: (text) => {
+          return (
+            <div>
+              {text}%
+            </div>
+          )
+        }
+      },
+      {
+        title: '单价(含税)', dataIndex: 'price', align: 'center',
+        render: (text) => {
+          return (
+            <div>
+              ￥{text}
+            </div>
+          )
+        }
+      },
       {
         dataIndex: 'bidCount', align: 'center',
         title: (
           <Space direction='vertical'>
             <Text>授标数量</Text>
-            <Text>合计:{Numberamount}</Text>
+            <Text>合计:{Totalamount}</Text>
           </Space>
         ),
       },
@@ -72,9 +90,16 @@ const purchaseList: React.FC<Iprops> = ({
         title: (
           <Space direction='vertical'>
             <Text>金额(不含税)</Text>
-            <Text>合计: ￥{Totalamount}</Text>
+            <Text>合计: ￥{Numberamount}</Text>
           </Space>
         ),
+        render: (text) => {
+          return (
+            <div>
+              ￥{text}
+            </div>
+          )
+        }
       },
     ];
     setcolumns(columns)
@@ -207,7 +232,7 @@ const purchaseList: React.FC<Iprops> = ({
       <div className='ant-card-head'>
         <div className='ant-card-head-wrapper'>
           <div className='ant-card-head-wrapper'>
-            采购材料
+            合同采购材料
           </div>
         </div>
       </div>

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

@@ -21,6 +21,7 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
   const [page, setPage] = useState(1);
   const [size, setSize] = useState(10);
   const [total, setTotal] = useState(0);
+
   const [listLoading, setListLoading] = useState(false);
   /* 单据总金额 */
   const [orderAmount, setorderAmount] = useState<number>(0);
@@ -64,7 +65,7 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
               keyId: index + 1,
             }
           })
-          console.log(list)
+
           setdata(list)
         }
         setTotal(res.data.totalCount)
@@ -198,9 +199,20 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
       pageSize: pageSize,
     }
     setSize(pageSize)
-    console.log(data, pageSize, current)
     getContracInfoList(data)
   };
+
+  useEffect(() => {
+    if (contractId) {
+      let data = {
+        contractId,
+        current: 1,
+        pageSize: 8
+      }
+      getContracInfoList(data)
+    }
+    console.log(data, '13132131')
+  }, [contractId])
   return (
     <div id='docking' className='ant-card ant-card-bordered'>
       <div className='ant-card-head'>

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

@@ -17,7 +17,6 @@ import { history } from 'umi';
 import moment from 'moment';
 import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
 
-
 const QueryList = () => {
   const ref = useRef<any>({});
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])

src/pages/contract/manage/add/components/FormList.tsx

@@ -12,7 +12,7 @@ const { Option } = Select;
 const { Text } = Typography;
 
 const FormList = (props: any) => {
-  const { currentRef, Row, sourceType, onBadge } = props;
+  const { currentRef, Row, sourceType } = props;
   console.log(sourceType)
   const refs = useRef({});
   /* 显示模态框 */

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

 
+/** 合同管理 二级审核页面 */
 import React, { useRef, useState } from 'react'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { Card } from 'antd';
@@ -15,7 +16,7 @@ import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePicke
 import { PublicApi } from '@/services/api';
 import ExamineFrom from '../../components/examine'
 import moment from 'moment';
-import { history, Redirect } from 'umi';
+import { history } from 'umi';
 
 const Secondaryexamine = () => {
   const ref = useRef<any>({});

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

-
+/* 合同管理签订合同页面 */
 import React, { useRef, useState } from 'react'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { Card } from 'antd';
@@ -16,7 +16,6 @@ import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePicke
 import { PublicApi } from '@/services/api';
 import moment from 'moment';
 import '../../constants/index.less'
-
 const Signacontract = () => {
   const ref = useRef<any>({});
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])