yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: code format

pull/209/head
xingyu4j 2025-09-03 16:35:00 +08:00
parent e6f76c097d
commit 44eebda749
4 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web-antd/src/views/erp/home/components/TimeSummaryChart.vue
View File

@ -1,6 +1,4 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { EChartsOption } from 'echarts';
import type { EchartsUIType } from '@vben/plugins/echarts'; import type { EchartsUIType } from '@vben/plugins/echarts';
import type { ErpPurchaseStatisticsApi } from '#/api/erp/statistics/purchase'; import type { ErpPurchaseStatisticsApi } from '#/api/erp/statistics/purchase';
@ -51,7 +49,7 @@ const chartRef = ref<EchartsUIType>();
const { renderEcharts } = useEcharts(chartRef); const { renderEcharts } = useEcharts(chartRef);
/** 折线图配置 */ /** 折线图配置 */
const lineChartOptions: EChartsOption = { const lineChartOptions: echarts.EChartsOption = {
grid: { grid: {
left: 20, left: 20,
right: 20, right: 20,
@ -138,7 +136,7 @@ watch(
}, },
series: [ series: [
{ {
...lineChartOptions.series![0], ...(lineChartOptions.series as any)[0],
data: seriesData, data: seriesData,
}, },
], ],

20
apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-form.vue
View File

@ -1,17 +1,21 @@
<script lang="ts" setup> <script lang="ts" setup>
import type {ErpPurchaseOrderApi} from '#/api/erp/purchase/order'; import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
import type {ErpPurchaseReturnApi} from '#/api/erp/purchase/return'; import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return';
import {createPurchaseReturn, getPurchaseReturn, updatePurchaseReturn} from '#/api/erp/purchase/return';
import {computed, nextTick, ref, watch} from 'vue'; import { computed, nextTick, ref, watch } from 'vue';
import {useVbenModal} from '@vben/common-ui'; import { useVbenModal } from '@vben/common-ui';
import {message} from 'ant-design-vue'; import { message } from 'ant-design-vue';
import {useVbenForm} from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import {
createPurchaseReturn,
getPurchaseReturn,
updatePurchaseReturn,
} from '#/api/erp/purchase/return';
import {useFormSchema} from '../data'; import { useFormSchema } from '../data';
import PurchaseReturnItemForm from './purchase-return-item-form.vue'; import PurchaseReturnItemForm from './purchase-return-item-form.vue';
import SelectPurchaseOrderForm from './select-purchase-order-form.vue'; import SelectPurchaseOrderForm from './select-purchase-order-form.vue';

20
apps/web-antd/src/views/erp/sale/return/modules/sale-return-form.vue
View File

@ -1,17 +1,21 @@
<script lang="ts" setup> <script lang="ts" setup>
import type {ErpSaleOrderApi} from '#/api/erp/sale/order'; import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
import type {ErpSaleReturnApi} from '#/api/erp/sale/return'; import type { ErpSaleReturnApi } from '#/api/erp/sale/return';
import {createSaleReturn, getSaleReturn, updateSaleReturn} from '#/api/erp/sale/return';
import {computed, nextTick, ref, watch} from 'vue'; import { computed, nextTick, ref, watch } from 'vue';
import {useVbenModal} from '@vben/common-ui'; import { useVbenModal } from '@vben/common-ui';
import {message} from 'ant-design-vue'; import { message } from 'ant-design-vue';
import {useVbenForm} from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import {
createSaleReturn,
getSaleReturn,
updateSaleReturn,
} from '#/api/erp/sale/return';
import {useFormSchema} from '../data'; import { useFormSchema } from '../data';
import SaleReturnItemForm from './sale-return-item-form.vue'; import SaleReturnItemForm from './sale-return-item-form.vue';
import SelectSaleOrderForm from './select-sale-order-form.vue'; import SelectSaleOrderForm from './select-sale-order-form.vue';

7
apps/web-ele/src/views/member/user/components/user-order-list.vue
View File

@ -195,10 +195,9 @@ const [Grid] = useVbenVxeGrid({
</ElTag> </ElTag>
</div> </div>
<div class="order-item-info"> <div class="order-item-info">
<span>原价：{{ fenToYuan(item.price) }} 元 / 数量：{{ <span>
item.count 原价：{{ fenToYuan(item.price) }} 元 / 数量：{{ item.count }} 个
}} </span>
个</span>
<DictTag <DictTag
:type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS" :type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS"
:value="item.afterSaleStatus" :value="item.afterSaleStatus"