chamomind/jws-frontend
chamomind/jws-frontend
7
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

feat: task order (#141)

Browse source 
* feat: task order => routes

* feat: Page

* refactor: pagination

* refactor: taskOrder => table, card and constants

* feat: add structure select request list comp

* fix: re-export type

* refactor: edit path route of task order

* feat: trigger task order

* refactor: edit type task statss

* feat: table select request list

* feat: i18n

* refactor: quasar expansion chevron color

* refactor: type

* refactor: state btn status done

* feat: task order => order view layout

* feat: task order => remark expansion

* fix: task order => rename attachment to additional file

* feat: upload file section optional layout

* feat: task order => additional file expansion

* feat: task order => payment expansion

* feat: conditionally add urgent

* feat: send id together with link

* refactor: edit type

* feat: new form.ts

* refactor: edit url

* refactor: edit id trigger

* feat: select institution component

* feat: task order code i18n

* feat: task order => document expansion form

* feat: fallback address on null

* refactor: add type for table

* feat: add filter parameter

* refactor: edit name routes

* refactor: add type of task order payload

* refactor: by value form

* refactor: responsive quotation form info

* refactor: submit form

* refactor: add i18n

* refactor: status canceled

* refactor: handle task status

* refactor: handle mode view

* refactor: addtaskstatus

* refactor: i18n & constants

* refactor: table employee

* refactor: select ready request work

* refactor: handle save form

* refactor: edit layout btn

* feat: undo()

* cleanup delete import

* feat: closetab

* refactor: handle readonly

* fix: body edit

* refactor: handle readonly uploadfile

* feat: import manage attachment

* refactor: quotation/task-order => type

* refactor: select ready request work

* refactor: i18n & constants

* chore: clean duplicate i18n

* refactor: type according to backend relation

* refactor: edit base url

* feat: upload file

* feat: fetch file list

* feat: get url file

* refactor: set default opened

* refactor: type

* feat: removefile

* feat: task order => select product

* feat: add parameter only active branch is selectable

* refactor: add i18n

* feat: set layout

* feat: add info product expansion

* refactor: new info messenger

* refactor: add slot name value

* refactor: add i18n

* refactor: edit type task status

* refactor: use date format

* refactor: value can null

* refactor: add i18n

* cleanup

* feat: productlistinput

* refactor: edit i18n

* refactor: edit redo

* refactor: add slot

* feat: task order => i18n

* refactor: task order => constant

* refactor: taskOrder => status type and index

* feat: taskOrder => ReceiveDialog

* refactor: wording

* refactor: table employee due date

* refactor: receive task i18n

* feat: trigger receive & task stat in receive page

* refactor: receive dialog task in cart  i18n

* fix: remove task-order/receive/add

* feat: receivetabletaskorder

* refactor: fetch task on receive dialog

* feat: add separate api get user task

* refactor: receive fetch (messenger)

* refactor: edit layout table

* refactor: task order i18n & constant

* refactor: task order change tab and stat (messenger and !messenger)

* fix: task order status display & receive badge color (card)

* refactor: trigger receive view

* fix: add receive task condition

* feat: total count

* feat: prepare information

* fix: i18n error task order not found

* refacor: value

* feat: select worker

* refactor: status i18n & constant

* refactor: table employee props (check box, step)

* fix: order => select ready task

* refactor: order => toggle status

* refactor: receive => receive dialog

* feat: featch value

* refactor: task status display components

* refactor: status active can is null

* feat: update status tab

* refactor: data display

* refactor: i18n & fullTaskOrder variable

* refactor: task receive view

* refactor: add type responsible user

* refactor: set group messenger

* cleanup:

* refactor: i18n / clone full task order / service => workflow type

* refactor: receive view

* refactor: show info messenger

* refactor: handle flow step

* refactor: receive view => opacity when pending

* feat: add workflow template name and step name

* feat: display workflow data on table

* feat: add template step identifier

* fix: edit does not change workflow id if changed

* feat: detect if same template and step

* refactor: handle template

* refactor: add slot name product

* refactor: map step in list product

* refactor: bind data messenger list group

* refactor: change endpoint name

* chore: add helper package

* feat: changetaskstatus

* refactor: update type

* refactor: set color btn

* refactor: add step

* refactor: add resposible institution

* feat: disabled

* refactor: map responsible institution

* fix: order view => readonly

* chore: clean

* refactor: edit url api

* refactor: edit name type

* refactor: add slots action

* refactor: add type row

* refactor: add opts of task status

* refactor: add select status

* refactor: handle btn

* refactor: add btn change task status

* refactor: edit i18n redo th

* refactor: sort status opts

* feat: receive & order banner img

* refactor: fetch status after submit

* refactor: handle create only

* refactor: task order status type Accept (messenger only)

* feat: receive messenger profile

* refactor: receive toggle status (display only)

* fix: document expansion readonly

* feat: confirmsendingbtn

* refactor: constant and task order status

* feat: receive task list count

* refactor: post or get

* refactor: define props institution group

* refactor: fetch status after submit

* refactor: handle create

* refactor: handle query

* refactor: update endpoint to support accept multiple order

* refactor: change function name

* feat: receive => functional accept task order

* feat: task status count

* feat: receive stat card count

* refactor: order messenger profile

* refactor: edit value to be task status

* refactor: handle status of type order

* refactor: use componet task status

* refactor: handle show btn saving status

* refactor: order => task status

* refactor: edit selectStatus => changeStatus

* refactor: edit @click btn confirmssending

* refactor: add i18n

* refactor: add function get template data

* refactor: add change status

* refactor: handle type receive

* feat: order => auto change tab by status

* refactor: fetch task after change status

* feat: fail remark dialog

* refactor: display step order (table employee)

* refactor: fail remark dialog

* refactor: order => open ready request dialog map selected

* refactor: task list type & change status param

* refactor: table task order, td background when selected

* refactor: order => change status param

* refactor: order => selectedEmployee variable type

* refactor: task status component => shield btn

* refactor: receive => change status

* refactor: order => step btn waiting

* fix: step btn waiting condition

* refactor: filter selectable task (Failed)

* refactor: find index condition on check

* refactor: no request list available

* refactor: fail btn no-wrap

* refactor: fail dialog readonly

* fix: reset state on open dialog

* fix: wrong title position

* refactor: hide task status drop down icon

* fix: handle check condition

* refactor: add userTask type and status

* feat: submit task order function

* refactor: table employee checkbox display condition

* refactor: main layout

* fix: task order validate i18n

* refactor: table task order add submit status

* refactor: status list

* refactor: info product => user task status

* feat: receive => submit task & step

* refactor: i18n

* feat: complete task oder function

* refactor: task status component no action props

* refactor: info messenger status

* refactor: receive and order view

* refactor: order complete view

* refactor: order => complete color and title

* refactor: calc price on table

* refactor: quotation table i18n + product image

* refactor: remove urgent checkbox

* refactor: task status color

* feat: calc summary price

* fix: data is not available

* feat: add doc view structure

* refactor: format address text

* feat: fetch document data from api

* fix: value is null

* fix: regression cannot edit package

* feat: add document view for task order

* feat: add view document button

* feat: update type add discount

* feat: readonly on cancel

* feat: add discount from relation

* refactor: add taskProduct on submit order

* refactor: order => task product discount

* refactor: order => date, task status count, view example

* refactor: receive date

* refactor: receive task status count

---------

Co-authored-by: puriphatt <puriphat@frappet.com>
Co-authored-by: nwpptrs <jay02499@gmail.com>
Co-authored-by: Thanaphon Frappet <thanaphon@frappet.com>
Co-authored-by: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Co-authored-by: oat_dev <nattapon@frappet.com>
This commit is contained in:
Methapon Metanipat 2024-12-25 11:59:49 +07:00 • committed by GitHub
parent cd0831bac1
commit 9eff614dbd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
56 changed files with 6981 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/components/05_quotation/ProductItem.vue
View file

@ -2,6 +2,7 @@
import { ref, watch } from 'vue';
import { QTableProps, QTableSlots } from 'quasar';
import { storeToRefs } from 'pinia';
import { baseUrl } from 'stores/utils';
import WorkerItem from './WorkerItem.vue';
import DeleteButton from '../button/DeleteButton.vue';
@ -81,19 +82,19 @@ const columns = [
{
name: 'code',
align: 'left',
label: 'general.code',
label: 'productService.product.code',
field: (v) => v.product.code,
},
{
name: 'name',
align: 'center',
label: 'productService.service.list',
label: 'quotation.productList',
field: (v) => v.product.name,
},
{
name: 'amount',
align: 'center',
label: 'general.amount',
label: 'taskOrder.amountOfEmployee',
field: 'amount',
},
{
@ -115,15 +116,15 @@ const columns = [
field: 'priceBeforeVat',
},
{
name: 'tax',
name: 'vat',
align: 'center',
label: 'general.vat',
field: 'tax',
field: 'vat',
},
{
name: 'sumPrice',
align: 'right',
label: 'quotation.sumPrice',
label: 'quotation.totalPriceBaht',
field: 'sumPrice',
},
] satisfies QTableProps['columns'];
@ -335,14 +336,22 @@ watch(
"
></q-input>
</q-td>
<q-td>{{ props.row.product.code }}</q-td>
<q-td class="text-center">{{ props.row.product.code }}</q-td>
<q-td style="width: 100%">
<q-avatar class="q-mr-sm" size="md">
<q-icon
class="full-width full-height"
name="mdi-shopping-outline"
:style="`color: var(--teal-10); background: hsla(var(--teal-${$q.dark.isActive ? '8' : '10'}-hsl)/0.15)`"
/>
<q-img
class="text-center"
:ratio="1"
:src="`${baseUrl}/product/${props.row.product.id}/image/${props.row.product.selectedImage}`"
>
<template #error>
<q-icon
class="full-width full-height"
name="mdi-shopping-outline"
:style="`color: var(--teal-10); background: hsla(var(--teal-${$q.dark.isActive ? '8' : '10'}-hsl)/0.15)`"
/>
</template>
</q-img>
</q-avatar>
{{ props.row.product.name }}
</q-td>
@ -366,7 +375,6 @@ watch(
/>
</q-td>
<q-td align="right">
<!-- TODO: -->
{{
formatNumberDecimal(
props.row.pricePerUnit +

2
src/components/05_quotation/QuotationCard.vue
View file

@ -22,6 +22,7 @@ defineProps<{
badgeColor?: string;
hideKebabView?: boolean;
hideKebabEdit?: boolean;
hideAction?: boolean;
customData?: {
label: string;
@ -88,6 +89,7 @@ const rand = Math.random();
@click.stop="$emit('view')"
/>
<KebabAction
v-if="!hideAction"
:idName="code"
status="ACTIVE"
hide-toggle

14
src/components/08_request-list/DataDisplay.vue
View file

@ -4,7 +4,7 @@ import { Icon } from '@iconify/vue/dist/iconify.js';
withDefaults(
defineProps<{
label: string;
value: string;
value?: string;
icon?: string;
iconSize?: string;
tooltip?: boolean;
@ -17,7 +17,7 @@ withDefaults(
</script>
<template>
<article class="row items-center full-width">
<article class="row items-center">
<Icon
v-if="icon"
:icon
@ -25,12 +25,14 @@ withDefaults(
:width="iconSize || '2rem'"
/>
<span class="row col">
<span class="col-12 app-text-muted-2 text-caption">
<span class="col-12 app-text-muted-2" style="font-size: 10px">
{{ label }}
</span>
<span class="col-12 text-weight-medium ellipsis">
{{ value }}
<q-tooltip v-if="tooltip" :delay="500">{{ value }}</q-tooltip>
<span class="col-12 ellipsis">
<slot name="value">
{{ value }}
<q-tooltip v-if="tooltip" :delay="500">{{ value }}</q-tooltip>
</slot>
</span>
</span>
</article>

2
src/components/NoData.vue
View file

@ -7,7 +7,7 @@ defineProps<{
}>();
</script>
<template>
<div>
<div class="text-center">
<q-img
src="/no-data.png"
:style="{

7
src/components/SelectWorker.vue Normal file
View file

@ -0,0 +1,7 @@
<script lang="ts" setup>
defineProps<{}>();
const emit = defineEmits<{}>();
</script>
<template></template>
<style scoped></style>

82
src/components/button/StateButton.vue
View file

@ -1,7 +1,83 @@
<script setup lang="ts">
withDefaults(defineProps<{}>(), {});
import { RequestWork, RequestWorkStatus } from 'src/stores/request-list/types';
withDefaults(
defineProps<{
statusDone?: boolean;
statusActive?: boolean;
statusWaiting?: boolean;
label: string;
}>(),
{
statusDone: false,
statusActive: false,
label: '',
},
);
</script>
<template>
<button
class="status-color q-pa-sm bordered row items-center cursor-pointer no-wrap"
style="text-wrap: nowrap"
:class="{
['status-color-done']: statusDone,
['status-color-doing']: true,
['status-color-waiting']: statusWaiting,
['step-status-active']: statusActive,
}"
>
<div class="q-px-sm">
<q-icon
class="icon-color quotation-status"
style="border-radius: 50%"
:name="`${statusActive ? 'mdi-circle-slice-8' : statusDone ? 'mdi-check-circle' : 'mdi-checkbox-blank-circle-outline'}`"
/>
</div>
<div class="text-left">{{ label }}</div>
</button>
</template>
<style scoped>
.status-color {
--_color: var(--gray-0);
border-color: hsla(var(--_color));
background: hsla(var(--_color) / 0.05);
border-radius: 4px;
<template></template>
.icon-color {
color: hsla(var(--_color));
}
<style scoped></style>
&.status-color-doing {
--_color: var(--blue-5-hsl);
color: var(--foreground);
}
&.status-color-done {
--_color: var(--green-5-hsl);
color: var(--foreground);
}
&.status-color-waiting {
--_color: var(--gray-4-hsl);
color: var(--foreground);
}
}
.step-status-active {
opacity: 1;
font-weight: 600;
transition: 1s box-shadow ease-in-out;
animation: status 1s infinite;
}
@keyframes status {
0% {
box-shadow: 0x 0px 0px hsla(var(--_color) / 0.5);
}
50% {
box-shadow: 0px 0px 1px 4px hsla(var(--_color) / 0.2);
}
100% {
box-shadow: 0px 0px 4px 7px hsla(var(--_color) / 0);
}
}
</style>

107
src/components/shared/select/SelectInstitution.vue Normal file
View file

@ -0,0 +1,107 @@
<script setup lang="ts">
import { ref, onMounted } from 'vue';
import { createSelect, SelectProps } from './select';
import SelectInput from '../SelectInput.vue';
import { Institution } from 'src/stores/institution/types';
import { useInstitution } from 'src/stores/institution';
type SelectOption = Institution;
const value = defineModel<string | null | undefined>('value', {
required: true,
});
const valueOption = defineModel<SelectOption>('valueOption', {
required: false,
});
const selectOptions = ref<SelectOption[]>([]);
const { getInstitutionList: getList, getInstitution: getById } =
useInstitution();
defineEmits<{
(e: 'create'): void;
(e: 'updateValue', val: string): void;
}>();
type ExclusiveProps = {
selectFirstValue?: boolean;
};
const props = defineProps<SelectProps<typeof getList> & ExclusiveProps>();
const { getOptions, setFirstValue, getSelectedOption, filter } =
createSelect<SelectOption>(
{
value,
valueOption,
selectOptions,
getList: async (query) => {
const ret = await getList({
query: query === '' ? undefined : query,
...props.params,
});
if (ret) return ret.result;
},
getByValue: async (id) => {
const ret = await getById(id);
if (ret) return ret;
},
},
{ valueField: 'id' },
);
onMounted(async () => {
await getOptions();
if (props.autoSelectOnSingle && selectOptions.value.length === 1) {
setFirstValue();
}
if (props.selectFirstValue) {
setDefaultValue();
} else await getSelectedOption();
});
function setDefaultValue() {
setFirstValue();
}
</script>
<template>
<SelectInput
v-model="value"
incremental
:label
:placeholder
:readonly
:disable="disabled"
:option="
selectOptions.map((v) => {
const ret = {
label: v.name,
value: v.id,
};
return ret;
})
"
:hide-selected="false"
:fill-input="false"
:rules="
required ? [(v: string) => !!v || $t('form.error.required')] : undefined
"
@filter="filter"
@update:model-value="(v) => $emit('updateValue', v as string)"
>
<template #append v-if="clearable">
<q-icon
v-if="!readonly && value"
name="mdi-close-circle"
@click.stop="value = ''"
class="cursor-pointer clear-btn"
/>
</template>
</SelectInput>
</template>

12
src/components/upload-file/UploadFileSection.vue
View file

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { ref } from 'vue';
import { QFile } from 'quasar';
import { baseUrl } from 'stores/utils';
@ -11,9 +11,11 @@ const props = withDefaults(
readonly?: boolean;
label?: string;
multiple?: boolean;
layout?: 'row' | 'column';
transformUrl?: (url: string) => string | Promise<string>;
}>(),
{
layout: 'row',
label: 'Upload',
readonly: false,
multiple: false,
@ -50,9 +52,9 @@ function pickFile() {
}
</script>
<template>
<div>
<div :class="{ row: layout === 'column' }">
<div
class="upload-section column rounded q-py-md full-height items-center justify-center no-wrap surface-2"
class="upload-section column rounded q-py-md items-center justify-center no-wrap surface-2 col"
>
<q-img src="/images/upload.png" width="150px" />
{{ label }}
@ -74,13 +76,13 @@ function pickFile() {
</div>
<!-- upload card -->
<section class="row">
<section class="row col" :class="{ 'q-pl-md': layout === 'column' }">
<div
v-for="(d, j) in fileData"
:key="j"
class="col-12"
:class="{
'q-pt-md': j === 0,
'q-pt-md': layout === 'row' && j === 0,
'q-pt-sm': j > 0,
}"
>