refactor: refs #8744 fixed warnings in many list
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
0b4b0295fa
commit
5521c72463
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
const model = defineModel({ type: Boolean, required: true });
|
||||
const model = defineModel({ type: [Boolean, String], required: true });
|
||||
</script>
|
||||
<template>
|
||||
<QRadio
|
||||
|
|
|
@ -23,7 +23,7 @@ const $props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
options: {
|
||||
type: Array,
|
||||
type: [Array, Object],
|
||||
default: () => [],
|
||||
},
|
||||
optionLabel: {
|
||||
|
|
|
@ -185,7 +185,7 @@ function exprBuilder(param, value) {
|
|||
<template>
|
||||
<VnSubToolbar>
|
||||
<template #st-data>
|
||||
<CustomerBalanceDueTotal :amount="arrayData.store.data?.amount" />
|
||||
<CustomerBalanceDueTotal :amount="parseInt(arrayData.store.data?.amount)" />
|
||||
</template>
|
||||
<template #st-actions>
|
||||
<QBtn
|
||||
|
|
|
@ -15,10 +15,6 @@ const $props = defineProps({
|
|||
type: Array,
|
||||
required: true,
|
||||
},
|
||||
promise: {
|
||||
type: Function,
|
||||
required: true,
|
||||
},
|
||||
selectedRows: {
|
||||
type: Boolean,
|
||||
},
|
||||
|
|
|
@ -245,7 +245,6 @@ const onDenyAccept = (_, responseData) => {
|
|||
:right-search="false"
|
||||
auto-load
|
||||
:disable-option="{ card: true }"
|
||||
chip-locale="item.params"
|
||||
>
|
||||
<template #column-ticketFk="{ row }">
|
||||
<span class="link">
|
||||
|
|
|
@ -395,7 +395,10 @@ const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
|
|||
<template #column-departmentFk="{ row }">
|
||||
<div @click.stop :title="row.departmentName">
|
||||
<span class="link" v-text="dashIfEmpty(row.departmentName)" />
|
||||
<DepartmentDescriptorProxy :id="row.departmentFk" />
|
||||
<DepartmentDescriptorProxy
|
||||
v-if="row.departmentFk"
|
||||
:id="row.departmentFk"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #column-shippedDate="{ row }">
|
||||
|
|
|
@ -25,6 +25,7 @@ const $props = defineProps({
|
|||
});
|
||||
|
||||
const entityId = computed(() => $props.id || route.params.id);
|
||||
const entity = ref();
|
||||
const summary = ref();
|
||||
const quasar = useQuasar();
|
||||
const descriptorData = useArrayData('Order');
|
||||
|
@ -75,6 +76,7 @@ async function handleConfirm() {
|
|||
ref="summary"
|
||||
:url="`Orders/${entityId}/summary`"
|
||||
data-key="OrderSummary"
|
||||
@on-fetch="(data) => (entity = data)"
|
||||
>
|
||||
<template #header="{ entity }">
|
||||
{{ t('order.summary.basket') }} #{{ entity?.id }} -
|
||||
|
@ -84,7 +86,7 @@ async function handleConfirm() {
|
|||
<QBtn
|
||||
flat
|
||||
text-color="white"
|
||||
:disabled="isConfirmed"
|
||||
:disabled="entity?.isConfirmed"
|
||||
:label="t('order.summary.confirm')"
|
||||
@click="handleConfirm()"
|
||||
>
|
||||
|
|
|
@ -62,7 +62,7 @@ onMounted(async () => {
|
|||
/>
|
||||
<VnFilterPanel
|
||||
:data-key
|
||||
:un-removable-params="['warehouseFk', 'originScopeDays ', 'futureScopeDays']"
|
||||
:unremovable-params="['warehouseFk', 'originScopeDays ', 'futureScopeDays']"
|
||||
>
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
|
|
|
@ -483,7 +483,6 @@ function setReference(data) {
|
|||
:array-data-props="{
|
||||
url: 'Tickets/filter',
|
||||
order: ['shipped DESC', 'id DESC'],
|
||||
exprBuilder,
|
||||
}"
|
||||
>
|
||||
<template #advanced-menu>
|
||||
|
@ -517,7 +516,10 @@ function setReference(data) {
|
|||
<template #column-departmentFk="{ row }">
|
||||
<span class="link" @click.stop>
|
||||
{{ dashIfEmpty(row.departmentName) }}
|
||||
<DepartmentDescriptorProxy :id="row.departmentFk" />
|
||||
<DepartmentDescriptorProxy
|
||||
v-if="row.departmentFk"
|
||||
:id="row.departmentFk"
|
||||
/>
|
||||
</span>
|
||||
</template>
|
||||
<template #column-shipped="{ row }">
|
||||
|
@ -558,7 +560,7 @@ function setReference(data) {
|
|||
<template #column-zoneFk="{ row }">
|
||||
<span class="link" @click.stop>
|
||||
{{ dashIfEmpty(row.zoneName) }}
|
||||
<ZoneDescriptorProxy :id="row.zoneFk" />
|
||||
<ZoneDescriptorProxy v-if="row.zoneFk" :id="row.zoneFk" />
|
||||
</span>
|
||||
</template>
|
||||
<template #column-totalWithVat="{ row }">
|
||||
|
|
|
@ -6,6 +6,7 @@ import { useI18n } from 'vue-i18n';
|
|||
import CardSummary from 'components/ui/CardSummary.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import VnTitle from 'src/components/common/VnTitle.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
|
||||
import { toDate, toCurrency, toCelsius } from 'src/filters';
|
||||
import { toDateTimeFormat } from 'src/filters/date.js';
|
||||
|
|
|
@ -148,7 +148,7 @@ function handleEvent(type, event, node) {
|
|||
class="cursor-pointer"
|
||||
>
|
||||
{{ node.name }}
|
||||
<DepartmentDescriptorProxy :id="node.id" />
|
||||
<DepartmentDescriptorProxy v-if="node.id" :id="node.id" />
|
||||
</span>
|
||||
</div>
|
||||
<div
|
||||
|
|
|
@ -17,7 +17,6 @@ import { toDateFormat } from 'src/filters/date';
|
|||
const props = defineProps({
|
||||
date: {
|
||||
type: Date,
|
||||
required: true,
|
||||
default: null,
|
||||
},
|
||||
event: {
|
||||
|
|
|
@ -24,7 +24,7 @@ const props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
event: {
|
||||
type: Object,
|
||||
type: [Object, String],
|
||||
default: null,
|
||||
},
|
||||
isNewMode: {
|
||||
|
@ -32,7 +32,7 @@ const props = defineProps({
|
|||
default: true,
|
||||
},
|
||||
eventType: {
|
||||
type: Boolean,
|
||||
type: [Boolean, String],
|
||||
default: true,
|
||||
},
|
||||
isMasiveEdit: {
|
||||
|
|
Loading…
Reference in New Issue