@@ -129,144 +161,132 @@ watch(
v-if="bankBookList.length !== 1 && !readonly"
id="btn-delete-bank"
icon-only
- @click="deleteItem(bankBookList, i)"
+ @click="
+ () => {
+ deleteItem(bankBookList, i);
+ bankQrUrl[i] = '';
+ }
+ "
/>
-
+
-
-
-
-
-
-
-
-
+
-
-
-
@@ -107,7 +131,6 @@ onMounted(async () => {
input-debounce="0"
option-label="label"
option-value="value"
- lazy-rules="ondemand"
class="col-md-2 col-12"
:dense="dense"
:readonly="readonly"
@@ -148,7 +171,6 @@ onMounted(async () => {
input-debounce="0"
option-label="label"
option-value="value"
- lazy-rules="ondemand"
class="col-md-2 col-12"
:disable="isRoleInclude(['branch_manager']) && !readonly"
:dense="dense"
@@ -170,7 +192,6 @@ onMounted(async () => {
{
input-debounce="0"
option-value="value"
option-label="label"
- lazy-rules="ondemand"
for="select-user-type"
:dense="dense"
:readonly="readonly"
@@ -241,7 +261,6 @@ onMounted(async () => {
input-debounce="0"
option-label="label"
option-value="value"
- lazy-rules="ondemand"
for="select-user-role"
:dense="dense"
v-model="userRole"
@@ -266,7 +285,7 @@ onMounted(async () => {
-
();
const employeeOther = defineModel('employeeOther');
@@ -31,7 +32,7 @@ const employeeOther = defineModel('employeeOther');
style="background-color: var(--surface-3)"
/>
{{ $t('customerEmployee.form.group.family') }}
-
+
('employeeOther');
('employeeOther');
('employeeOther');
v-model="employeeOther.fatherFirstName"
/>
('employeeOther');
v-model="employeeOther.fatherLastName"
/>
('employeeOther');
v-model="employeeOther.fatherFirstNameEN"
/>
('employeeOther');
v-model="employeeOther.fatherLastNameEN"
/>
('employeeOther');
('employeeOther');
v-model="employeeOther.motherFirstName"
/>
('employeeOther');
v-model="employeeOther.motherLastName"
/>
('employeeOther');
v-model="employeeOther.motherFirstNameEN"
/>
('employeeOther');
v-model="employeeOther.motherLastNameEN"
/>
import { onMounted, ref } from 'vue';
-import { dateFormat, parseAndFormatDate } from 'src/utils/datetime';
import { EmployeeWorkCreate } from 'stores/employee/types';
-import { useI18n } from 'vue-i18n';
-import { checkTabBeforeAdd, selectFilterOptionRefMod } from 'stores/utils';
+import { selectFilterOptionRefMod } from 'stores/utils';
import DatePicker from '../shared/DatePicker.vue';
import {
@@ -13,7 +11,6 @@ import {
SaveButton,
UndoButton,
} from 'components/button';
-const { locale } = useI18n();
const currentIndex = defineModel('currentIndex');
const employeeWork = defineModel('employeeWork');
@@ -38,6 +35,7 @@ defineProps<{
outlined?: boolean;
readonly?: boolean;
prefixId: string;
+ hideAction?: boolean;
}>();
defineEmits<{
@@ -62,7 +60,10 @@ function addData() {
ownerName: '',
remark: '',
});
- if (employeeWork.value) tab.value = `tab${employeeWork.value.length - 1}`;
+ if (employeeWork.value) {
+ tab.value = `tab${employeeWork.value.length - 1}`;
+ currentIndex.value = employeeWork.value.length - 1;
+ }
}
}
@@ -116,7 +117,7 @@ const workplaceFilter = selectFilterOptionRefMod(
/>
{{ $t(`customerEmployee.formWorkHistory.title`) }}
{{ $t('general.times', { number: index + 1 }) }}
-
@@ -111,7 +111,6 @@ watch(
input-debounce="0"
option-value="value"
option-label="label"
- lazy-rules="ondemand"
v-model="passportType"
class="col-12"
:class="{ 'col-md-3': !ocr }"
@@ -122,8 +121,11 @@ watch(
:for="`${prefixId}-select-passport-type`"
:label="$t('customerEmployee.form.passportType')"
:rules="[
- (val: string) =>
- !!val || $t('selectValidate') + $t('formDialogInputPassportType'),
+ (val) =>
+ (val && val.length > 0) ||
+ $t('form.error.selectField', {
+ field: $t('customerEmployee.form.passportType'),
+ }),
]"
@filter="passportTypeFilter"
>
@@ -136,7 +138,6 @@ watch(
@@ -227,9 +221,11 @@ watch(
:class="{ 'col-md-3': !ocr }"
:readonly="readonly"
:rules="[
- (val: string) =>
- !!val ||
- $t('selectValidate') + $t('formDialogInputPassportIssuance'),
+ (val) =>
+ (val && val.length > 0) ||
+ $t('form.error.selectField', {
+ field: $t('customerEmployee.form.passportIssueDate'),
+ }),
]"
/>
diff --git a/src/components/03_customer-management/FormEmployeeVisa.vue b/src/components/03_customer-management/FormEmployeeVisa.vue
index 90708552..ac8296bd 100644
--- a/src/components/03_customer-management/FormEmployeeVisa.vue
+++ b/src/components/03_customer-management/FormEmployeeVisa.vue
@@ -112,7 +112,6 @@ watch(
input-debounce="0"
option-value="value"
option-label="label"
- lazy-rules="ondemand"
:class="{ 'col-4': !ocr, 'col-6': ocr }"
:dense="dense"
:readonly="readonly"
@@ -140,7 +139,6 @@ watch(
!!val || $t('selectValidate') + $t('formDialogInputVisaType'),
]" -->
+
import { calculateAge, dateFormat } from 'src/utils/datetime';
+import { baseUrl } from 'src/stores/utils';
import PersonCard from 'components/shared/PersonCard.vue';
import KebabAction from '../shared/KebabAction.vue';
@@ -121,7 +122,7 @@ defineEmits<{
{
{
(val: string) =>
!!val ||
$t('form.error.selectField', {
- field: $t('customer.form.employerBranch'),
+ field: $t('customerEmployee.branch'),
}),
]"
>
@@ -274,7 +273,7 @@ onMounted(() => {
'-' + ' ' + scope.opt.customer.lastName
}}
- {{ $t('address') }}
+ {{ $t('general.address') }}
{{
$i18n.locale === 'eng'
? `${scope.opt.addressEN || ''} ${scope.opt.subDistrict.nameEN || ''} ${scope.opt.district.nameEN || ''} ${scope.opt.province.nameEN || ''}`
@@ -297,7 +296,6 @@ onMounted(() => {
{
/>
import { QSelect } from 'quasar';
-import { getRole } from 'src/services/keycloak';
+import useOptionStore from 'src/stores/options';
import { selectFilterOptionRefMod } from 'stores/utils';
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, watch } from 'vue';
import { useI18n } from 'vue-i18n';
const { locale } = useI18n({ useScope: 'global' });
+const optionStore = useOptionStore();
+
const remark = defineModel('remark', { default: '' });
const detail = defineModel('detail', { default: '' });
const process = defineModel('process');
const name = defineModel('name');
const code = defineModel('code');
+const expenseType = defineModel('expenseType');
-const registeredBranchId = defineModel('registeredBranchId');
const codeOption = ref<{ id: string; name: string }[]>([]);
-const optionsBranch = defineModel<{ id: string; name: string }[]>(
- 'optionsBranch',
- { default: [] },
-);
defineProps<{
dense?: boolean;
@@ -42,11 +40,31 @@ onMounted(async () => {
const codeOptions = ref[]>([]);
const codeFilter = selectFilterOptionRefMod(codeOption, codeOptions, 'label');
-const branchOptions = ref[]>([]);
-const branchFilter = selectFilterOptionRefMod(
- optionsBranch,
- branchOptions,
- 'name',
+const expenseTypeOptions = ref[]>([]);
+let expenseTypeFilter: (
+ value: string,
+ update: (callbackFn: () => void, afterFn?: (ref: QSelect) => void) => void,
+) => void;
+
+onMounted(() => {
+ if (optionStore.globalOption) {
+ expenseTypeFilter = selectFilterOptionRefMod(
+ ref(optionStore.globalOption.expenseType),
+ expenseTypeOptions,
+ 'label',
+ );
+ }
+});
+
+watch(
+ () => optionStore.globalOption,
+ () => {
+ expenseTypeFilter = selectFilterOptionRefMod(
+ ref(optionStore.globalOption.expenseType),
+ expenseTypeOptions,
+ 'label',
+ );
+ },
);
@@ -67,7 +85,6 @@ const branchFilter = selectFilterOptionRefMod(
+
+
+
+
@@ -145,50 +184,12 @@ const branchFilter = selectFilterOptionRefMod(
-
('remark');
@@ -12,8 +13,7 @@ const code = defineModel('code');
const serviceCode = defineModel('serviceCode');
const serviceName = defineModel('serviceNameTh');
const serviceDescription = defineModel('serviceDescription');
-
-const registeredBranchId = defineModel('registeredBranchId');
+const registeredBranchId = defineModel('registeredBranchId');
const optionsBranch = defineModel<{ id: string; name: string }[]>(
'optionsBranch',
@@ -31,18 +31,21 @@ defineProps<{
}>();
const branchOptions = ref[]>([]);
-const branchFilter = selectFilterOptionRefMod(
+let branchFilter = selectFilterOptionRefMod(
optionsBranch,
branchOptions,
'name',
);
-const serviceCodeOpts = ref([{ label: 'mou', value: 'mou' }]);
-const serviceCodeOptions = ref[]>([]);
-const serviceCodeFilter = selectFilterOptionRefMod(
- serviceCodeOpts,
- serviceCodeOptions,
- 'label',
+watch(
+ () => optionsBranch.value,
+ () => {
+ branchFilter = selectFilterOptionRefMod(
+ optionsBranch,
+ branchOptions,
+ 'name',
+ );
+ },
);
@@ -60,122 +63,17 @@ const serviceCodeFilter = selectFilterOptionRefMod(
{{ $t(`form.field.basicInformation`) }}
-
+
diff --git a/src/components/04_product-service/ServiceProperties.vue b/src/components/04_product-service/ServiceProperties.vue
index f43cdc7d..235180b1 100644
--- a/src/components/04_product-service/ServiceProperties.vue
+++ b/src/components/04_product-service/ServiceProperties.vue
@@ -17,25 +17,25 @@ const formServiceProperties = defineModel('formServiceProperties');
const typeOption = ref([
{
- label: t('text'),
+ label: 'Text',
value: 'string',
color: 'var(--pink-6-hsl)',
icon: 'mdi-alpha-t',
},
{
- label: t('number'),
+ label: 'Number',
value: 'number',
color: 'var(--purple-11-hsl)',
icon: 'mdi-numeric',
},
{
- label: t('date'),
+ label: 'Date',
value: 'date',
color: 'var(--green-9-hsl)',
icon: 'mdi-calendar-blank-outline',
},
{
- label: t('selection'),
+ label: 'Selection',
value: 'array',
color: 'var(--indigo-7-hsl)',
icon: 'mdi-code-array',
@@ -223,7 +223,8 @@ function confirmDelete(items: unknown[], index: number) {
-
+
(import.meta.env.VITE_API_BASE_URL);
const productServiceStore = useProductServiceStore();
@@ -58,10 +58,26 @@ defineEmits<{
(e: 'manageWorkName'): void;
(e: 'workProperties'): void;
}>();
+
+watch(
+ () => workNameItems.value,
+ (c, o) => {
+ const list = c.map((v: { name: string }) => v.name);
+ const oldList = o.map((v: { name: string }) => v.name);
+ const index = oldList.indexOf(workName.value);
+
+ if (list[index] !== oldList[index] && !list.includes(workName.value)) {
+ if (list.length - 1 === index - 1) workName.value = list[index - 1];
+ else workName.value = list[index];
+ }
+ },
+);
-
-
-
-
-
+
+
+
+
{{ $t(`productService.service.serviceProperties`) }}
-
('serviceCharge');
const agentPrice = defineModel('agentPrice');
const price = defineModel('price');
+const vatIncluded = defineModel('vatIncluded');
withDefaults(
defineProps<{
@@ -38,11 +39,44 @@ withDefaults(
style="background-color: var(--surface-3)"
/>
{{ $t('productService.product.priceInformation') }}
+
+
+
+ {{ $t('productService.product.vatIncluded') }}
+
+
+ {{ $t('productService.product.vatExcluded') }}
+
+
-
{{ $t('form.decimal') }}
-
@@ -249,6 +266,7 @@ defineEmits<{
+import { onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import useBranchStore from 'src/stores/branch';
+import useCustomerStore from 'src/stores/customer';
+import SelectInput from '../shared/SelectInput.vue';
+import { QSelect } from 'quasar';
+
+const { locale } = useI18n({ useScope: 'global' });
+const branchStore = useBranchStore();
+const customerStore = useCustomerStore();
+
+const branch = defineModel('branch');
+const customer = defineModel('customer');
+const agentPrice = defineModel('agentPrice');
+
+const branchOption = ref();
+const customerOption = ref();
+
+defineProps<{
+ outlined?: boolean;
+ readonly?: boolean;
+ separator?: boolean;
+ employee?: boolean;
+ title?: string;
+ prefixId: string;
+}>();
+
+async function filter(
+ val: string,
+ update: (...args: unknown[]) => void,
+ type: 'branch' | 'customer',
+) {
+ update(
+ async () => {
+ const res =
+ type === 'branch'
+ ? await branchStore.fetchList({
+ query: val,
+ pageSize: 30,
+ })
+ : await customerStore.fetchList({
+ query: val,
+ pageSize: 30,
+ });
+ if (res) {
+ if (type === 'branch') {
+ branchOption.value = res.result.map((v) => ({
+ value: v.id,
+ label: v.name,
+ labelEN: v.nameEN,
+ }));
+ } else if (type === 'customer') {
+ customerOption.value = res.result.map((v) => ({
+ value: v.id,
+ label:
+ v.customerType === 'CORP'
+ ? v.branch[0].registerName
+ : `${v.branch[0].firstName} ${v.branch[0].lastName}`,
+ labelEN:
+ v.customerType === 'CORP'
+ ? v.branch[0].registerNameEN
+ : `${v.branch[0].firstNameEN} ${v.branch[0].lastNameEN}`,
+ }));
+ }
+ }
+ },
+
+ (ref: QSelect) => {
+ if (val !== '' && ref.options && ref.options?.length > 0) {
+ ref.setOptionIndex(-1);
+ ref.moveOptionSelection(1, true);
+ }
+ },
+ );
+}
+
+
+
+
+
+
diff --git a/src/components/05_quotation/MainDialog.vue b/src/components/05_quotation/MainDialog.vue
index fe59cc7c..1a960d4d 100644
--- a/src/components/05_quotation/MainDialog.vue
+++ b/src/components/05_quotation/MainDialog.vue
@@ -11,7 +11,7 @@ const dialogState = defineModel('state', { default: true });
-
+
+
+
+
+
+
+
+
+ {{ $t('general.add', { text: $t('quotation.newCustomer') }) }}
+
+
+
+
+ {{ locale === 'eng' ? scope.opt.labelEN : scope.opt.label }}
+
+
+
+
+
+
@@ -43,9 +39,11 @@ const dialogState = defineModel('state', { default: true });
class="dialog-body"
style="
flex: 1;
- max-height: calc(100vh - 200px);
overflow-y: auto;
position: relative;
+ display: flex;
+ flex-direction: column;
+ height: 100%;
"
>
('currentTab');
:model-value="modal"
@update:model-value="(v) => (modal = beforeClose ? beforeClose() : v)"
@before-show="show"
- @hide="close"
+ @hide="hideCloseEvent !== undefined && hideCloseEvent ? '' : close"
>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/DialogForm.vue b/src/components/DialogForm.vue
index 4199b6a4..f8003783 100644
--- a/src/components/DialogForm.vue
+++ b/src/components/DialogForm.vue
@@ -19,13 +19,14 @@ defineProps<{
height?: string;
employee?: boolean;
edit?: boolean;
+ hideDelete?: boolean;
saveAmount?: number;
submitLabel?: string;
-
+ submitIcon?: string;
isEdit?: boolean;
tabsList?: { name: string; label: string }[];
-
+ hideCloseEvent?: boolean;
editData?: (...args: unknown[]) => void;
deleteData?: (...args: unknown[]) => void;
show?: (...args: unknown[]) => void;
@@ -43,7 +44,7 @@ const currentTab = defineModel
+ {{ $t(`quotation.type.${type}`) }}
+
+
+
+
+ {{ $t('general.itemNo', { msg: $t('quotation.title') }) }}
+
+
+ {{ code }}
+
+
+
+
+
+ {{ title || '-' }}
+ x {{ amount || '0' }}
+
+
+ {{ date || '-' }}
+
+ {{ $t('quotation.customerName') }}
+ {{ customerName || '-' }}
+ {{ $t('quotation.actor') }}
+ {{ reporter || '-' }}
+ ('currentTab');
@click="editData"
/>
('currentTab');
id="btn-form-submit"
type="submit"
solid
+ :icon="submitIcon"
:label="submitLabel"
:amount="saveAmount"
/>
diff --git a/src/components/DrawerInfo.vue b/src/components/DrawerInfo.vue
index d50e857f..ccea089b 100644
--- a/src/components/DrawerInfo.vue
+++ b/src/components/DrawerInfo.vue
@@ -17,6 +17,7 @@ withDefaults(
statusBranch?: string;
badgeLabel?: string;
badgeClass?: string;
+ badgeStyle?: string;
bgColor?: string;
hideAction?: boolean;
editData?: (...args: unknown[]) => void;
@@ -25,6 +26,7 @@ withDefaults(
close?: (...args: unknown[]) => void;
undo?: (...args: unknown[]) => void;
beforeClose?: (...args: unknown[]) => boolean;
+ show?: (...args: unknown[]) => void;
}>(),
{
hideAction: false,
@@ -48,6 +50,7 @@ function reset() {
{{ badgeLabel }}
{{ category }}
-
- {{ title }}
-
+
+
+ {{ title }}
+
-
- {{
- statusBranch === 'INACTIVE'
- ? $t('status.INACTIVE')
- : $t('status.ACTIVE')
- }}
-
+
+ {{
+ statusBranch === 'INACTIVE'
+ ? $t('status.INACTIVE')
+ : $t('status.ACTIVE')
+ }}
+
+
@@ -141,7 +147,16 @@ function reset() {
-
+import { ref } from 'vue';
+
+withDefaults(
+ defineProps<{
+ img?: string | null;
+ icon?: string;
+ title?: string;
+ caption?: string;
+ color?: string;
+ bgColor?: string;
+ toggleTitle?: string;
+ fallbackImg?: string;
+ fallbackCover?: string;
+
+ hideFade?: boolean;
+ hideActive?: boolean;
+ active?: boolean;
+ readonly?: boolean;
+ useToggle?: boolean;
+ labelAction?: string;
+
+ menu?: { icon: string; color: string; bgColor: string }[];
+ tabsList?: { name: string | number; label: string }[];
+ }>(),
+ {},
+);
+const showOverlay = ref(false);
+
+defineEmits<{
+ (e: 'view'): void;
+ (e: 'edit'): void;
+}>();
+
+
+
+
-
+
+
+
@@ -171,24 +393,24 @@ async function downloadImage(url: string) {
padding: 0;
border-radius: var(--radius-2);
flex-wrap: nowrap;
- width: 100%;
- max-width: 80%;
}
@media (min-width: 768px) {
.image-dialog-content {
- max-width: 60%;
+ max-width: 70%;
}
}
.image-dialog-body {
- overflow-y: auto;
- background-color: var(--surface-2) !important;
+ /* overflow-y: auto;
+ background-color: var(--surface-1) !important;
position: relative;
display: flex;
flex-direction: column;
- flex: 1;
- height: calc(100vh - 200px);
+ flex: 1; */
+ overflow: hidden;
+ width: 30em;
+ height: 30em;
}
.upload-image-btn {
@@ -227,4 +449,21 @@ async function downloadImage(url: string) {
border: 1px solid hsl(var(--negative-bg));
}
}
+
+.selected-img {
+ position: relative;
+ border: 2px solid hsl(var(--info-bg));
+}
+
+.selected-img:before {
+ content: ' ';
+ position: absolute;
+ z-index: 1;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
+ border: 2px solid var(--surface-1);
+ border-radius: 5px;
+}
diff --git a/src/components/ItemCard.vue b/src/components/ItemCard.vue
index 05b96579..53cab0d4 100644
--- a/src/components/ItemCard.vue
+++ b/src/components/ItemCard.vue
@@ -1,44 +1,51 @@
-
+
+
+
+
diff --git a/src/components/ImageUploadDialog.vue b/src/components/ImageUploadDialog.vue
index 0d72d366..c8d71c42 100644
--- a/src/components/ImageUploadDialog.vue
+++ b/src/components/ImageUploadDialog.vue
@@ -1,17 +1,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- ![]()
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/components/RemarkComponent.vue b/src/components/RemarkComponent.vue
new file mode 100644
index 00000000..c4445c2e
--- /dev/null
+++ b/src/components/RemarkComponent.vue
@@ -0,0 +1,59 @@
+
+
+
+
@@ -115,7 +129,7 @@ onUnmounted(() => {
cursor: pointer;
&.side-menu__sub {
- margin-left: 1rem;
+ /* margin-left: 1rem; */
}
&.side-menu__active {
@@ -125,4 +139,18 @@ onUnmounted(() => {
}
}
}
+
+.circle {
+ width: 15px;
+ height: 15px;
+ font-size: 12px;
+ border-radius: 50%;
+}
+
+.circle-2 {
+ background: var(--surface-tab);
+ width: 7px;
+ height: 7px;
+ border-radius: 50%;
+}
diff --git a/src/components/StatCardComponent.vue b/src/components/StatCardComponent.vue
index b5ddd3ef..32e37f8f 100644
--- a/src/components/StatCardComponent.vue
+++ b/src/components/StatCardComponent.vue
@@ -13,13 +13,18 @@ const props = withDefaults(
| 'cyan'
| 'yellow'
| 'red'
- | 'magenta';
+ | 'magenta'
+ | 'blue'
+ | 'lime'
+ | 'light-purple';
}[];
dark?: boolean;
+ textSize?: string;
labelI18n?: boolean;
}>(),
{
labelI18n: false,
+ textSize: '12px',
},
);
@@ -42,8 +47,13 @@ const props = withDefaults(
/>
+
-
+
diff --git a/src/components/ProfileBanner.vue b/src/components/ProfileBanner.vue
index 487fe934..258b3fd9 100644
--- a/src/components/ProfileBanner.vue
+++ b/src/components/ProfileBanner.vue
@@ -72,7 +72,7 @@ const showOverlay = ref(false);
size="6rem"
font-size="3rem"
class="relative-position"
- style="z-index: 1"
+ style="z-index: 1; box-shadow: var(--shadow-2)"
:style="{
color: `${color || 'white'}`,
cursor: `${noImageAction ? 'default' : 'pointer'}`,
diff --git a/src/components/QrCodeUploadDialog.vue b/src/components/QrCodeUploadDialog.vue
new file mode 100644
index 00000000..e5d870c8
--- /dev/null
+++ b/src/components/QrCodeUploadDialog.vue
@@ -0,0 +1,231 @@
+
+
+
+
+
-
{{ $t(text) }}
+ {{ $t(text) }}
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/ShowAttachent.vue b/src/components/ShowAttachent.vue
new file mode 100644
index 00000000..7cee7f09
--- /dev/null
+++ b/src/components/ShowAttachent.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SideMenu.vue b/src/components/SideMenu.vue
index 0399d875..abf17044 100644
--- a/src/components/SideMenu.vue
+++ b/src/components/SideMenu.vue
@@ -9,6 +9,7 @@ type Menu = {
name: string;
sub?: boolean;
tab?: string;
+ useBtn?: boolean;
};
const props = defineProps<{
@@ -86,14 +87,27 @@ onUnmounted(() => {
'--side-menu__fg-active': active?.foreground,
'--side-menu__bg-active': active?.background,
}"
- class="side-menu__item"
+ class="side-menu__item row items-center justify-between no-wrap"
:class="{
'side-menu__active': activeMenu === v.anchor,
'side-menu__sub': v.sub || false,
}"
@click="handleClick(v)"
>
- {{ v.name }}
+
+
+
+
+ {{ $t('zoomOut') }}
+
+
+ {{ $t('general.zoomIn') }}
+
+
+
+
+ Page {{ page }} of {{ pages }}
+
+ {{ scale * 100 }}%
+
+
+
+
+ {{ menu.filter((v) => v.sub === true).indexOf(v) + 1 }}
+
+ {{ v.name }}
+
+
-
- {{ labelI18n ? $t(v.label) : v.label }}
+
+
+ {{ labelI18n ? $t(v.label) : v.label }}
+
diff --git a/src/components/TableComponents.vue b/src/components/TableComponents.vue
new file mode 100644
index 00000000..bb845e4e
--- /dev/null
+++ b/src/components/TableComponents.vue
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+ {{ $t('fullname') }}
+
+
+
+ {{ $t(col.label) }}
+
+
+
+
+
+
+
+ {{ props.rowIndex + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/TreeComponent.vue b/src/components/TreeComponent.vue
index 10315eae..68ce72a4 100644
--- a/src/components/TreeComponent.vue
+++ b/src/components/TreeComponent.vue
@@ -43,6 +43,7 @@ defineEmits<{
:node-key="nodeKey"
:label-key="labelKey"
:children-key="childrenKey"
+ :no-nodes-label="$t('general.noData')"
v-model:expanded="expandedTree"
style="color: var(--foreground)"
>
@@ -51,7 +52,10 @@ defineEmits<{
class="full-width q-py-xs"
:class="{
'clickable-node': typeTree === 'product' || node.isHeadOffice,
- 'cursor-pointer': node.type === 'group' || node.type === 'type',
+ 'cursor-pointer':
+ node.type === 'group' ||
+ node.type === 'type' ||
+ node.type === 'productService',
'active-node': expandedTree[expandedTree.length - 1] === node.id,
}"
v-touch-hold.mouse="() => $emit('handleHold', node)"
@@ -60,12 +64,12 @@ defineEmits<{
$emit('select', node);
}
"
- :id="`tree-enter-${node.name}`"
+ :id="`tree-enter-${node.name}${node.for ? `-${node.for}` : ''}`"
>
();
@@ -21,7 +22,7 @@ defineProps<{
diff --git a/src/components/button/ToggleButton.vue b/src/components/button/ToggleButton.vue
index a95669c9..03530bb7 100644
--- a/src/components/button/ToggleButton.vue
+++ b/src/components/button/ToggleButton.vue
@@ -67,7 +67,7 @@ input:checked + .slider {
background-color: hsl(var(--positive-bg));
&.disable {
- background-color: var(--stone-4);
+ // background-color: var(--stone-4);
}
}
diff --git a/src/components/button/index.ts b/src/components/button/index.ts
index 6e350f92..a3f34228 100644
--- a/src/components/button/index.ts
+++ b/src/components/button/index.ts
@@ -8,3 +8,4 @@ export { default as UndoButton } from './UndoButton.vue';
export { default as ToggleButton } from './ToggleButton.vue';
export { default as ClearButton } from './ClearButton.vue';
export { default as CloseButton } from './CloseButton.vue';
+export { default as ViewButton } from './viewButton.vue';
diff --git a/src/components/button/viewButton.vue b/src/components/button/viewButton.vue
new file mode 100644
index 00000000..070a268f
--- /dev/null
+++ b/src/components/button/viewButton.vue
@@ -0,0 +1,27 @@
+
+
+
+
+ {{ $t('general.viewDetail') }}
+
+
diff --git a/src/components/dialog/DialogHeader.vue b/src/components/dialog/DialogHeader.vue
index 503af2c3..75cfd779 100644
--- a/src/components/dialog/DialogHeader.vue
+++ b/src/components/dialog/DialogHeader.vue
@@ -15,7 +15,7 @@ defineProps<{
-
diff --git a/src/components/form/AddressForm.vue b/src/components/form/AddressForm.vue
index 4d1d79ac..573b904b 100644
--- a/src/components/form/AddressForm.vue
+++ b/src/components/form/AddressForm.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+
+
-
+
+
+import DatePicker from '../shared/DatePicker.vue';
+import { AddressForm } from 'components/form';
+
+const transportation = defineModel('transportation', { default: '' });
+const travelDate = defineModel('travelDate', { default: '' });
+const entryCheckpoint = defineModel('entryCheckpoint', { default: '' });
+const entryCardNumber = defineModel('entryCardNumber', { default: '' });
+
+const address = defineModel('address');
+const street = defineModel('street', { default: '' });
+const moo = defineModel('moo', { default: '' });
+const soi = defineModel('soi', { default: '' });
+const provinceId = defineModel('provinceId');
+const districtId = defineModel('districtId');
+const subDistrictId = defineModel('subDistrictId');
+const homeCode = defineModel('homeCode');
+const employmentOffice = defineModel(
+ 'employmentOffice',
+);
+
+defineProps<{
+ prefixId?: string;
+ outlined?: boolean;
+ readonly?: boolean;
+}>();
+
+
+
+
@@ -98,19 +99,15 @@ defineEmits<{
@@ -139,22 +136,26 @@ defineEmits<{
-
-
- {{ data.name }}
+
+
+
+
+
+
+ {{ $t('general.noData') }}
+
+
+
+
+
+
+
diff --git a/src/components/shared/SelectZone.vue b/src/components/shared/SelectZone.vue
new file mode 100644
index 00000000..e0f9234e
--- /dev/null
+++ b/src/components/shared/SelectZone.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/shared/TreeView.vue b/src/components/shared/TreeView.vue
new file mode 100644
index 00000000..6043aad6
--- /dev/null
+++ b/src/components/shared/TreeView.vue
@@ -0,0 +1,169 @@
+
+
+
+ ('middleName', { default: '' });
+const middleNameEn = defineModel('middleNameEn', { default: '' });
+
+const workplaceEN = defineModel('workplaceEn', { default: '' });
+const addressEN = defineModel('addressEN', { default: '' });
+const street = defineModel('street', { default: '' });
+const streetEN = defineModel('streetEN', { default: '' });
+const moo = defineModel('moo', { default: '' });
+const mooEN = defineModel('mooEN', { default: '' });
+const soi = defineModel('soi', { default: '' });
+const soiEN = defineModel('soiEN', { default: '' });
+const provinceId = defineModel('provinceId');
+const districtId = defineModel('districtId');
+const subDistrictId = defineModel('subDistrictId');
+const zipCode = defineModel('zipCode');
+const sameWithEmployer = defineModel('sameWithEmployer');
+const homeCode = defineModel('homeCode');
+const employmentOffice = defineModel(
+ 'employmentOffice',
+);
+const employmentOfficeEN = defineModel(
+ 'employmentOfficeEN',
+);
+
const optionStore = useOptionStore();
const namePrefix = defineModel('namePrefix');
const birthDate = defineModel('birthDate');
-const gender = defineModel('gender');
+const gender = defineModel('gender', { required: true });
const address = defineModel('address');
const firstName = defineModel('firstName', { required: true });
const lastName = defineModel('lastName', { required: true });
const firstNameEN = defineModel('firstNameEn', { required: true });
const lastNameEN = defineModel('lastNameEn', { required: true });
-
+const issueDate = defineModel('issueDate', { required: true });
+const expireDate = defineModel('expireDate', { required: true });
const citizenId = defineModel('citizenId', {
required: true,
});
-const nationality = defineModel('nationality');
+const nationality = defineModel('nationality', { required: true });
-const religion = defineModel('religion');
+const religion = defineModel('religion', { required: true });
const branchOptions = defineModel<{ id: string; name: string }[]>(
'branchOptions',
@@ -152,7 +178,6 @@ function formatCode(input: string | undefined, type: 'code' | 'number') {
-
+ {{ data.name }}
+
+
+
+
+
+
+
+
+ {{ selectedItem.indexOf(item) + 1 }}
+
+
+
+
+
+
diff --git a/src/components/upload-file/CorpFormBusinessRegistration.vue b/src/components/upload-file/CorpFormBusinessRegistration.vue
new file mode 100644
index 00000000..4ff547c5
--- /dev/null
+++ b/src/components/upload-file/CorpFormBusinessRegistration.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ node[keyTitle || 'title'] || 'No Title' }}
+
+
+ {{ node[keySubtitle || 'subtitle'] || 'No Subtitle' }}
+
+
+
+
+
+
+
+
+
diff --git a/src/components/upload-file/FormCitizen.vue b/src/components/upload-file/FormCitizen.vue
index 90baa1ad..f9fa325b 100644
--- a/src/components/upload-file/FormCitizen.vue
+++ b/src/components/upload-file/FormCitizen.vue
@@ -2,6 +2,7 @@
import { ref, watch } from 'vue';
import { QSelect } from 'quasar';
import { selectFilterOptionRefMod } from 'stores/utils';
+import { AddressForm } from 'components/form';
import { getRole } from 'src/services/keycloak';
import useOptionStore from 'stores/options';
import { onMounted } from 'vue';
@@ -38,23 +39,48 @@ defineEmits<{
(e: 'cancel'): void;
}>();
+const middleName = defineModel
+
+
+ Document Properties
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/upload-file/PersFormBusinessRegistration.vue b/src/components/upload-file/PersFormBusinessRegistration.vue
new file mode 100644
index 00000000..0657be42
--- /dev/null
+++ b/src/components/upload-file/PersFormBusinessRegistration.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+ Document Properties
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/upload-file/UploadFile.vue b/src/components/upload-file/UploadFile.vue
index f1ff93a7..1e5bd73a 100644
--- a/src/components/upload-file/UploadFile.vue
+++ b/src/components/upload-file/UploadFile.vue
@@ -1,23 +1,25 @@
-
+
+
+ Document Properties
+
+
+
+
+
+
+
+
+ {{ $t('general.noData') }}
+
+
+
+
+
+
+
+
-
+
+
-
-
-
- {{ $t(v.label) }}
-
-
-
-
+ :label="$t('general.uploadFile')"
+ @click="
+ () => {
+ currentIndex = obj.length;
+ browse();
+ }
+ "
+ >
-
-
diff --git a/src/components/upload-file/UploadFileGroup.vue b/src/components/upload-file/UploadFileGroup.vue
new file mode 100644
index 00000000..2ea976e6
--- /dev/null
+++ b/src/components/upload-file/UploadFileGroup.vue
@@ -0,0 +1,387 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/upload-file/index.ts b/src/components/upload-file/index.ts
index dc6ce189..abb06afb 100644
--- a/src/components/upload-file/index.ts
+++ b/src/components/upload-file/index.ts
@@ -1,2 +1,7 @@
export { default as UploadFile } from './UploadFile.vue';
+export { default as UploadFileGroup } from './UploadFileGroup.vue';
export { default as FormCitizen } from './FormCitizen.vue';
+export { default as FormTm6 } from './FormTm6.vue';
+export { default as CorpFormBusinessRegistration } from './CorpFormBusinessRegistration.vue';
+export { default as PersFormBusinessRegistration } from './PersFormBusinessRegistration.vue';
+export { default as noticeJobEmployment } from './noticeJobEmployment.vue';
diff --git a/src/components/upload-file/noticeJobEmployment.vue b/src/components/upload-file/noticeJobEmployment.vue
new file mode 100644
index 00000000..e2c1eca6
--- /dev/null
+++ b/src/components/upload-file/noticeJobEmployment.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+
+
+
+
+
+
+ {{ v.name }}
+ {{ v.name }}
+
+ currentFile.value?.url));
-
-
-
-
-
-
- {{ $t(currentMode) }}
-
-
-
-
-
-
- {{ currentFileSelected }}
-
+
+
+
+
+
+
+
+
+
+
+ {{ $t(v.label) }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t(v.label) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/css/app.scss b/src/css/app.scss
index 6b9f7e27..d0ea4d2c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -19,8 +19,8 @@ html {
--surface-tab: var(--gray-2);
- --text-mute: var(--stone-5-hsl);
- --text-mute-2: var(--stone-7-hsl);
+ --text-mute: var(--stone-7-hsl);
+ --text-mute-2: var(--stone-8-hsl);
--info-fg: 0 0% 100%;
--info-bg: var(--blue-6-hsl);
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index d2269435..5ffe90d4 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -15,6 +15,7 @@ $info: var(--blue-6);
$warning: #ffc224;
$disabled: var(--stone-4);
+$input-border: var(--gray-2);
$separator-color: var(--border-color);
$separator-dark-color: var(--border-color);
@@ -94,6 +95,21 @@ div.fullscreen.q-drawer__backdrop {
color: $disabled;
}
+.input-border,
+.input-border *,
+[input-border],
+[input-border] * :not(:deep(.q-checkbox)) {
+ color: hsl(var(--text-mute)) !important;
+}
+
+.bg-input-border {
+ background: $input-border;
+}
+
+.text-input-border {
+ color: $input-border;
+}
+
.q-field--outlined.q-field--readonly .q-field__control:before {
border-color: transparent;
}
@@ -133,3 +149,11 @@ div.fullscreen.q-drawer__backdrop {
.q-tree__node-header:before {
top: -32px !important;
}
+
+.q-tree.q-tree--standard.text-transparent {
+ color: hsl(var(--text-mute)) !important;
+}
+
+.q-field__control {
+ align-items: center;
+}
diff --git a/src/i18n/eng/index.ts b/src/i18n/eng/index.ts
index b0dce118..49b3ba09 100644
--- a/src/i18n/eng/index.ts
+++ b/src/i18n/eng/index.ts
@@ -44,17 +44,42 @@ export default {
recordPerPage: 'Records per page',
recordsPage: 'Showing {resultcurrentPage} out of {total} records',
day: 'Days',
- select: 'Select',
+ select: 'Select {msg}',
selectAll: 'Select All',
additional: 'Additional',
editImage: 'Edit Image',
- upload: 'Upload',
+ upload: 'Upload{msg}',
baseOnDevice: 'Base on Device',
clickToCreate: 'Click to create',
age: 'Age',
nationality: 'Nationalality',
times: 'No. {number}',
uploadFile: 'Upload File',
+ typeBranch: 'Branch Type',
+ branchStatus: 'Branch Status',
+ success: 'Success',
+ taxNo: 'Legal Person',
+ contactName: 'Contact Name',
+ image: 'Image of ',
+ apply: 'Apply',
+ licenseNumber: 'License number',
+ dateOfIssue: 'Date of issue',
+ expirationDate: 'Expiration date',
+ document: 'Document',
+ uploadDate: 'Upload Date',
+ information: '{msg} Information',
+ itemNo: '{msg} No.',
+ example: 'Example',
+ view: 'View {msg}',
+ attachment: 'Attachment',
+ about: 'About',
+ total: 'Total',
+ discount: 'Discount',
+ totalAfterDiscount: 'Total after discount',
+ totalVatExcluded: 'Tax exemption amount',
+ totalVatIncluded: 'Taxable amount',
+ vat: 'VAT {msg}',
+ totalAmount: 'Total amount',
},
menu: {
@@ -102,6 +127,27 @@ export default {
},
form: {
+ tm6: {
+ transportation: 'Flight/Vehicle',
+ travelDate: 'Date of Entry',
+ entryCheckpoint: 'Point of Entry',
+ entryCardNumber: 'Entry Card Number',
+ },
+ businessRegistration: {
+ registrationNumber: 'Registration Number',
+ requestAt: 'Request At',
+ businessRegistration: 'Business Registration',
+ businessType: 'Business Type',
+ businessName: 'Name Used for Business',
+ romanCharacters: 'Roman Characters',
+ },
+ noticeJobEmployment: {
+ permitNumber: 'Work Permit Number',
+ jobDescription: 'Job Description',
+ workplace: 'Workplace',
+ dateOfHire: 'Date of Hire',
+ },
+
title: {
info: '{name}',
create: 'Create {name}',
@@ -116,8 +162,13 @@ export default {
telephone: 'Telephone',
gender: 'Gender',
address: 'Address {suffix}',
+ addressNo: 'Address No.',
+ moo: 'Moo',
+ soi: 'Soi',
+ road: 'Road',
province: 'Province',
district: 'District',
+ fullAddress: 'Full Address',
subDistrict: 'Sub-district',
zipCode: 'Zip Code',
prefixName: 'Prefix',
@@ -135,7 +186,10 @@ export default {
please: 'Please enter {msg} correct information.',
invalid: 'Invalid value.',
invalidCustomeMessage: 'Invalid value. {msg}',
+ letterOnly: 'Only letters are allowed',
letterAndNumOnly: 'Only letters and number are allowed',
+ numOnly: 'Only number are allowed',
+ requireLength: 'Please enter {msg} character',
},
warning: {
title: 'Warning {msg}',
@@ -162,14 +216,19 @@ export default {
branch: {
office: 'Office',
+ allBranch: 'All Branch',
card: {
+ office: 'Office',
orderNumber: 'No.',
branchLabelName: 'Name',
branchLabelAddress: 'Address',
branchLabelTel: 'Telephone',
branchLabelType: 'Type',
+ branchVirtual: 'Service Point',
branchLabel: 'Branch',
branchHQLabel: 'Headoffice',
+ taxNo: 'Legal Person',
+ contactName: 'Contact Name',
},
page: {
captionManage: 'Manage',
@@ -247,6 +306,9 @@ export default {
checkpoint: 'Checkpoint',
checkpointEN: 'Checkpoint (EN)',
attachment: 'Attachment Document',
+ citizenId: 'Citizen ID',
+ citizenIssue: 'Citizen Issue',
+ citizenExpire: 'Citizen Expire',
},
},
customer: {
@@ -283,8 +345,8 @@ export default {
issueDate: 'Issue Date',
passportExpiryDate: 'Passport Expiry Date',
- firstName: 'First Name in Thai',
- lastName: 'Last Name in Thai',
+ firstName: 'First Name ',
+ lastName: 'Last Name ',
firstNameEN: 'First Name in English',
lastNameEN: 'Last Name in English',
@@ -318,6 +380,7 @@ export default {
},
headQuarters: {
title: 'Headoffice',
+ telephoneNo: 'Headoffice Telephone',
},
businessType: 'Business Type',
businessTypeEN: 'Business Type (EN)',
@@ -327,17 +390,24 @@ export default {
payDay: 'Pay Day',
payRate: 'Pay Rate',
salesPerson: 'Sales Person',
+ employerName: 'Employer Name',
+ employmentOffice: 'Employment Office',
+ homeCode: 'Address Identification (11 characters)',
+ agent: 'Agent',
},
table: {
orderNumber: 'No.',
fullname: 'Full Name',
+ titleName: 'Name',
businessTypePure: 'Business Type',
+ jobPosition: 'Job Position',
address: 'Address',
workPlace: 'Workplace',
contactName: 'Contact Name',
contactPhone: 'Contact Phone',
totalEmployee: 'Total Employee',
+ officeTel: 'Headoffice Telephone',
},
},
@@ -437,6 +507,8 @@ export default {
business: 'Business',
contact: 'Contact',
attachment: 'Upload Document',
+ remark: 'remark',
+ authorized: 'Authorized',
},
form: {
title: 'Branch',
@@ -471,42 +543,82 @@ export default {
name: 'Products and Services Types Name',
},
service: {
- title: 'Services',
+ title: 'Type',
totalWork: 'Total Work',
- code: 'Services Code',
- name: 'Services Name',
+ code: 'Type Code',
+ name: 'Type Name',
work: 'Work',
workName: 'Work Name',
showTotalPrice: 'Show Total Price',
- addTitle: 'Add Services',
+ addTitle: 'Add Type',
registeredBranch: 'Registered Branch',
- information: 'Services Information',
+ information: 'Type Information',
workInformation: 'Work Information',
- serviceProperties: 'Services Properties',
+ serviceProperties: 'Type Properties',
propertiesName: 'Properties Name',
properties: 'Properties',
noProperties: 'No Properties',
propertiesInWork: 'Properties in work',
- productInWork: 'Products in work',
- totalProductWork: 'Total products of work',
+ productInWork: 'Products and Services in work',
+ totalProductWork: 'Total products and services of work',
list: 'Item',
addWork: 'Add Work',
workAlreadyExist: 'Work already exist',
},
product: {
- title: 'Products',
- code: 'Products Code',
- name: 'Products Name',
+ title: 'Products and Services',
+ code: 'Products and Services Code',
+ name: 'Products and Services Name',
registeredBranch: 'Registered Branch',
- noProduct: 'No Products',
- allProduct: 'All Products',
- addTitle: 'Add Products',
+ noProduct: 'No Products and Services',
+ allProduct: 'All Products and Services',
+ addTitle: 'Add Products and Services',
processingTime: 'Processing Time',
processingTimeDay: 'Processing Time (Days)',
priceInformation: 'Price Information',
salePrice: 'Sale Price',
agentPrice: 'Agent Price',
processingPrice: 'Processing Price',
+ expenseType: 'Expense Type',
+ vatIncluded: 'Include VAT',
+ vatExcluded: 'Exclude VAT',
+ vat: 'VAT',
+ },
+ },
+
+ quotation: {
+ title: 'Quotation',
+ customerName: 'Customer Name',
+ actor: 'Actor',
+ totalPrice: 'Total (Baht)',
+ receipt: 'Receipt/Tax Invoice',
+ branch: 'Branch that issues the quotation',
+ customer: 'Customer',
+ newCustomer: 'New Customer',
+ employeeList: 'Employee List',
+ employee: 'Employee',
+ workName: 'Work Name',
+ contactName: 'Contact Name',
+ documentReceivePoint: 'Document Drop-Off Point"',
+ dueDate: 'Quotation Due Date',
+
+ paymentCondition: 'Payment Terms',
+ payType: 'Payment Methods',
+ bank: 'Select Payment Account',
+ paySplitCount: 'Number of Installments',
+ payTotal: 'Total {msg}',
+
+ summary: 'Total Summary',
+ periodNo: 'Installment No."',
+ amount: 'Amount',
+ payDueDate: 'Pay Due Date',
+ callDueDate: 'Call Due Date',
+ type: {
+ all: 'All',
+ fullAmountCash: 'Full Amount Cash',
+ installmentsCash: 'Installments Cash',
+ fullAmountBill: 'Full Amount Bill',
+ installmentsBill: 'Installments Bill',
},
},
@@ -519,6 +631,7 @@ export default {
confirmLogout: 'Confirm Logout',
},
message: {
+ beingUse: '"{msg}" is being used.',
incompleteDataEntry: 'Incomplete data entry on {tap} page',
confirmChangeStatusOn: 'Do you want to open?',
confirmChangeStatusOff: 'Do you want to close?',
@@ -594,6 +707,7 @@ export default {
validateError: 'Validate Error',
codeMisMatch: 'Code Mismatch',
userExists: 'User already exits.',
+ crossCompanyNotPermit: 'Cannot move between different headoffice',
},
},
};
diff --git a/src/i18n/tha/index.ts b/src/i18n/tha/index.ts
index dce5417a..78df3170 100644
--- a/src/i18n/tha/index.ts
+++ b/src/i18n/tha/index.ts
@@ -44,17 +44,42 @@ export default {
recordPerPage: 'แสดงทีละ',
recordsPage: 'แสดง {resultcurrentPage} รายการจาก {total} รายการ',
day: 'วัน',
- select: 'เลือก',
+ select: 'เลือก{msg}',
selectAll: 'เลือกทั้งหมด',
additional: 'เพิ่มเติม',
editImage: 'แก้ไขรูป',
- upload: 'อัปโหลด',
+ upload: 'อัปโหลด{msg}',
baseOnDevice: 'สีตามอุปกรณ์',
clickToCreate: 'กดเพื่อสร้าง',
age: 'อายุ',
nationality: 'สัญชาติ',
times: 'ครั้งที่ {number}',
- uploadFile: 'อัปโหลดไฟล์',
+ uploadFile: 'อัปโหลดเอกสาร',
+ typeBranch: 'ประเภทสาขา',
+ branchStatus: 'สถานะสาขา',
+ success: 'สำเร็จ',
+ taxNo: 'ทะเบียนนิติบุคคล',
+ contactName: 'ติดต่อ',
+ image: 'รูปภาพ',
+ apply: 'นำไปใช้',
+ licenseNumber: 'เลขที่ใบอนุญาต',
+ dateOfIssue: 'วันที่อนุญาต',
+ expirationDate: 'วันที่หมดอายุ',
+ document: 'ชื่อเอกสาร',
+ uploadDate: 'วันที่อัปโหลด',
+ information: 'ข้อมูล{msg}',
+ itemNo: 'เลขที่{msg}',
+ example: 'ตัวอย่าง',
+ view: 'ดู{msg}',
+ attachment: 'เอกสาร',
+ about: 'เกี่ยวกับ',
+ total: 'ยอดรวม',
+ discount: 'ส่วนลด',
+ totalAfterDiscount: 'จำนวนเงินหลังหักส่วนลด',
+ totalVatExcluded: 'จำนวนเงินยกเว้นภาษี',
+ totalVatIncluded: 'จำนวนเงินที่คำนวณภาษี',
+ vat: 'ภาษีมูลค่าเพิ่ม {msg}',
+ totalAmount: 'จำนวนเงินรวมทั้งสิ้น',
},
menu: {
@@ -102,6 +127,26 @@ export default {
},
form: {
+ tm6: {
+ transportation: 'เที่ยวบิน/พาหนะ',
+ travelDate: 'วันที่เดินทางเข้ามา',
+ entryCheckpoint: 'จุดผ่านแดนที่เข้าประเทศ',
+ entryCardNumber: 'หมายเลขบัตรขาเข้า',
+ },
+ businessRegistration: {
+ registrationNumber: 'ทะเบียนเลขที่',
+ requestAt: 'คำขอที่',
+ businessRegistration: 'จดทะเบียนพาณิชย์',
+ businessType: 'ชนิดพาณิชย์',
+ businessName: 'ชื่อที่ใช้ในการประกอบพาณิชย์',
+ romanCharacters: 'อักษรโรมัน',
+ },
+ noticeJobEmployment: {
+ permitNumber: 'หมายเลขใบอนุญาตทำงาน ',
+ jobDescription: 'ลักษณะงาน',
+ workplace: 'สถานที่ทำงาน',
+ dateOfHire: 'วันที่จ้าง',
+ },
title: {
info: '{name}',
create: 'สร้าง {name}',
@@ -116,14 +161,19 @@ export default {
gender: 'เพศ',
telephone: 'เบอร์โทรศัพท์',
address: 'ที่อยู่ {suffix}',
+ addressNo: 'บ้านเลขที่',
+ moo: 'หมู่',
+ soi: 'ซอย',
+ road: 'ถนน',
province: 'จังหวัด',
district: 'อำเภอ',
+ fullAddress: 'ที่อยู่เต็ม',
subDistrict: 'ตำบล',
zipCode: 'รหัสไปรษณีย์',
prefixName: 'คํานําหน้า',
- firstName: 'ชื่อ ภาษาไทย',
+ firstName: 'ชื่อ ',
firstNameEN: 'ชื่อ ภาษาอังกฤษ',
- lastName: 'นามสกุล ภาษาไทย',
+ lastName: 'นามสกุล ',
lastNameEN: 'นามสกุล ภาษาอังกฤษ',
middleName: 'ชื่อกลาง',
middleNameEN: 'ชื่อกลาง ภาษาอังกฤษ',
@@ -135,7 +185,10 @@ export default {
please: 'โปรดใส่ข้อมูล{msg}ให้ถูกต้อง',
invalid: 'ข้อมูลไม่ถูกต้อง',
invalidCustomeMessage: 'ข้อมูลไม่ถูกต้อง {msg}',
- letterAndNumOnly: 'โปรดใช้เฉพาะภาษาอังกฤษและตัวเลขเท่านั้น',
+ letterOnly: 'โปรดใช้เฉพาะตัวอักษรภาษาอังกฤษเท่านั้น',
+ letterAndNumOnly: 'โปรดใช้เฉพาะตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น',
+ numOnly: 'โปรดใช้เฉพาะตัวเลขเท่านั้น',
+ requireLength: 'กรุณากรอกให้ครบ {msg} หลัก',
},
warning: {
title: 'แจ้งเตือน {msg}',
@@ -162,14 +215,19 @@ export default {
branch: {
office: 'สำนักงาน',
+ allBranch: 'สาขาทั้งหมด',
card: {
- orderNumber: 'เลขที่',
+ orderNumber: 'ลำดับที่',
branchLabelName: 'ชื่อ',
+ office: 'สำนักงาน',
branchLabelAddress: 'ที่อยู่',
- branchLabelTel: 'เบอร์โทรศัพท์',
+ branchLabelTel: 'เบอร์โทรสำนักงาน',
branchLabelType: 'ประเภท',
branchLabel: 'สาขา',
+ branchVirtual: 'จุดรับบริการ',
branchHQLabel: 'สำนักงานใหญ่',
+ taxNo: 'ทะเบียนนิติบุคคล',
+ contactName: 'ติดต่อ',
},
page: {
captionManage: 'จัดการ',
@@ -230,8 +288,8 @@ export default {
userType: 'ประเภทผู้ใช้งาน',
userRole: 'สิทธิ์ผู้ใช้งาน',
prefixName: 'คํานําหน้า',
- firstName: 'ชื่อ ภาษาไทย',
- lastName: 'นามสกุล ภาษาไทย',
+ firstName: 'ชื่อ ',
+ lastName: 'นามสกุล ',
firstNameEN: 'ชื่อ ภาษาอังกฤษ',
lastNameEN: 'นามสกุล ภาษาอังกฤษ',
middleName: 'ชื่อกลาง',
@@ -247,6 +305,9 @@ export default {
checkpoint: 'ด่าน',
checkpointEN: 'ด่าน ภาษาอังกฤษ',
attachment: 'เอกสารประจำตัว',
+ citizenId: 'เลขที่บัตรประชาชน',
+ citizenIssue: 'วันที่ออกบัตร',
+ citizenExpire: 'วันที่หมดอายุ',
},
},
customer: {
@@ -283,8 +344,8 @@ export default {
issueDate: 'วันที่ออกหนังสือ',
passportExpiryDate: 'วันหiมดอายุหนังสือเดินทาง',
- firstName: 'ชื่อ ภาษาไทย',
- lastName: 'นามสกุล ภาษาไทย',
+ firstName: 'ชื่อ ',
+ lastName: 'นามสกุล ',
firstNameEN: 'ชื่อ ภาษาอังกฤษ',
lastNameEN: 'นามสกุล ภาษาอังกฤษ',
@@ -318,26 +379,34 @@ export default {
},
headQuarters: {
title: 'สำนักงานใหญ่',
+ telephoneNo: 'เบอร์โทรศัพท์สำนักงาน',
},
- businessType: 'ประเภทธุรกิจ',
- businessTypeEN: 'ประเภทธุรกิจ (ภาษาอังกฤษ)',
+ businessType: 'ประเภทกิจการ',
+ businessTypeEN: 'ประเภทกิจการ (ภาษาอังกฤษ)',
jobPosition: 'ตำแหน่งงาน',
jobPositionEN: 'ตำแหน่งงาน (ภาษาอังกฤษ)',
jobDescription: 'รายละเอียดงาน',
payDay: 'วันจ่ายเงินเดือน',
- payRate: 'อัตราค่าจ้าง',
+ payRate: 'อัตราค่าจ้าง/วัน',
salesPerson: 'เจ้าหน้าที่ขาย',
+ employerName: 'ชื่อนายจ้าง',
+ employmentOffice: 'สำนักงานจัดหางาน',
+ homeCode: 'รหัสประจำบ้าน (11 หลัก)',
+ agent: 'ตัวแทน',
},
table: {
orderNumber: 'ลําดับ',
fullname: 'ชื่อ-นามสกุล',
+ titleName: 'ชื่อ บริษัท/นิติบุคคล',
businessTypePure: 'ประเภทกิจการ',
+ jobPosition: 'ตำแหน่งงาน',
address: 'ที่อยู่',
workPlace: 'สถานที่ทํางาน',
contactName: 'ชื่อผู้ติดต่อ',
contactPhone: 'โทรศัพท์ผู้ติดต่อ',
totalEmployee: 'ลูกจ้างทั้งหมด',
+ officeTel: 'เบอร์โทรสำนักงาน',
},
},
@@ -349,7 +418,7 @@ export default {
passport: 'หนังสือเดินทาง',
visa: 'วีซ่า',
healthCheck: 'ตรวจสุขภาพ',
- workHistory: 'ประวัติการทำง่าน',
+ workHistory: 'ประวัติการทำงาน',
other: 'อื่นๆ',
family: 'ครอบครัว',
},
@@ -431,10 +500,12 @@ export default {
customerBranch: {
tab: {
main: 'เกี่ยวกับ',
- address: 'ที่อยู่',
- business: 'ธุรกิจ',
- contact: 'ติดต่อ',
- attachment: 'อัปโหลดเอกสาร',
+ address: 'ที่อยู่นายจ้าง',
+ business: 'ข้อมูลธุรกิจ',
+ contact: 'ข้อมูลติดต่อ',
+ attachment: 'เอกสาร',
+ remark: 'หมายเหตุ',
+ authorized: 'ผู้มีอำนาจลงนาม',
},
form: {
title: 'สาขา',
@@ -469,42 +540,82 @@ export default {
name: 'ชื่อสินค้าและบริการ',
},
service: {
- title: 'บริการ',
+ title: 'ประเภท',
totalWork: 'งานทั้งหมด',
- code: 'รหัสบริการ',
- name: 'ชื่อบริการ',
+ code: 'รหัสประเภท',
+ name: 'ชื่อประเภท',
work: 'งาน',
workName: 'ชื่องาน',
showTotalPrice: 'แสดงราคารวม',
- addTitle: 'เพิ่มบริการ',
+ addTitle: 'เพิ่มประเภท',
registeredBranch: 'สาขาที่ลงทะเบียน',
- information: 'ข้อมูลบริการ',
+ information: 'ข้อมูลประเภท',
workInformation: 'ข้อมูลงาน',
- serviceProperties: 'คุณสมบัติของบริการ',
+ serviceProperties: 'คุณสมบัติของประเภท',
propertiesName: 'ชื่อคุณสมบัติ',
properties: 'คุณสมบัติ',
noProperties: 'ยังไม่มีคุณสมบัติ',
propertiesInWork: 'คุณสมบัติภายในงาน',
- productInWork: 'สินค้าภายในงาน',
- totalProductWork: 'รวมสินค้างาน',
+ productInWork: 'สินค้าและบริการภายในงาน',
+ totalProductWork: 'รวมสินค้าและบริการงาน',
list: 'รายการ',
addWork: 'เพิ่มงาน',
workAlreadyExist: 'งานนี้มีอยู่แล้ว',
},
product: {
- title: 'สินค้า',
- code: 'รหัสสินค้า',
- name: 'ชื่อสินค้า',
+ title: 'สินค้าและบริการ',
+ code: 'รหัสสินค้าและบริการ',
+ name: 'ชื่อสินค้าและบริการ',
registeredBranch: 'สาขาที่ลงทะเบียน',
- noProduct: 'ยังไม่มีสินค้า',
- allProduct: 'สินค้าทั้งหมด',
- addTitle: 'เพิ่มสินค้า',
+ noProduct: 'ยังไม่มีสินค้าและบริการ',
+ allProduct: 'สินค้าและบริการทั้งหมด',
+ addTitle: 'เพิ่มสินค้าและบริการ',
processingTime: 'ระยะเวลาดำเนินการ',
processingTimeDay: 'ระยะเวลาดำเนินการ (วัน)',
priceInformation: 'ข้อมูลราคา',
salePrice: 'ราคาขาย',
agentPrice: 'ราคาตัวแทน',
processingPrice: 'ราคาดำเนินการ',
+ expenseType: 'ประเภทค่าใช้จ่าย',
+ vatIncluded: 'รวม VAT',
+ vatExcluded: 'ไม่รวม VAT',
+ vat: 'คำนวณ VAT',
+ },
+ },
+
+ quotation: {
+ title: 'ใบเสนอราคา',
+ customerName: 'ชื่อลูกค้า',
+ actor: 'ผู้ที่ทำรายงาน',
+ totalPrice: 'ยอดรวมสุทธิ(บาท)',
+ receipt: 'ใบเสร็จ/กำกับภาษี',
+ branch: 'สาขาที่ออกใบเสนอราคา',
+ customer: 'ลูกค้า',
+ newCustomer: 'ลูกค้าใหม่',
+ employeeList: 'รายชื่อแรงงาน',
+ employee: 'แรงงาน',
+ workName: 'ชื่องาน',
+ contactName: 'ชื่อผู้ติดต่อ',
+ documentReceivePoint: 'จุดรับเอกสาร',
+ dueDate: 'วันครบกำหนดใบเสนอราคา',
+
+ paymentCondition: 'เงื่อนไขการชำระเงิน',
+ payType: 'วิธีการชำระเงิน',
+ bank: 'เลือกบัญชีชำระเงิน',
+ paySplitCount: 'จำนวนงวด',
+ payTotal: 'ยอดชำระ {msg}',
+
+ summary: 'สรุปยอดทั้งหมด',
+ periodNo: 'งวดที่',
+ amount: 'จำนวนเงิน',
+ payDueDate: 'วันที่กำหนดจ่าย',
+ callDueDate: 'วันที่ครบกำหนดเรียก',
+ type: {
+ all: 'ทั้งหมด',
+ fullAmountCash: 'เงินสดเต็มจำนวน',
+ installmentsCash: 'เงินสดแบ่งจ่าย',
+ fullAmountBill: 'ใบเรียกเก็บเงินเต็มจำนวน',
+ installmentsBill: 'ใบเรียกเก็บเงินแบ่งจ่าย',
},
},
@@ -517,6 +628,7 @@ export default {
confirmLogout: 'ยืนยันการออกจากระบบ',
},
message: {
+ beingUse: '"{msg}" มีการใช้งานอยู่',
incompleteDataEntry: 'กรอกข้อมูลไม่ครบในหน้า {tap}',
confirmChangeStatusOn: 'คุณต้องการเปิดใช่หรือไม่',
confirmChangeStatusOff: 'คุณต้องการปิดใช่หรือไม่',
@@ -535,16 +647,16 @@ export default {
cancel: 'ยกเลิก',
},
backend: {
- productGroupNotFound: 'ไม่พบกลุ่มสินค้า',
- productGroupInUsed: 'กลุ่มสินค้าที่ใช้งานอยู่',
- productNotFound: 'ไม่พบสินค้า',
- productInUsed: 'สินค้าใช้งานอยู่',
- productTypeNotFound: 'ไม่พบประเภทสินค้า',
- productGroupAssociatedBadReq: 'ไม่พบกลุ่มสินค้าที่เกี่ยวข้อง',
- productTypeInUsed: 'ประเภทสินค้าใช้งานอยู่',
- productGroupBadReq: 'ไม่พบกลุ่มสินค้า',
+ productGroupNotFound: 'ไม่พบกลุ่มสินค้าและบริการ',
+ productGroupInUsed: 'กลุ่มสินค้าและบริการที่ใช้งานอยู่',
+ productNotFound: 'ไม่พบสินค้าและบริการ',
+ productInUsed: 'สินค้าและบริการใช้งานอยู่',
+ productTypeNotFound: 'ไม่พบประเภทสินค้าและบริการ',
+ productGroupAssociatedBadReq: 'ไม่พบกลุ่มสินค้าและบริการที่เกี่ยวข้อง',
+ productTypeInUsed: 'ประเภทสินค้าและบริการใช้งานอยู่',
+ productGroupBadReq: 'ไม่พบกลุ่มสินค้าและบริการ',
serviceNotFound: 'ไม่พบบริการ',
- someProductBadReq: 'ไม่พบสินค้าบางส่วน',
+ someProductBadReq: 'ไม่พบสินค้าและบริการบางส่วน',
serviceInUsed: 'บริการใช้งานอยู่',
workNotFound: 'ไม่พบงาน',
workInUsed: 'งานที่ใช้งานอยู่',
@@ -589,6 +701,7 @@ export default {
validateError: 'เกิดข้อผิดพลาดจากการตรวจสอบ',
codeMisMatch: 'รหัสไม่ตรงกัน',
userExists: 'ชื่อผู้ใช้นี้มีอยู่ในระบบอยู่แล้ว',
+ crossCompanyNotPermit: 'ไม่สามารถดำเนินการระหว่างสำนักงานใหญ่อื่นได้',
},
},
};
diff --git a/src/layouts/DrawerComponent.vue b/src/layouts/DrawerComponent.vue
index a2a95a70..3291f294 100644
--- a/src/layouts/DrawerComponent.vue
+++ b/src/layouts/DrawerComponent.vue
@@ -42,7 +42,8 @@ onMounted(async () => {
role.value.includes('branch_admin') ||
role.value.includes('head_of_admin') ||
role.value.includes('system') ||
- role.value.includes('owner')
+ role.value.includes('owner') ||
+ role.value.includes('head_of_account')
? false
: true,
},
@@ -79,8 +80,8 @@ onMounted(async () => {
{
label: 'menu.quotation',
icon: 'mdi-file-document',
- route: '',
- disabled: true,
+ route: '/quotation',
+ disabled: false,
},
{
label: 'menu.requestList',
@@ -181,10 +182,11 @@ function branchSetting() {}
+
+
+ Document Properties
+
+
+
+
+
+
+
+
+