From 9eff614dbd394415cf206717b765f8b6e8980abb Mon Sep 17 00:00:00 2001 From: Methapon Metanipat <162551568+Methapon-Frappet@users.noreply.github.com> Date: Wed, 25 Dec 2024 11:59:49 +0700 Subject: [PATCH] feat: task order (#141) * 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 Co-authored-by: nwpptrs Co-authored-by: Thanaphon Frappet Co-authored-by: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Co-authored-by: oat_dev --- package.json | 3 +- pnpm-lock.yaml | 8 + src/components/05_quotation/ProductItem.vue | 34 +- src/components/05_quotation/QuotationCard.vue | 2 + .../08_request-list/DataDisplay.vue | 14 +- src/components/NoData.vue | 2 +- src/components/SelectWorker.vue | 7 + src/components/button/StateButton.vue | 82 +- .../shared/select/SelectInstitution.vue | 107 ++ .../upload-file/UploadFileSection.vue | 12 +- src/css/quasar.variables.scss | 13 + src/i18n/eng.ts | 54 +- src/i18n/tha.ts | 53 +- src/pages/01_branch-management/MainPage.vue | 32 +- src/pages/04_product-service/MainPage.vue | 1 + src/pages/05_quotation/QuotationFormInfo.vue | 22 +- .../QuotationFormProductSelect.vue | 1 + .../QuotationFormWorkerAddDialog.vue | 2 + src/pages/08_request-list/MainPage.vue | 6 + .../08_request-list/ProductExpansion.vue | 22 +- src/pages/08_request-list/RequestListView.vue | 242 +--- .../08_request-list/TableRequestList.vue | 21 +- src/pages/09_task-order/MainPage.vue | 239 +++- .../09_task-order/SelectReadyRequestWork.vue | 302 +++++ src/pages/09_task-order/TableEmployee.vue | 464 +++++++ src/pages/09_task-order/TableTaskOrder.vue | 301 +++++ .../09_task-order/TaskStatusComponent.vue | 176 +++ src/pages/09_task-order/constants.ts | 303 ++++- .../09_task-order/document_view/MainPage.vue | 519 ++++++++ .../document_view/ViewFooter.vue | 98 ++ .../document_view/ViewHeader.vue | 148 +++ .../expansion/AdditionalFileExpansion.vue | 55 + .../expansion/DocumentExpansion.vue | 108 ++ .../expansion/PaymentExpansion.vue | 63 + .../expansion/ProductExpansion.vue | 310 +++++ .../expansion/RemarkExpansion.vue | 67 + .../receive/InfoMessengerExpansion.vue | 149 +++ .../receive/InfoProductExpansion.vue | 140 +++ .../receive/TableProductExpantion.vue | 84 ++ src/pages/09_task-order/form.ts | 164 +++ .../09_task-order/order_view/MainPage.vue | 1088 +++++++++++++++++ .../receive_view/FailRemarkDialog.vue | 299 +++++ .../09_task-order/receive_view/MainPage.vue | 774 ++++++++++++ .../receive_view/ReceiveDialog.vue | 250 ++++ src/router/routes.ts | 21 + src/stores/customer/index.ts | 1 + src/stores/institution/index.ts | 22 +- src/stores/product-service/types.ts | 9 +- src/stores/quotations/types.ts | 4 + src/stores/request-list/index.ts | 7 +- src/stores/request-list/types.ts | 1 + src/stores/task-order/index.ts | 189 +++ src/stores/task-order/types.ts | 207 ++++ src/stores/utils/index.ts | 2 +- src/stores/workflow-template/types.ts | 2 +- src/utils/address.ts | 36 +- 56 files changed, 6981 insertions(+), 361 deletions(-) create mode 100644 src/components/SelectWorker.vue create mode 100644 src/components/shared/select/SelectInstitution.vue create mode 100644 src/pages/09_task-order/SelectReadyRequestWork.vue create mode 100644 src/pages/09_task-order/TableEmployee.vue create mode 100644 src/pages/09_task-order/TableTaskOrder.vue create mode 100644 src/pages/09_task-order/TaskStatusComponent.vue create mode 100644 src/pages/09_task-order/document_view/MainPage.vue create mode 100644 src/pages/09_task-order/document_view/ViewFooter.vue create mode 100644 src/pages/09_task-order/document_view/ViewHeader.vue create mode 100644 src/pages/09_task-order/expansion/AdditionalFileExpansion.vue create mode 100644 src/pages/09_task-order/expansion/DocumentExpansion.vue create mode 100644 src/pages/09_task-order/expansion/PaymentExpansion.vue create mode 100644 src/pages/09_task-order/expansion/ProductExpansion.vue create mode 100644 src/pages/09_task-order/expansion/RemarkExpansion.vue create mode 100644 src/pages/09_task-order/expansion/receive/InfoMessengerExpansion.vue create mode 100644 src/pages/09_task-order/expansion/receive/InfoProductExpansion.vue create mode 100644 src/pages/09_task-order/expansion/receive/TableProductExpantion.vue create mode 100644 src/pages/09_task-order/form.ts create mode 100644 src/pages/09_task-order/order_view/MainPage.vue create mode 100644 src/pages/09_task-order/receive_view/FailRemarkDialog.vue create mode 100644 src/pages/09_task-order/receive_view/MainPage.vue create mode 100644 src/pages/09_task-order/receive_view/ReceiveDialog.vue create mode 100644 src/stores/task-order/index.ts create mode 100644 src/stores/task-order/types.ts diff --git a/package.json b/package.json index fe9fc7e2..29fe5570 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,8 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-vue": "^9.27.0", "prettier": "^3.3.3", - "typescript": "^5.5.4" + "typescript": "^5.5.4", + "vue-component-type-helpers": "^2.1.10" }, "engines": { "node": "^24 || ^22 || ^20 || ^18", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b0e6897..20a9899a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -123,6 +123,9 @@ importers: typescript: specifier: ^5.5.4 version: 5.5.4 + vue-component-type-helpers: + specifier: ^2.1.10 + version: 2.1.10 packages: @@ -3516,6 +3519,9 @@ packages: vm-browserify@1.1.2: resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==} + vue-component-type-helpers@2.1.10: + resolution: {integrity: sha512-lfgdSLQKrUmADiSV6PbBvYgQ33KF3Ztv6gP85MfGaGaSGMTXORVaHT1EHfsqCgzRNBstPKYDmvAV9Do5CmJ07A==} + vue-demi@0.14.10: resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==} engines: {node: '>=12'} @@ -7445,6 +7451,8 @@ snapshots: vm-browserify@1.1.2: {} + vue-component-type-helpers@2.1.10: {} + vue-demi@0.14.10(vue@3.4.38(typescript@5.5.4)): dependencies: vue: 3.4.38(typescript@5.5.4) diff --git a/src/components/05_quotation/ProductItem.vue b/src/components/05_quotation/ProductItem.vue index 8b4407da..71f59f38 100644 --- a/src/components/05_quotation/ProductItem.vue +++ b/src/components/05_quotation/ProductItem.vue @@ -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( " > - {{ props.row.product.code }} + {{ props.row.product.code }} - + + + {{ props.row.product.name }} @@ -366,7 +375,6 @@ watch( /> - {{ formatNumberDecimal( props.row.pricePerUnit + diff --git a/src/components/05_quotation/QuotationCard.vue b/src/components/05_quotation/QuotationCard.vue index 387110d7..604afb7d 100644 --- a/src/components/05_quotation/QuotationCard.vue +++ b/src/components/05_quotation/QuotationCard.vue @@ -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')" />