mayf
2024-10-18 cf9a8ed8dcd2c509d63a0bd3f683f65c2df96888
财务报表调整
已修改2个文件
26 ■■■■■ 文件已修改
pages/report/finance/_date.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/report/finance/index.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/report/finance/_date.vue
@@ -127,7 +127,10 @@
                },
                default: this.$route.params.date,
              },
              { ...getPartnerListConfig() },
              {
                ...getPartnerListConfig(),
                default: this.$route.query.partnerId || '',
              },
            ],
          },
        ],
pages/report/finance/index.vue
@@ -4,7 +4,7 @@
      <el-row :gutter="20">
        <el-col :span="4" class="mb-10">
          <el-card>
            <div class="statistic-title">销售合计</div>
            <div class="statistic-title">销售合计(原订单)</div>
            <div class="statistic-num">{{ statistic.orderTotal || 0 }}</div>
          </el-card>
        </el-col>
@@ -82,7 +82,7 @@
        </el-col>
      </el-row>
    </div>
    <el-bus-crud v-bind="tableConfig" />
    <el-bus-crud ref="crud" v-bind="tableConfig" />
  </div>
</template>
@@ -93,10 +93,7 @@
dayjs.locale('zh-cn')
export default {
  data() {
    const endDate = `${dayjs().format('YYYY-MM-DD')} 00:00:00`
    const startDate = `${dayjs()
      .subtract(1, 'month')
      .format('YYYY-MM-DD')} 23:59:59`
    const defaultDate = `${dayjs().format('YYYY-MM-DD')} 00:00:00`
    return {
      statistic: {},
      statisticLoading: false,
@@ -110,8 +107,12 @@
        exportUrl: 'flower/v2/report/order/sale/export',
        exportText: '导出',
        onResetView: (row) => {
          const searchFormRef = this.$refs.crud.$refs.searchForm
          const searchFormValue = searchFormRef.getFormValue()
          const url = this.$router.resolve(
            `/report/finance/${row.orderDate}`
            `/report/finance/${row.orderDate}?partnerId=${
              searchFormValue?.partnerId || ''
            }`
          ).href
          window.open(url, '_blank')
        },
@@ -159,8 +160,8 @@
            minWidth: 120,
            fixed: 'left',
          },
          { label: '销售额', prop: 'orderTotal', minWidth: 120 },
          { label: '销售额(实际支付)', prop: 'totalAmount', minWidth: 120 },
          { label: '销售额(原订单)', prop: 'orderTotal', minWidth: 120 },
          { label: '销售额(实付)', prop: 'totalAmount', minWidth: 120 },
          {
            label: '花农底价',
            prop: 'orderSupplierPriceAmount',
@@ -233,7 +234,7 @@
                },
                customClass: 'in-bus-form',
                commonRules: true,
                default: [startDate, endDate],
                default: [defaultDate, defaultDate],
              },
              { ...getPartnerListConfig(), label: '合伙人' },
            ],