fix: lint
This commit is contained in:
@@ -2,7 +2,7 @@ import type { PageParam, PageResult } from '@vben/request';
|
||||
|
||||
import { requestClient } from '#/api/request';
|
||||
|
||||
namespace ErpFinanceReceiptApi {
|
||||
export namespace ErpFinanceReceiptApi {
|
||||
/** 收款单项 */
|
||||
export interface FinanceReceiptItem {
|
||||
id?: number;
|
||||
|
||||
@@ -740,7 +740,10 @@
|
||||
"name": "FailedJobRetryTimeCycle",
|
||||
"superClass": ["Element"],
|
||||
"meta": {
|
||||
"allowedIn": ["activiti:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
|
||||
"allowedIn": [
|
||||
"activiti:AsyncCapable",
|
||||
"bpmn:MultiInstanceLoopCharacteristics"
|
||||
]
|
||||
},
|
||||
"properties": [
|
||||
{
|
||||
|
||||
@@ -727,7 +727,10 @@
|
||||
"name": "FailedJobRetryTimeCycle",
|
||||
"superClass": ["Element"],
|
||||
"meta": {
|
||||
"allowedIn": ["camunda:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
|
||||
"allowedIn": [
|
||||
"camunda:AsyncCapable",
|
||||
"bpmn:MultiInstanceLoopCharacteristics"
|
||||
]
|
||||
},
|
||||
"properties": [
|
||||
{
|
||||
|
||||
@@ -910,7 +910,10 @@
|
||||
"name": "FailedJobRetryTimeCycle",
|
||||
"superClass": ["Element"],
|
||||
"meta": {
|
||||
"allowedIn": ["flowable:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
|
||||
"allowedIn": [
|
||||
"flowable:AsyncCapable",
|
||||
"bpmn:MultiInstanceLoopCharacteristics"
|
||||
]
|
||||
},
|
||||
"properties": [
|
||||
{
|
||||
@@ -1254,11 +1257,11 @@
|
||||
"allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
|
||||
},
|
||||
"properties": [
|
||||
{
|
||||
"name": "value",
|
||||
"type": "Integer",
|
||||
"isBody": true
|
||||
}
|
||||
{
|
||||
"name": "value",
|
||||
"type": "Integer",
|
||||
"isBody": true
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@@ -238,7 +238,7 @@ watch(
|
||||
<IconifyIcon
|
||||
icon="ant-design:check-circle-filled"
|
||||
v-if="valid"
|
||||
style=" margin-left: 8px;color: green"
|
||||
style="margin-left: 8px; color: green"
|
||||
/>
|
||||
</div>
|
||||
<div style="display: flex; align-items: center; margin-top: 10px">
|
||||
|
||||
@@ -18,7 +18,8 @@ const routes: RouteRecordRaw[] = [
|
||||
title: '产品详情',
|
||||
activePath: '/iot/device/product',
|
||||
},
|
||||
component: () => import('#/views/iot/product/product/modules/detail/index.vue'),
|
||||
component: () =>
|
||||
import('#/views/iot/product/product/modules/detail/index.vue'),
|
||||
},
|
||||
{
|
||||
path: 'device/detail/:id',
|
||||
@@ -27,11 +28,11 @@ const routes: RouteRecordRaw[] = [
|
||||
title: '设备详情',
|
||||
activePath: '/iot/device/device',
|
||||
},
|
||||
component: () => import('#/views/iot/device/device/modules/detail/index.vue'),
|
||||
component: () =>
|
||||
import('#/views/iot/device/device/modules/detail/index.vue'),
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
export default routes;
|
||||
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
import type { VbenFormSchema } from '#/adapter/form';
|
||||
import type { Ref } from 'vue';
|
||||
|
||||
import type { VbenFormSchema } from '#/adapter/form';
|
||||
import type { CrmBusinessApi } from '#/api/crm/business';
|
||||
import type { DescriptionItemSchema } from '#/components/description';
|
||||
|
||||
import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
|
||||
|
||||
import { DEFAULT_STATUSES, getBusinessStatusSimpleList } from '#/api/crm/business/status';
|
||||
import {
|
||||
DEFAULT_STATUSES,
|
||||
getBusinessStatusSimpleList,
|
||||
} from '#/api/crm/business/status';
|
||||
|
||||
/** 详情页的字段 */
|
||||
export function useDetailSchema(): DescriptionItemSchema[] {
|
||||
|
||||
@@ -70,4 +70,3 @@ export function useDetailBaseSchema(): DescriptionItemSchema[] {
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@@ -31,8 +31,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
|
||||
{
|
||||
field: 'receivable',
|
||||
label: '实际回款金额',
|
||||
content: (data) =>
|
||||
erpPriceInputFormatter(data?.receivable?.price ?? 0),
|
||||
content: (data) => erpPriceInputFormatter(data?.receivable?.price ?? 0),
|
||||
},
|
||||
];
|
||||
}
|
||||
@@ -78,8 +77,7 @@ export function useDetailBaseSchema(): DescriptionItemSchema[] {
|
||||
{
|
||||
field: 'receivable',
|
||||
label: '实际回款金额',
|
||||
content: (data) =>
|
||||
erpPriceInputFormatter(data?.receivable?.price ?? 0),
|
||||
content: (data) => erpPriceInputFormatter(data?.receivable?.price ?? 0),
|
||||
},
|
||||
{
|
||||
field: 'receivableRemain',
|
||||
@@ -92,8 +90,7 @@ export function useDetailBaseSchema(): DescriptionItemSchema[] {
|
||||
{
|
||||
field: 'receivable.returnTime',
|
||||
label: '实际回款日期',
|
||||
content: (data) =>
|
||||
formatDateTime(data?.receivable?.returnTime) as string,
|
||||
content: (data) => formatDateTime(data?.receivable?.returnTime) as string,
|
||||
},
|
||||
{
|
||||
field: 'remark',
|
||||
|
||||
@@ -38,8 +38,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||
ajax: {
|
||||
query: async (_, formValues) => {
|
||||
const res = await getDatas(activeTabName.value, formValues);
|
||||
await renderLeftEcharts(getChartOptions(activeTabName.value, res).left);
|
||||
await renderRightEcharts(getChartOptions(activeTabName.value, res).right);
|
||||
await renderLeftEcharts(
|
||||
getChartOptions(activeTabName.value, res).left,
|
||||
);
|
||||
await renderRightEcharts(
|
||||
getChartOptions(activeTabName.value, res).right,
|
||||
);
|
||||
return res;
|
||||
},
|
||||
},
|
||||
|
||||
@@ -26,17 +26,18 @@ const formData = ref<
|
||||
}
|
||||
>({
|
||||
id: undefined,
|
||||
no: undefined,
|
||||
customerId: undefined,
|
||||
accountId: undefined,
|
||||
financeUserId: undefined,
|
||||
receiptTime: undefined,
|
||||
remark: undefined,
|
||||
no: '',
|
||||
customerId: 0,
|
||||
accountId: 0,
|
||||
financeUserId: 0,
|
||||
receiptTime: new Date(),
|
||||
remark: '',
|
||||
fileUrl: undefined,
|
||||
totalPrice: 0,
|
||||
discountPrice: 0,
|
||||
receiptPrice: 0,
|
||||
items: [],
|
||||
status: 0,
|
||||
});
|
||||
|
||||
const formType = ref(''); // 表单类型:'create' | 'edit' | 'detail'
|
||||
@@ -141,7 +142,21 @@ const [Modal, modalApi] = useVbenModal({
|
||||
},
|
||||
async onOpenChange(isOpen: boolean) {
|
||||
if (!isOpen) {
|
||||
formData.value = undefined;
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
no: '',
|
||||
customerId: 0,
|
||||
accountId: 0,
|
||||
financeUserId: 0,
|
||||
receiptTime: new Date(),
|
||||
remark: '',
|
||||
totalPrice: 0,
|
||||
discountPrice: 0,
|
||||
receiptPrice: 0,
|
||||
status: 0,
|
||||
items: [],
|
||||
bizNo: '',
|
||||
};
|
||||
return;
|
||||
}
|
||||
// 加载数据
|
||||
@@ -191,4 +206,4 @@ const [Modal, modalApi] = useVbenModal({
|
||||
</template>
|
||||
</Form>
|
||||
</Modal>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
@@ -114,4 +114,4 @@ const handleOk = () => {
|
||||
>
|
||||
<Grid class="max-h-[600px]" table-title="销售订单列表(仅展示可退货)" />
|
||||
</Modal>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
@@ -305,4 +305,4 @@ onMounted(async () => {
|
||||
/>
|
||||
</template>
|
||||
</Grid>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
@@ -167,7 +167,9 @@ async function submit(channelCode: string) {
|
||||
|
||||
// 打开轮询任务
|
||||
createQueryInterval();
|
||||
} finally {}
|
||||
} finally {
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
/** 构建提交支付的额外参数 */
|
||||
|
||||
@@ -62,4 +62,4 @@ const [Modal, modalApi] = useVbenModal({
|
||||
<Grid />
|
||||
</Page>
|
||||
</Modal>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
@@ -37,7 +37,9 @@ function handleEdit(row: WalletRechargePackageApi.WalletRechargePackage) {
|
||||
}
|
||||
|
||||
/** 删除套餐 */
|
||||
async function handleDelete(row: WalletRechargePackageApi.WalletRechargePackage) {
|
||||
async function handleDelete(
|
||||
row: WalletRechargePackageApi.WalletRechargePackage,
|
||||
) {
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting', [row.name]),
|
||||
duration: 0,
|
||||
|
||||
Reference in New Issue
Block a user