Bladeren bron

feat: 1111

lanjianrong 4 jaren geleden
bovenliggende
commit
da7495b7d2

+ 4 - 4
src/pages/Statistic/Product/InvoiceAggregate/index.jsx

@@ -30,7 +30,7 @@ const InvoiceAggregate = () => {
       align: 'center'
     },
     {
-      dataIndex: 'creditPrice',
+      dataIndex: 'invoicePrice',
       title: '开票金额(元)',
       align: 'center',
       render: text => <div className="text-right">{text}</div>
@@ -42,7 +42,7 @@ const InvoiceAggregate = () => {
       render: text => <div className="text-right">{text}</div>
     },
     {
-      dataIndex: 'invoicePrice',
+      dataIndex: 'creditPrice',
       title: '入账金额(元)',
       align: 'center',
       render: text => <div className="text-right">{text}</div>
@@ -131,13 +131,13 @@ const InvoiceAggregate = () => {
               <Table.Summary.Row>
                 <Table.Summary.Cell className="text-center">{state.sum?.name}</Table.Summary.Cell>
                 <Table.Summary.Cell className="text-right">
-                  {state.sum?.creditPrice}
+                  {state.sum?.invoicePrice}
                 </Table.Summary.Cell>
                 <Table.Summary.Cell className="text-right">
                   {state.sum?.receivablesPrice}
                 </Table.Summary.Cell>
                 <Table.Summary.Cell className="text-right">
-                  {state.sum?.invoicePrice}
+                  {state.sum?.creditPrice}
                 </Table.Summary.Cell>
               </Table.Summary.Row>
             </>

+ 4 - 4
src/pages/Statistic/Product/InvoiceTrends/index.jsx

@@ -14,7 +14,7 @@ const InvoiceTrends = () => {
       optionType: 'staff',
       dataIds: [],
       priceType: 'invoice',
-      startMonth: [dayjs(new Date()), dayjs(new Date())]
+      startMonth: dayjs(new Date())
     },
     chart: []
   })
@@ -212,10 +212,10 @@ const InvoiceTrends = () => {
             </div>
           ],
           actions: [
-            <DatePicker.RangePicker
-              picker="month"
+            <DatePicker
+              picker="year"
               key="DatePicker"
-              disabledDate={current => disabledDate(current, 'month')}
+              disabledDate={current => disabledDate(current, 'year')}
               value={state.startMonth}
               onChange={val => setState({ ...state, params: { ...state.params, startMonth: val } })}
             />