Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220613-将PUT和DELETE请求更改成POST请求

src/pages/Invoice/Manager/index.tsx

@@ -46,12 +46,12 @@ const Invoice: React.FC<any> = (props) => {
       title: '项目名称',
       dataIndex: 'projectName',
       valueType: 'text',
-      width: '12%',
+      width: '25%',
     },
     {
       title: '费用名称',
       dataIndex: 'commodityName',
-      width: '8%',
+      width: '6.1%',
       valueType: 'text',
       hideInSearch: true,//列表中显示，查询条件中不显示
       render: (_, record) => {
@@ -78,14 +78,14 @@ const Invoice: React.FC<any> = (props) => {
       title: '支付单位',
       valueType: 'text',
       hideInSearch: true,//列表中显示，查询条件中不显示
-      width: '10%',
+      width: '15%',
       dataIndex: 'payerName',
     },
     {
       title: '支付方式',
       valueType: 'text',
       hideInSearch: true,//列表中显示，查询条件中不显示
-      width: '8%',
+      width: '5%',
       dataIndex: 'paymentMethod',
       valueEnum: {
         "0": { text: '线上', status: '' },
@@ -103,7 +103,7 @@ const Invoice: React.FC<any> = (props) => {
       title: '付款状态',
       valueType: 'text',
       hideInSearch: true,//列表中显示，查询条件中不显示
-      width: '8%',
+      width: '5%',
       dataIndex: 'payState',
       valueEnum: {
         "0": { text: '未支付', status: '' },
@@ -119,14 +119,14 @@ const Invoice: React.FC<any> = (props) => {
       title: '金额',
       valueType: 'money',
       hideInSearch: true,//列表中显示，查询条件中不显示
-      width: '8%',
+      width: '4%',
       dataIndex: 'amount',
     },
     {
       title: '发票状态',
       valueType: 'select',
       dataIndex: 'invoiceState',
-      width: '8%',
+      width: '4.8%',
       valueEnum: {
         "0": { text: '未开', status: '' },
         "1": { text: '已开', status: '' },
@@ -136,7 +136,7 @@ const Invoice: React.FC<any> = (props) => {
       title: '需要邮寄',
       valueType: 'text',
       hideInSearch: true,//列表中显示，查询条件中不显示
-      width: '8%',
+      width: '4.8%',
       dataIndex: 'mail',
       valueEnum: {
         "0": { text: '不需要', status: '' },
@@ -147,7 +147,7 @@ const Invoice: React.FC<any> = (props) => {
       title: '邮寄状态',
       valueType: 'text',
       dataIndex: 'mailState',
-      width: '8%',
+      width: '4.8%',
       valueEnum: {
         "0": { text: '未邮寄', status: '' },
         "1": { text: '已邮寄', status: '' },
@@ -158,7 +158,7 @@ const Invoice: React.FC<any> = (props) => {
       dataIndex: 'type',
       hideInSearch: true,//列表中显示，查询条件中不显示
       valueType: 'text',
-      width: '8%',
+      width: '5%',
       valueEnum: {
         "0": { text: '增值税普通发票' },
         "1": { text: '增值税专用发票' },

src/pages/Invoice/Supplier/index.tsx

@@ -37,7 +37,7 @@ const InvoiceSupplier: React.FC<{}> = () => {
       title: '序号',
       dataIndex: 'key',
       key: 'key',
-      width: 60,
+      width: 50,
       search: false,
     },
     {
@@ -55,6 +55,7 @@ const InvoiceSupplier: React.FC<{}> = () => {
       dataIndex: 'type',
       key: 'type',
       valueType: 'select',
+      width: 115,
       valueEnum: {
         '0': '增值税普通发票',
         '1': '增值税专用发票',
@@ -65,6 +66,7 @@ const InvoiceSupplier: React.FC<{}> = () => {
       title: '发票状态',
       dataIndex: 'state',
       valueType: 'select',
+      width: 75,
       valueEnum: {
         '0': '未开',
         '1': '已开',
@@ -72,13 +74,14 @@ const InvoiceSupplier: React.FC<{}> = () => {
     },
     {
       title: '是否需要邮寄',
+      width: 100,
       render:(_: any,record: any) => record.isMail == -1 ? '无需邮寄' : '需要邮寄',
       search: false,
     },
     {
       title: '操作',
       dataIndex: 'option',
-      width: 80,
+      width: 70,
       valueType: 'option',
       search: false,
       render: (_, record) =>