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

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

@@ -5,24 +5,28 @@ import { Button, Drawer, } from 'antd';
 import { StandardTable } from 'god';
 import EyePreview from '@/components/EyePreview';
 import { PublicApi } from '@/services/api';
+import moment from 'moment';
 
 export interface Iprops extends IAntdSchemaFormProps {
   /* 显示隐藏 */
   visible: any,
-  applyId: any,
+  item: any,
+  contractId: any,
   setDrawerModal: Function
 }
 const DrawerModal: React.FC<Iprops> = ({
   visible,
-  applyId,
-  setDrawerModal
+  item,
+  setDrawerModal,
+  contractId,
 }) => {
+  console.log(item)
   const ref = useRef({});
   const [selectRow, setSelectRow] = useState<any[]>([]) // 抽屉选择的行数据
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
   const PaymentList: any = [
     {
-      title: '单据号/摘要', dataIndex: 'orderNO', align: 'center',
+      title: '请款单号/摘要', dataIndex: 'applyNo', align: 'center',
       render: (text: any, record: any) => {
         return (
           <div>
@@ -31,14 +35,36 @@ const DrawerModal: React.FC<Iprops> = ({
             >
               {text}
             </EyePreview>
-            <p>{record.orderAbstract}</p>
+            <p>{record.applyAbstract}</p>
           </div>
         );
       },
     },
-    { title: '单据类型', dataIndex: 'orderTypeName', align: 'center', },
-    { title: '单据状态', dataIndex: 'orderStatusName', align: 'center', },
-    { title: '单据时间', dataIndex: 'orderTime', align: 'center', },
+    { title: '状态', dataIndex: 'statusName', align: 'center', },
+    {
+      title: '请款时间', dataIndex: 'orderTime', align: 'center',
+      render: (text: any, record: any) => (
+        <div>{moment(Number(text)).format('YYYY-MM-DD')}</div>
+      )
+    },
+    {
+      title: '请款金额', dataIndex: 'applyAmount', align: 'center',
+      render: (text: any, record: any) => (
+        <div>￥{text}</div>
+      )
+    },
+    {
+      title: '付款时间', dataIndex: 'payTime', align: 'center',
+      render: (text: any, record: any) => (
+        <div>{moment(Number(text)).format('YYYY-MM-DD')}</div>
+      )
+    },
+    {
+      title: '付款金额', dataIndex: 'payAmount', align: 'center',
+      render: (text: any, record: any) => (
+        <div>￥{text}</div>
+      )
+    },
   ]
   /* 查看付款明细————————————————————查看付款明细———————————————————— */
   const rowSelection: any = {
@@ -49,15 +75,16 @@ const DrawerModal: React.FC<Iprops> = ({
     }
   }
   /* 请求查看付款明细 */
-  const getPaymentList = (params) => {
+  const fetchTableData = (params) => {
     return new Promise((resolve, reject) => {
-      PublicApi.getContractExecuteExecuteInfoPayDetailInfoPagePayDetail({
+      PublicApi.getContractExecuteExecuteInfoPayDetailList({
         ...params,
-        applyId,
+        executeId: item.id,
+        contractId,
       }).then(res => {
         if (res.code === 1000) {
-          console.log(res, '请求查看付款明细')
-          resolve(res.data)
+          console.log(res.data, '请求查看付款明细')
+          resolve(res)
         }
       })
     })
@@ -92,7 +119,7 @@ const DrawerModal: React.FC<Iprops> = ({
         columns={PaymentList}
         currentRef={ref}
         rowSelection={rowSelection}
-        fetchTableData={(params: any) => getPaymentList(params)}
+        fetchTableData={(params: any) => fetchTableData(params)}
       />
     </Drawer>
 

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

@@ -59,7 +59,8 @@ const Details = (props: any) => {
   /* 待请款 */
   const [unApplyAmount, setunApplyAmount] = useState<number>(0)
   /* 请款单id */
-  const [applyId, setapplyId] = useState<number>(0)
+  // const [applyId, setapplyId] = useState<number>(0)
+  const [item, setitem] = useState({});
   /* 执行情况分页 */
   const getContracInfoList = (data) => {
     setListLoading(true);
@@ -242,7 +243,7 @@ const Details = (props: any) => {
         return (
           <div>
             {
-              record.payAmount > 0 || record.unPayApplyAmount > 0 && <a onClick={() => getPayment(record.id)} className={style.gesture}>查看付款明细</a>
+              record.payAmount > 0 || record.unPayApplyAmount > 0 && <a onClick={() => getPayment(record)} className={style.gesture}>查看付款明细</a>
             }
             <a onClick={() => onModal(record, false)} style={{ marginLeft: 10 }} className={style.gesture}>请款</a>
           </div>
@@ -282,8 +283,8 @@ const Details = (props: any) => {
     }
   }
   /* 点击显示弹出 */
-  const getPayment = (id) => {
-    setapplyId(id)
+  const getPayment = (item) => {
+    setitem(item)
     setVisible(!visible)
   }
 
@@ -444,7 +445,7 @@ const Details = (props: any) => {
         <DetailedList contractId={contractId} />
       </div>
       {/* 选择弹出内容 */}
-      <DrawerModal visible={visible} applyId={applyId} setDrawerModal={setDrawerModal} />
+      <DrawerModal visible={visible} item={item} contractId={contractId} setDrawerModal={setDrawerModal} />
       {/* 请款弹出 */}
       <PopModal ModalVisible={ModalVisible} payType={payType} selectRowList={selectRow} contractId={contractId} basics={basics} setDrawerPopModal={setDrawerPopModal} />
     </div>

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

@@ -66,10 +66,10 @@ const coordinationList = () => {
     render: (text, record) =>
       <div>
         {
-          text &&
+          text && record.sourceId &&
           <EyePreview
             type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
-            url={record.sourceType == 1 ? `/memberCenter/procurementAbility/confirmOffer/offerInquire/demand/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
+            url={record.sourceType == 1 ? `/memberCenter/procurementAbility/offter/offter/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
           >
             {text}
           </EyePreview>

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

@@ -71,11 +71,15 @@ const pageToBeExamineOne = () => {
     align: 'center',
     render: (text, record) =>
       <div>
+        {
+          text && record.sourceId &&
           <EyePreview
-          type="button"
+            type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
+            url={record.sourceType == 1 ? `/memberCenter/procurementAbility/offter/offter/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
           >
             {text}
           </EyePreview>
+        }
         <p>{record.sourceTypeName}</p>
       </div>
   },

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

@@ -70,11 +70,15 @@ const pageToBeExamineTwo = () => {
     align: 'center',
     render: (text, record) =>
       <div>
+        {
+          text && record.sourceId &&
           <EyePreview
-          type="button"
+            type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
+            url={record.sourceType == 1 ? `/memberCenter/procurementAbility/offter/offter/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
           >
             {text}
           </EyePreview>
+        }
         <p>{record.sourceTypeName}</p>
       </div>
   },

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

@@ -68,11 +68,15 @@ const pageToBeSubmitExamine = () => {
     align: 'center',
     render: (text, record) =>
       <div>
+        {
+          text && record.sourceId &&
           <EyePreview
-          type="button"
+            type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
+            url={record.sourceType == 1 ? `/memberCenter/procurementAbility/offter/offter/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
           >
             {text}
           </EyePreview>
+        }
         <p>{record.sourceTypeName}</p>
       </div>
   },

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

@@ -67,11 +67,15 @@ const Sign = () => {
     align: 'center',
     render: (text, record) =>
       <div>
+        {
+          text && record.sourceId &&
           <EyePreview
-          type="button"
+            type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
+            url={record.sourceType == 1 ? `/memberCenter/procurementAbility/offter/offter/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
           >
             {text}
           </EyePreview>
+        }
         <p>{record.sourceTypeName}</p>
       </div>
   },

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

@@ -82,7 +82,7 @@ const table = (props: any) => {
       title: '含税/税率', dataIndex: 'taxRate', align: 'left',
       render: (text, record) =>
         <div>
-          <div>{text ? '是' : '否'}</div>
+          <div>{record.isHasTax ? '是' : '否'}</div>
           <div>%{text}</div>
         </div>
 

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

@@ -29,6 +29,7 @@ const BillDetails = (props: any) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [StepList, setStepList] = useState<any>([]);
   const [applyAbstract, setapplyAbstract] = useState('');
+  const [applyNo, setapplyNo] = useState('');
   const [reason, setDatareason] = useState('');
   const [status, setstatus] = useState<any>()
   const [ExamineFlag, setExamineFlag] = useState<boolean>(false);
@@ -87,6 +88,7 @@ const BillDetails = (props: any) => {
         setbasicInfo(basicInfo)
         setStepList(taskStepList);
         setapplyAbstract(basics.applyAbstract)
+        setapplyNo(basics.applyNo)
         setstatus(basics.status)
       }
     })
@@ -172,7 +174,7 @@ const BillDetails = (props: any) => {
                   marginLeft: '8px',
                 }}
               >
-                {applyAbstract}
+                {applyAbstract} | {applyNo}
               </span>
             </div>
 

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

@@ -80,7 +80,7 @@ const QueryList = () => {
       return (
         <div>
           {
-            text &&
+            text && record.sourceId &&
             <EyePreview
               type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
               url={record.sourceType == 1 ? `/memberCenter/procurementAbility/confirmOffer/offerInquire/demand/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}

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

+.anchorWrap :global .ant-pro-basicLayout-content {
+  margin: 0 !important;
+}
 .anchorWrap :global .ant-anchor {
   display: flex;
   align-items: center;
@@ -59,6 +62,8 @@
 }
 .card .list {
   display: flex;
+}
+.card .list h5 {
   margin-bottom: 2em;
 }
 .card .list .listLable {
@@ -71,7 +76,6 @@
 .listItem .label {
   flex: 0.2;
   padding: 0 16px;
-  color: #00b37a;
   background: linear-gradient(270deg, #ffffff 0%, #daf2e7 100%);
 }
 .listItem .text {
@@ -157,7 +161,3 @@
   margin-left: 19px;
   color: #c0c4cc;
 }
-.box :global .ant-table-expanded-row-level-1 .ant-table-cell {
-  padding: 0px !important;
-  background-color: #ffffff;
-}

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

 .anchorWrap {
   :global {
+    .ant-pro-basicLayout-content{
+      margin: 0 !important;
+    }
     .ant-anchor {
       display: flex;
       align-items: center;
@@ -33,6 +36,7 @@
     padding: 0 16px;
   }
 }
+
 /** 卡片样式 */
 .card {
   margin: 24px;
@@ -66,9 +70,8 @@
   }
   .list {
     display: flex;
-    margin-bottom: 2em;
     h5 {
-      // margin-bottom: 2em;
+      margin-bottom: 2em;
     }
     .listLable {
       flex: 0 0 25%;
@@ -82,7 +85,6 @@
     .label {
       flex: 0.2;
       padding: 0 16px;
-      color: #00b37a;
       background: linear-gradient(270deg, #ffffff 0%, #daf2e7 100%);
     }
     .text {
@@ -168,7 +170,6 @@
   .upload_right {
     color: #00b37a;
     cursor: pointer;
-
     :global {
       .anticon-delete {
         margin-left: 19px;
@@ -176,13 +177,8 @@
       }
     }
   }
+
 }
 
-  .box{
-   :global {
-    .ant-table-expanded-row-level-1 .ant-table-cell {
-      padding: 0px !important;
-      background-color: #ffffff;
-    }
-   }
-  }
+
+

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

@@ -60,6 +60,7 @@ const Details = (props: any) => {
   const [targetOffset, setTargetOffset] = useState<number | undefined>(undefined);
   const [contractAbstract, setcontractAbstract] = useState('');
   const [signatureLogId, setsignatureLogId] = useState<any>('') // 签署地址id
+  const [contractNo, setcontractNo] = useState('');
   /* 总金额 */
   const [tobidCount, settobidCount] = useState<number>(0);
   const [bidAmount, setbidAmount] = useState<number>(0);
@@ -103,6 +104,7 @@ const Details = (props: any) => {
         setpayPlanList(payPlanList)
         setcontractText(contractText)
         setcontractAbstract(contractAbstract)
+        setcontractNo(basics.contractNo)
       }
     })
   }
@@ -308,7 +310,7 @@ const Details = (props: any) => {
 
                 }}
               >
-                {contractAbstract}
+                {contractAbstract} | {contractNo}
               </span>
             </div>
 

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

@@ -80,10 +80,10 @@ const Examine = () => {
       return (
         <div>
           {
-            text &&
+            text && record.sourceId &&
             <EyePreview
-              type={record.sourceId ? 'link' : 'button'}
-              url={`/memberCenter/procurementAbility/offter/view?id${record.sourceId}&number${record.sourceNo}`}
+              type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
+              url={record.sourceType == 1 ? `/memberCenter/procurementAbility/confirmOffer/offerInquire/demand/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
             >
               {text}
             </EyePreview>

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

@@ -81,9 +81,10 @@ const Levelexamine = () => {
       return (
         <div>
           {
-            text &&
+            text && record.sourceId &&
             <EyePreview
-              type="button"
+              type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
+              url={record.sourceType == 1 ? `/memberCenter/procurementAbility/confirmOffer/offerInquire/demand/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
             >
               {text}
             </EyePreview>

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

@@ -76,9 +76,10 @@ const Secondaryexamine = () => {
       return (
         <div>
           {
-            text &&
+            text && record.sourceId &&
             <EyePreview
-              type="button"
+              type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
+              url={record.sourceType == 1 ? `/memberCenter/procurementAbility/confirmOffer/offerInquire/demand/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
             >
               {text}
             </EyePreview>

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

@@ -80,9 +80,10 @@ const Signacontract = () => {
       return (
         <div>
           {
-            text &&
+            text && record.sourceId &&
             <EyePreview
-              type="button"
+              type={record.sourceType == 1 ? record.sourceId ? 'link' : "button" : 'link'}
+              url={record.sourceType == 1 ? `/memberCenter/procurementAbility/confirmOffer/offerInquire/demand/preview?id=${record.sourceId}&number${record.sourceNo}` : `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.sourceId}`}
             >
               {text}
             </EyePreview>