项目监督列表、项目委托列表项目名称列宽优化

2022-06-15 16:52:15 +08:00
parent 7dc348be97
commit e4d912cb79
14 changed files with 140 additions and 117 deletions
--- a/src/pages/Finance/Cost/components/Complete.tsx
+++ b/src/pages/Finance/Cost/components/Complete.tsx
@ -18,9 +18,9 @@ const Complete: React.FC<{}> = () => {

  const columnsComplete: ProColumns<any>[] = [
    //已完成表格
-    { title: '项目名称', dataIndex: 'projectName', width: 200 },
+    { title: '项目名称', dataIndex: 'projectName', width: '35%' },
    {
-      title: '费用类型', width: 100, render: (_, record) => {
+      title: '费用类型', width: '5%', render: (_, record) => {
        let val = '-';
        if (record.expensesType == '1') {//标书费  采购文件费用 招募文件费用
          if (record.bidMethodDict === 'procurement_mode_1' || record.bidMethodDict === 'procurement_mode_2') {
@ -40,14 +40,14 @@ const Complete: React.FC<{}> = () => {
        return val;
      }
    },
-    { title: '费用内容描述', dataIndex: 'commodityDescribe' },
-    { title: '下单时间', dataIndex: 'createDate', width: 100, valueType: 'dateTime' },
-    { title: '支付时间', dataIndex: 'paymentTime', width: 100, valueType: 'dateTime' },
-    { title: '金额(元)', dataIndex: 'amount', width: 80 },
+    { title: '费用内容描述', dataIndex: 'commodityDescribe', width: '25%' },
+    { title: '下单时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime' },
+    { title: '支付时间', dataIndex: 'paymentTime', width: '10%', valueType: 'dateTime' },
+    { title: '金额(元)', dataIndex: 'amount', width: '4%' },
    {
      title: '操作',
      dataIndex: 'option',
-      width: 150,
+      width: '3%',
      valueType: 'option',
      render: (_, record) => {
        if (record.bidInvoice == null) {
@ -99,6 +99,8 @@ const Complete: React.FC<{}> = () => {
          getCheckboxProps: (record) => ({
            disabled: record.bidInvoice == null ? false : true
          }),
+          columnWidth: '1px',
+          fixed: true,
        }}
        pagination={{ defaultPageSize: 10 }} //默认显示条数
        // bordered
--- a/src/pages/Finance/Cost/index.tsx
+++ b/src/pages/Finance/Cost/index.tsx
@ -30,11 +30,16 @@ const finance: React.FC<{}> = () => {
    setActiveKey(key);
  }
  const columns: ProColumns<any>[] = [//未支付
-    { title: '序号', valueType: 'index', width: 60, hideInTable: true },
-    { title: '项目名称', dataIndex: 'projectName', },
-    { title: '订单号', dataIndex: 'orderNumber', width: 100, },
+    { title: '序号', valueType: 'index', width: 0, hideInTable: true },
+    { title: '项目名称', dataIndex: 'projectName', width: '25%', },
    {
-      title: '费用类型', width: 100, render: (_, record) => {
+      title: '订单号', dataIndex: 'orderNumber', width: '9.3%',
+      render: (record) => {
+        return <span style={{ wordBreak: 'break-all', wordWrap: 'break-word' }}>{record}</span>
+      }
+    },
+    {
+      title: '费用类型', width: '5%', render: (_, record) => {
        let val = '-';
        if (record.expensesType == '1') {//标书费  采购文件费用 招募文件费用
          if (record.bidMethodDict === 'procurement_mode_1' || record.bidMethodDict === 'procurement_mode_2') {
@ -54,11 +59,11 @@ const finance: React.FC<{}> = () => {
        return val;
      }
    },
-    { title: '费用内容描述', dataIndex: 'commodityDescribe', },
-    { title: '下单时间', dataIndex: 'createDate', width: 100, valueType: 'dateTime', },
-    { title: '金额(元)', dataIndex: 'amount', width: 100, },
+    { title: '费用内容描述', dataIndex: 'commodityDescribe', width: '25%', },
+    { title: '下单时间', dataIndex: 'createDate', width: '6%', valueType: 'dateTime', },
+    { title: '金额(元)', dataIndex: 'amount', width: '4%', },
    {
-      title: '状态', dataIndex: 'state', width: 80,
+      title: '状态', dataIndex: 'state', width: '3%',
      valueEnum: {
        "0": { text: '未支付', },
        "1": { text: '支付中', },
@ -69,7 +74,7 @@ const finance: React.FC<{}> = () => {
      },
    },
    {
-      title: '操作', dataIndex: 'option', width: 150,
+      title: '操作', dataIndex: 'option', width: '5%',
      valueType: 'option',
      render: (_, record) => {
        return (
--- a/src/pages/Finance/ProjectManager/RevenueRecognition/components/AlreadyConfirmed.tsx
+++ b/src/pages/Finance/ProjectManager/RevenueRecognition/components/AlreadyConfirmed.tsx
@ -22,13 +22,13 @@ const AlreadyConfirmed: React.FC<{}> = () => {
      title: '项目名称',
      dataIndex: 'projectName',
      key: 'projectName',
-      width: '15%',
+      width: '25%',
    },
    {
      title: '订单编号',
      dataIndex: 'orderNumber',
      key: 'orderNumber',
-      width:140,
+      width: '9.3%',
      render: (record) => {
        return <span style={{wordBreak:'break-all',wordWrap:'break-word'}}>{record}</span>
      }
@ -37,7 +37,7 @@ const AlreadyConfirmed: React.FC<{}> = () => {
      title: '费用类别',
      dataIndex: 'expensesType',
      key: 'expensesType',
-      width: '10%',
+      width: '6.1%',
      valueType: 'select',
      valueEnum: {
        '1': '标书费',
@ -68,35 +68,35 @@ const AlreadyConfirmed: React.FC<{}> = () => {
      title: '缴费单位',
      dataIndex: 'payerName',
      key: 'payerName',
-      width: '12%',
+      width: '15%',
      search: false,
    },
    {
-      title: '订单金额（元）',
+      title: '订单金额(元)',
      dataIndex: 'cartAmount',
      key: 'cartAmount',
-      width: '10%',
+      width: '6%',
      search: false,
    },
    {
-      title: '实际支付金额（元）',
+      title: '实际支付金额(元)',
      dataIndex: 'amount',
      key: 'amount',
-      width: '10%',
+      width: '5%',
      search: false,
    },
    {
      title: '付款人',
      dataIndex: 'payerUserName',
      key: 'payerUserName',
-      width: '8%',
+      width: '3.6%',
      search: false,
    },
    {
      title: '付款时间',
      dataIndex: 'paymentTime',
      key: 'paymentTime',
-      width: '10%',
+      width: '9.5%',
      valueType: 'dateTime',
      search: false,
    },
@ -104,7 +104,7 @@ const AlreadyConfirmed: React.FC<{}> = () => {
      title: '支付方式',
      dataIndex: 'paymentMethod',
      key: 'paymentMethod',
-      width: '8%',
+      width: '5%',
      valueType: 'select',
      valueEnum: {
        '0': '线上支付',
@ -115,7 +115,7 @@ const AlreadyConfirmed: React.FC<{}> = () => {
      title: '支付状态',
      dataIndex: 'state',
      key: 'state',
-      width: '10%',
+      width: '5%',
      valueType: 'select',
      valueEnum: {
        '2': '支付成功',
@ -139,7 +139,7 @@ const AlreadyConfirmed: React.FC<{}> = () => {
    {
      title: '操作',
      valueType: 'option',
-      width: '5%',
+      width: '3.5%',
      render: (text, record, _, action) => (
        <a key="view" onClick={() => toView(record)} className="operation">
          查看
--- a/src/pages/Finance/ProjectManager/RevenueRecognition/components/WaitConfirmed.tsx
+++ b/src/pages/Finance/ProjectManager/RevenueRecognition/components/WaitConfirmed.tsx
@ -26,13 +26,13 @@ const WaitConfirmed: React.FC<{}> = () => {
      title: '项目名称',
      dataIndex: 'projectName',
      key: 'projectName',
-      width: '20%',
+      width: '25%',
    },
    {
      title: '订单编号',
      dataIndex: 'orderNumber',
      key: 'orderNumber',
-      width: 140,
+      width: '9.3%',
      render: (record) => {
        return <span style={{ wordBreak: 'break-all', wordWrap: 'break-word' }}>{record}</span>
      }
@ -41,7 +41,7 @@ const WaitConfirmed: React.FC<{}> = () => {
      title: '费用类别',
      dataIndex: 'expensesType',
      key: 'expensesType',
-      width: '10%',
+      width: '6.1%',
      valueType: 'select',
      valueEnum: {
        '1': '标书费',
@ -72,28 +72,28 @@ const WaitConfirmed: React.FC<{}> = () => {
      title: '缴费单位',
      dataIndex: 'payerName',
      key: 'payerName',
-      width: '12%',
+      width: '15%',
      search: false,
    },
    {
-      title: '订单金额（元）',
+      title: '订单金额(元)',
      dataIndex: 'cartAmount',
      key: 'cartAmount',
-      width: '12%',
+      width: '6.9%',
      search: false,
    },
    {
      title: '下单人',
      dataIndex: 'payerUserName',
      key: 'payerUserName',
-      width: '8%',
+      width: '3.6%',
      search: false,
    },
    {
      title: '付款时间',
      dataIndex: 'paymentTime',
      key: 'paymentTime',
-      width: '10%',
+      width: '9.5%',
      valueType: 'dateTime',
      search: false,
    },
@ -101,7 +101,7 @@ const WaitConfirmed: React.FC<{}> = () => {
      title: '支付方式',
      dataIndex: 'paymentMethod',
      key: 'paymentMethod',
-      width: '8%',
+      width: '5%',
      valueType: 'select',
      valueEnum: {
        '0': '线上支付',
@ -112,7 +112,7 @@ const WaitConfirmed: React.FC<{}> = () => {
      title: '支付状态',
      dataIndex: 'state',
      key: 'state',
-      width: '10%',
+      width: '5%',
      valueType: 'select',
      valueEnum: {
        '0': '待支付',
@ -137,7 +137,7 @@ const WaitConfirmed: React.FC<{}> = () => {
    {
      title: '操作',
      valueType: 'option',
-      width: '15%',
+      width: '10%',
      render: (text, record, _, action) => {
        return (
          <>