diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml index 60f965698..9345b4c65 100644 --- a/src/pages/Item/locale/en.yml +++ b/src/pages/Item/locale/en.yml @@ -223,6 +223,7 @@ item: search: 'Search item' searchInfo: 'You can search by id' regularizeStock: Regularize stock +itemProposal: Items proposal proposal: difference: Difference title: Items proposal diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue index ec5a3743a..5e2e569ca 100644 --- a/src/pages/Ticket/Card/TicketTransfer.vue +++ b/src/pages/Ticket/Card/TicketTransfer.vue @@ -6,6 +6,7 @@ import VnInput from 'src/components/common/VnInput.vue'; import TicketTransferForm from './TicketTransferForm.vue'; import { toDateFormat } from 'src/filters/date.js'; +import VnInputDate from 'src/components/common/VnInputDate.vue'; const $props = defineProps({ mana: { @@ -24,6 +25,10 @@ const $props = defineProps({ type: Object, default: () => {}, }, + split: { + type: Boolean, + default: false, + }, }); onMounted(() => (_transfer.value = $props.transfer)); @@ -31,7 +36,7 @@ const { t } = useI18n(); const QPopupProxyRef = ref(null); const transferFormRef = ref(null); const _transfer = ref(); - +const splitDate = ref(Date.vnNew()); const transferLinesColumns = computed(() => [ { label: t('ticketList.id'), @@ -91,6 +96,11 @@ const handleRowClick = (row) => {