Merge branch 'dev-srm' of http://10.0.0.22:3000/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>