diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 349956be9..a1f07ff17 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -12,6 +12,7 @@ const props = defineProps({
baseUrl: { type: String, default: undefined },
customUrl: { type: String, default: undefined },
filter: { type: Object, default: () => {} },
+ userFilter: { type: Object, default: () => {} },
descriptor: { type: Object, required: true },
filterPanel: { type: Object, default: undefined },
searchDataKey: { type: String, default: undefined },
@@ -32,6 +33,7 @@ const url = computed(() => {
const arrayData = useArrayData(props.dataKey, {
url: url.value,
filter: props.filter,
+ userFilter: props.userFilter,
});
onBeforeMount(async () => {
diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index 79784f3c5..d8374498f 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -2,9 +2,9 @@
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import VnRow from '../ui/VnRow.vue';
-import VnInput from './VnInput.vue';
import FetchData from '../FetchData.vue';
import useNotify from 'src/composables/useNotify';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const props = defineProps({
submitFn: { type: Function, default: () => {} },
@@ -70,19 +70,19 @@ defineExpose({ show: () => changePassDialog.value.show() });
-
-
diff --git a/src/components/common/VnDateBadge.vue b/src/components/common/VnDateBadge.vue
index fd6c9e8a4..83d39937a 100644
--- a/src/components/common/VnDateBadge.vue
+++ b/src/components/common/VnDateBadge.vue
@@ -11,9 +11,9 @@ function getBadgeAttrs(date) {
let timeDiff = today - timeTicket;
- if (timeDiff == 0) return { color: 'warning', 'text-color': 'black' };
- if (timeDiff < 0) return { color: 'success', 'text-color': 'black' };
- return { color: 'transparent', 'text-color': 'white' };
+ if (timeDiff == 0) return { color: 'warning', class: 'black-text-color' };
+ if (timeDiff < 0) return { color: 'success', class: 'black-text-color' };
+ return { color: 'transparent', class: 'normal-text-color' };
}
function formatShippedDate(date) {
@@ -29,3 +29,11 @@ function formatShippedDate(date) {
{{ formatShippedDate(date) }}
+
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 52dd6ef79..f82370d88 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -102,7 +102,7 @@ const columns = computed(() => [
storage: 'dms',
collection: null,
resolution: null,
- id: prop.row.file.split('.')[0],
+ id: Number(prop.row.file.split('.')[0]),
token: token,
class: 'rounded',
ratio: 1,
@@ -297,13 +297,14 @@ defineExpose({
ref="dmsRef"
:data-key="$props.model"
:url="$props.model"
- :filter="dmsFilter"
+ :user-filter="dmsFilter"
:order="['dmsFk DESC']"
- :auto-load="true"
+ auto-load
@on-fetch="setData"
>
{
});
};
-defineExpose({
- focus,
-});
+const handleUppercase = () => {
+ value.value = value.value?.toUpperCase() || '';
+};
@@ -136,20 +140,23 @@ defineExpose({
hide-bottom-space
:data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
>
-
+
+
+
+
@@ -168,6 +184,7 @@ defineExpose({