diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 747c6ab645..9348793d29 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -247,6 +247,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
}
function updateStateParams() {
+ if (!route?.path) return;
const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
if (store?.searchUrl)
newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 1c0dfd2ce1..c1ba506fdb 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -194,14 +194,14 @@ const getItemPackagingType = (ticketSales) => {
redirect="ticket"
>
-
+
{{ row.nickname }}
-
+
{{ row.routeFk }}
@@ -218,7 +218,7 @@ const getItemPackagingType = (ticketSales) => {
{{ toCurrency(row.totalWithVat) }}
-
+
{{ row.invoiceOut.ref }}
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 7ae6901d38..3f0cd2d99c 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -99,7 +99,7 @@ const travelDialogRef = ref(false);
const tableRef = ref();
const travel = ref(null);
const userParams = ref({
- dated: Date.vnNew(),
+ dated: Date.vnNew().toJSON(),
});
const filter = ref({
@@ -219,6 +219,7 @@ function round(value) {
data-key="StockBoughts"
url="StockBoughts/getStockBought"
save-url="StockBoughts/crud"
+ search-url="StockBoughts"
order="reserve DESC"
:right-search="false"
:is-editable="true"
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 0fd775ee6a..8121718257 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -18,7 +18,7 @@ const $props = defineProps({
required: true,
},
});
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&dated=${$props.dated}`;
const columns = [
{
align: 'left',
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index 7694cfe6c4..e59332064d 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -27,7 +27,7 @@ onMounted(async () => {
@@ -36,12 +36,19 @@ onMounted(async () => {
{{ formatFn(tag.value) }}
-
+
{
+ params.dated = value;
+ setUserParams(params);
+ searchFn();
+ }
+ "
:label="t('Date')"
is-outlined
/>
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 7715e9e214..fdc35d3690 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -268,6 +268,7 @@ onMounted(() => (stateStore.rightDrawer = false));
:label="t('basicData.price')"
type="number"
min="0"
+ step="any"
/>
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index bb92ccc6a3..255c891a19 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -105,11 +105,14 @@ watch(
- {{ opt.code }}
- {{ opt.town?.province?.name }},
- {{ opt.town?.province?.country?.name }}
+
+ {{ `${opt.code}, ${opt.town?.name}` }}
+
+
+ {{
+ `${opt.town?.province?.name}, ${opt.town?.province?.country?.name}`
+ }}
+
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index efe7103609..25d6c340fa 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -22,7 +22,12 @@ const agencies = ref([]);
- (agencies = data)" auto-load />
+ (agencies = data)"
+ auto-load
+ />
[
inWhere: true,
attrs: {
url: 'AgencyModes',
+ fields: ['id', 'name'],
},
},
columnField: {