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

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

@@ -22,7 +22,7 @@ const contractexecutionList = () => {
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
     dataIndex: 'contractNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <EyePreview
@@ -35,7 +35,7 @@ const contractexecutionList = () => {
   }, {
     title: '合同生效/失效时间',
     dataIndex: 'startTime',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <p>{text}</p>
@@ -45,12 +45,12 @@ const contractexecutionList = () => {
   }, {
     title: '合同乙方',
     dataIndex: 'partyBName',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '合同总金额',
     dataIndex: 'totalAmount',
-    align: 'center',
+    align: 'left',
     sorter: (a, b) => a.totalAmount - b.totalAmount,
     render: (text) => {
       return (
@@ -63,7 +63,7 @@ const contractexecutionList = () => {
   {
     title: '已执行金额',
     dataIndex: 'executeAmount',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <div>
@@ -75,7 +75,7 @@ const contractexecutionList = () => {
   {
     title: '已付款',
     dataIndex: 'payAmount',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <div>
@@ -87,7 +87,7 @@ const contractexecutionList = () => {
   {
     title: '已请款待付款',
     dataIndex: 'unPayApplyAmount',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <div>
@@ -99,7 +99,7 @@ const contractexecutionList = () => {
   {
     title: '未请款',
     dataIndex: 'unApplyAmount',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <div>
@@ -112,7 +112,7 @@ const contractexecutionList = () => {
   {
     title: '外部状态',
     dataIndex: 'outerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <span style={statuStyle.success}>{text}</span>

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

@@ -26,7 +26,7 @@ const coordinationList = () => {
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
     dataIndex: 'contractNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <EyePreview
@@ -39,7 +39,7 @@ const coordinationList = () => {
   }, {
     title: '合同生效/失效时间',
     dataIndex: 'startTime',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
       multiple: 1,
@@ -53,17 +53,17 @@ const coordinationList = () => {
   {
     title: '合同甲方',
     dataIndex: 'partyAName',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '合同总金额',
     dataIndex: 'totalAmount',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '对应单据/寻源类型',
     dataIndex: 'sourceNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         {
@@ -81,7 +81,7 @@ const coordinationList = () => {
   {
     title: '外部状态',
     dataIndex: 'outerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <span style={statuStyle.success}>{text}</span>
@@ -91,7 +91,7 @@ const coordinationList = () => {
   {
     title: '内部状态',
     dataIndex: 'innerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <span style={statuStyle.success}>{text}</span>
@@ -101,7 +101,7 @@ const coordinationList = () => {
   {
     title: '操作',
     dataIndex: 'innerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text, record) => {
       return (
         <span style={{ color: '#00B37A', cursor: 'pointer' }} onClick={() => history.push(`/memberCenter/contract/coordination/coordinationList/details?contractId=${record.id}`)}> 查看 </span>

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

@@ -24,7 +24,7 @@ const Sign = () => {
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
     dataIndex: 'contractNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <EyePreview
@@ -37,7 +37,7 @@ const Sign = () => {
   }, {
     title: '合同生效/失效时间',
     dataIndex: 'startTime',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
       multiple: 1,
@@ -51,12 +51,12 @@ const Sign = () => {
   {
     title: '合同甲方',
     dataIndex: 'partyAName',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '合同总金额',
     dataIndex: 'totalAmount',
-    align: 'center',
+    align: 'left',
     render: (text) =>
       <div>
         <p>￥ {text}</p>
@@ -65,7 +65,7 @@ const Sign = () => {
   {
     title: '已执行金额',
     dataIndex: 'executeAmount',
-    align: 'center',
+    align: 'left',
     render: (text) =>
       <div>
         <p>￥ {text}</p>
@@ -74,7 +74,7 @@ const Sign = () => {
   {
     title: '已付款',
     dataIndex: 'payAmount',
-    align: 'center',
+    align: 'left',
     render: (text) =>
       <div>
         <p>￥ {text}</p>
@@ -83,7 +83,7 @@ const Sign = () => {
   {
     title: '已请款待付款',
     dataIndex: 'unPayApplyAmount',
-    align: 'center',
+    align: 'left',
     render: (text) =>
       <div>
         <p>￥ {text}</p>
@@ -92,7 +92,7 @@ const Sign = () => {
   {
     title: '未请款',
     dataIndex: 'unApplyAmount',
-    align: 'center',
+    align: 'left',
     render: (text) =>
       <div>
         <p>￥ {text}</p>
@@ -101,7 +101,7 @@ const Sign = () => {
   {
     title: '外部状态',
     dataIndex: 'outerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <span style={statuStyle.success}>{text}</span>

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

@@ -31,7 +31,7 @@ const pageToBeExamineOne = () => {
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
     dataIndex: 'contractNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <EyePreview
@@ -44,7 +44,7 @@ const pageToBeExamineOne = () => {
   }, {
     title: '合同生效/失效时间',
     dataIndex: 'startTime',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
       multiple: 1,
@@ -58,17 +58,17 @@ const pageToBeExamineOne = () => {
   {
     title: '合同甲方',
     dataIndex: 'partyAName',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '合同总金额',
     dataIndex: 'totalAmount',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '对应单据/寻源类型',
     dataIndex: 'sourceNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         {
@@ -86,7 +86,7 @@ const pageToBeExamineOne = () => {
   {
     title: '外部状态',
     dataIndex: 'outerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <span style={statuStyle.success}>{text}</span>
@@ -96,7 +96,7 @@ const pageToBeExamineOne = () => {
   {
     title: '内部状态',
     dataIndex: 'innerStatus',
-    align: 'center',
+    align: 'left',
     render: (text, record) => {
       return (
         <div>
@@ -109,7 +109,7 @@ const pageToBeExamineOne = () => {
   {
     title: '操作',
     dataIndex: 'state',
-    align: 'center',
+    align: 'left',
     render: (text, record) => {
       return (
         <div>

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

@@ -30,7 +30,7 @@ const pageToBeExamineTwo = () => {
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
     dataIndex: 'contractNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <EyePreview
@@ -43,7 +43,7 @@ const pageToBeExamineTwo = () => {
   }, {
     title: '合同生效/失效时间',
     dataIndex: 'startTime',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
       multiple: 1,
@@ -57,17 +57,17 @@ const pageToBeExamineTwo = () => {
   {
     title: '合同甲方',
     dataIndex: 'partyAName',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '合同总金额',
     dataIndex: 'totalAmount',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '对应单据/寻源类型',
     dataIndex: 'sourceNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         {
@@ -85,7 +85,7 @@ const pageToBeExamineTwo = () => {
   {
     title: '外部状态',
     dataIndex: 'outerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <span style={statuStyle.success}>{text}</span>
@@ -95,7 +95,7 @@ const pageToBeExamineTwo = () => {
   {
     title: '内部状态',
     dataIndex: 'innerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <div>
@@ -108,7 +108,7 @@ const pageToBeExamineTwo = () => {
   {
     title: '操作',
     dataIndex: 'innerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text, record) => {
       return (
         <div>

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

@@ -28,7 +28,7 @@ const pageToBeSubmitExamine = () => {
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
     dataIndex: 'contractNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <EyePreview
@@ -41,7 +41,7 @@ const pageToBeSubmitExamine = () => {
   }, {
     title: '合同生效/失效时间',
     dataIndex: 'startTime',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
       multiple: 1,
@@ -55,12 +55,12 @@ const pageToBeSubmitExamine = () => {
   {
     title: '合同甲方',
     dataIndex: 'partyAName',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '合同总金额',
     dataIndex: 'totalAmount',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '对应单据/寻源类型',
@@ -83,7 +83,7 @@ const pageToBeSubmitExamine = () => {
   {
     title: '外部状态',
     dataIndex: 'outerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <span style={statuStyle.success}>{text}</span>
@@ -93,7 +93,7 @@ const pageToBeSubmitExamine = () => {
   {
     title: '内部状态',
     dataIndex: 'innerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <div>
@@ -106,7 +106,7 @@ const pageToBeSubmitExamine = () => {
   {
     title: '操作',
     dataIndex: 'innerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text, record) => {
       return (
         <div>

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

@@ -27,7 +27,7 @@ const Sign = () => {
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
     dataIndex: 'contractNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         <EyePreview
@@ -40,7 +40,7 @@ const Sign = () => {
   }, {
     title: '合同生效/失效时间',
     dataIndex: 'startTime',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
       multiple: 1,
@@ -54,17 +54,17 @@ const Sign = () => {
   {
     title: '合同甲方',
     dataIndex: 'partyAName',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '合同总金额',
     dataIndex: 'totalAmount',
-    align: 'center',
+    align: 'left',
   },
   {
     title: '对应单据/寻源类型',
     dataIndex: 'sourceNo',
-    align: 'center',
+    align: 'left',
     render: (text, record) =>
       <div>
         {
@@ -82,7 +82,7 @@ const Sign = () => {
   {
     title: '外部状态',
     dataIndex: 'outerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <span style={statuStyle.success}>{text}</span>
@@ -92,7 +92,7 @@ const Sign = () => {
   {
     title: '内部状态',
     dataIndex: 'innerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text) => {
       return (
         <div>
@@ -105,7 +105,7 @@ const Sign = () => {
   {
     title: '操作',
     dataIndex: 'innerStatusName',
-    align: 'center',
+    align: 'left',
     render: (text, record) => {
       return (
         <div>

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

@@ -27,8 +27,9 @@ const Auction = () => {
     align: 'left',
     render: (text, record) =>
       <div>
+        {/* memberCenter/procurementAbility/purchaseBid/search/detail?id=298&number=JJSQ30725 */}
         <EyePreview
-          type="button"
+          url={`/memberCenter/procurementAbility/purchaseBid/search/detail?id=${record.viePriceId}&number=${record.viePriceNO}`}
         >
           {text}
         </EyePreview>

src/pages/procurement/callForBids/extractNoticeManage/detail/index.tsx

@@ -60,7 +60,7 @@ const ExtractNoticeManageDetail: React.FC = () => {
   }
 
   const handleSubmit = (value) => {
-    PublicApi.postPurchaseExpertExtractRecordUpdateExpertExtractRecordStatus({...value, id, status: status ? true :false}).then(res => {
+    PublicApi.postPurchaseExpertExtractRecordUpdateExpertExtractRecordStatus({...value, id, status: status === '1' ? true : (status === '2' ? false : null)}).then(res => {
       const { code } = res
       if(code === 1000) {
         setTimeout(() => {

src/pages/procurement/callForBids/extractNoticeManage/model/useSelfTable.tsx

@@ -70,7 +70,7 @@ export const useSelfTable = () => {
       key: 'ctl',
       render: (text, record) => <>
         { record.status !== 3 && <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/callForBids/extractNoticeManage/detail?id=${record.id}&action=1&status=1`)}>确认</Button> }
-        { record.status !== 4 && <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/callForBids/extractNoticeManage/detail?id=${record.id}&action=1&status=0`)}>拒绝</Button> }
+        { record.status !== 4 && <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/callForBids/extractNoticeManage/detail?id=${record.id}&action=1&status=2`)}>拒绝</Button> }
         <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/callForBids/extractNoticeManage/detail?id=${record.id}`)}>查看</Button>
       </>
     }

src/pages/procurement/callForBids/firstCheckedBid/detail/index.tsx

@@ -53,6 +53,11 @@ const FirstCheckedBidDetail: React.FC = () => {
     { title: '流转记录', id: 'transferRecord', componentName: "BidTransformRecord" },
   ]
 
+  // 勾选资格预审 才有资格预审信息
+  if(!data?.isQualificationCheck) {
+    anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审要求' && anchorTitleList.splice(index, 1))
+  }
+
   return (
     <div>
       <BidDetailContext.Provider value={formContext}>

src/pages/procurement/callForBids/readyExpertRemark/model/useSelfTable.tsx

@@ -22,7 +22,7 @@ const baseBidListColumns: any[] = [
     dataIndex: ['inviteTender', 'code'],
     key: ['inviteTender', 'code'],
     render: (text, record) => <>
-      <EyePreview url={`${history.location.pathname}/detail?id=${record.id}`}>
+      <EyePreview url={`/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${record.inviteTender.id}`}>
         {text}
       </EyePreview>
       <div>{record.inviteTender.projectName}</div>

src/pages/procurement/callForBids/readyPassBid/components/bidConfirm/index.tsx

@@ -269,7 +269,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                       <div className={style['card-list']}>
                         <Row>
                           <Col span={8}><p className={style['card-list_title']}>授标总额:</p></Col>
-                          <Col><p>¥{(tableDataSource.reduce((a, b) => a + (b[item.dataIndex]['isAwardTender'] ? (b[item.dataIndex]['price'] * b.count * b[item.dataIndex]['awardRate'] / 100) : 0), 0)).toFixed(2)}(含税)</p></Col>
+                          <Col><p>¥{(tableDataSource.reduce((a, b) => a + (b[item.dataIndex]['isAwardTender'] ? (b[item.dataIndex]['price'] * b.count * b[item.dataIndex]['awardTenderRatio'] / 100) : 0), 0)).toFixed(2)}(含税)</p></Col>
                         </Row>
                       </div>
                       </div>

src/pages/procurement/callForBids/readySubmitBid/detail/index.tsx

@@ -63,6 +63,11 @@ const ReadySubmitBidDetail: React.FC = () => {
     { title: '流转记录', id: 'transferRecord', componentName: "BidTransformRecord" },
   ]
 
+  // 勾选资格预审 才有资格预审信息
+  if(!data?.isQualificationCheck) {
+    anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审要求' && anchorTitleList.splice(index, 1))
+  }
+
   return (
     <div>
       <BidDetailContext.Provider value={formContext}>

src/pages/procurement/callForBids/secondCheckedBid/detail/index.tsx

@@ -54,6 +54,11 @@ const SecondCheckedBidDetail: React.FC = () => {
     { title: '流转记录', id: 'transferRecord', componentName: "BidTransformRecord" },
   ]
 
+  // 勾选资格预审 才有资格预审信息
+  if(!data?.isQualificationCheck) {
+    anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审要求' && anchorTitleList.splice(index, 1))
+  }
+
   return (
     <div>
       <BidDetailContext.Provider value={formContext}>

src/pages/procurement/components/descriptionsInfo/index.tsx

@@ -124,7 +124,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
     {
       span: 8,
       fieldList: [
-        { title: '招标编号:', name: 'code', render: (t) => <a href={`/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${_data.inviteTender.id}`} target="_blank">{t}</a> },
+        { title: '招标编号:', name: 'code', render: (t) => <a href={`/memberCenter/procurementAbility/tender/callForBidsSearch/detail?id=${_data.inviteTender.id}`} target="_blank">{t}</a> },
         { title: '招标会员:', name: 'memberName' },
         {
           title: '适用城市:',

src/pages/procurement/tender/addTender/index.tsx

@@ -153,7 +153,7 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
     }
   }
 
-  const InviterCodeJump = () => <a target="_blank" href={`/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${code.id}`}>{code.code}</a>
+  const InviterCodeJump = () => <a target="_blank" href={`/memberCenter/procurementAbility/tender/callForBidsSearch/detail?id=${code.id}`}>{code.code}</a>
 
   return (
     <PageHeaderWrapper