@things-factory/operato-wms 5.0.13 → 6.0.0-alpha.1

package/client/pages/order/arrival-notice/arrival-notice-detail.js

@@ -11,6 +11,7 @@ import './view-product-changes-popup'
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
 
+import { getCodeByName } from '@things-factory/code-base'
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { getRenderer } from '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
@@ -43,6 +44,9 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       _crossDocking: Boolean,
       _releaseGood: Object,
       _importCargo: Boolean,
+      _warehouseTransport: Boolean,
+      _enableTransportationServiceSetting: Boolean,
+      _importedOrder: Boolean,
       _hasContainer: Boolean,
       _looseItem: Boolean,
       _status: String,
@@ -53,13 +57,16 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       _vasExpanded: Boolean,
       _enableCartonLabel: Boolean,
       _strictProductSelection: Boolean,
+      _ganProcessingSetting: String,
+      containerSizes: Array,
       isUserBelongsDomain: Boolean,
       data: Object,
       productGristConfig: Object,
       vasGristConfig: Object,
       productData: Object,
       vasData: Object,
-      arrivalNoticeId: String
+      arrivalNoticeId: String,
+      _disableTransport: Boolean
     }
   }
 
@@ -184,6 +191,12 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     ]
 
     if (this._status === ORDER_STATUS.PENDING.value) {
+      actions.push({
+        title: i18next.t('button.update_order_details'),
+        action: this._updateArrivalNotice.bind(this),
+        ...CommonButtonStyles.add
+      })
+
       actions.push({
         title: i18next.t('button.delete'),
         action: this._deleteArrivalNotice.bind(this),
@@ -206,11 +219,18 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
 
     if (this.isUserBelongsDomain) {
       if (this._status === ORDER_STATUS.PROCESSING.value || this._status === ORDER_STATUS.READY_TO_UNLOAD.value) {
-        actions.push({
-          title: i18next.t('button.edit_product'),
-          action: this.openEditProductPopup.bind(this),
-          ...CommonButtonStyles.add
-        })
+        actions.push(
+          {
+            title: i18next.t('button.update_order_details'),
+            action: this._updateArrivalNotice.bind(this),
+            ...CommonButtonStyles.add
+          },
+          {
+            title: i18next.t('button.edit_product'),
+            action: this.openEditProductPopup.bind(this),
+            ...CommonButtonStyles.add
+          }
+        )
 
         if (this._enableCartonLabel) {
           actions.push({
@@ -228,6 +248,11 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       } else if (this._status === ORDER_STATUS.PENDING_RECEIVE.value) {
         titleName = i18next.t('title.receive_arrival_notice')
         actions.push(
+          {
+            title: i18next.t('button.update_order_details'),
+            action: this._updateArrivalNotice.bind(this),
+            ...CommonButtonStyles.add
+          },
           {
             title: i18next.t('button.reject'),
             action: this._rejectArrivalNotice.bind(this),
@@ -241,18 +266,32 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
         )
       } else if (this._status === ORDER_STATUS.INTRANSIT.value) {
         titleName = i18next.t('title.check_arrived_notice')
-        actions.push({
-          title: i18next.t('button.arrived'),
-          action: this._checkArrivedNotice.bind(this),
-          ...CommonButtonStyles.arrived
-        })
+        actions.push(
+          {
+            title: i18next.t('button.update_order_details'),
+            action: this._updateArrivalNotice.bind(this),
+            ...CommonButtonStyles.add
+          },
+          {
+            title: i18next.t('button.arrived'),
+            action: this._checkArrivedNotice.bind(this),
+            ...CommonButtonStyles.arrived
+          }
+        )
       } else if (this._status === ORDER_STATUS.ARRIVED.value) {
         titleName = i18next.t('title.assign_warehouse')
-        actions.push({
-          title: i18next.t('button.assign_warehouse'),
-          action: this._assignBufferLocation.bind(this),
-          ...CommonButtonStyles.warehouse
-        })
+        actions.push(
+          {
+            title: i18next.t('button.update_order_details'),
+            action: this._updateArrivalNotice.bind(this),
+            ...CommonButtonStyles.add
+          },
+          {
+            title: i18next.t('button.assign_warehouse'),
+            action: this._assignBufferLocation.bind(this),
+            ...CommonButtonStyles.warehouse
+          }
+        )
         this._showAssignWarehouse = true
       } else if (
         this._status === ORDER_STATUS.PENDING_APPROVAL.value &&
@@ -261,10 +300,23 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
             product.status === ORDER_PRODUCT_STATUS.ADDED.value || product.status === ORDER_PRODUCT_STATUS.EDITED.value
         )
       ) {
+        actions.push(
+          {
+            title: i18next.t('button.update_order_details'),
+            action: this._updateArrivalNotice.bind(this),
+            ...CommonButtonStyles.add
+          },
+          {
+            title: i18next.t('button.product_changes'),
+            action: this.openProductChangesPopup.bind(this),
+            ...CommonButtonStyles.inspect
+          }
+        )
+      } else if (this._status === ORDER_STATUS.PUTTING_AWAY.value) {
         actions.push({
-          title: i18next.t('button.product_changes'),
-          action: this.openProductChangesPopup.bind(this),
-          ...CommonButtonStyles.inspect
+          title: i18next.t('button.update_order_details'),
+          action: this._updateArrivalNotice.bind(this),
+          ...CommonButtonStyles.add
         })
       }
     } else {
@@ -275,11 +327,18 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
             product.status === ORDER_PRODUCT_STATUS.ADDED.value || product.status === ORDER_PRODUCT_STATUS.EDITED.value
         )
       ) {
-        actions.push({
-          title: i18next.t('button.inspect_changes'),
-          action: this.openApproveProductPopup.bind(this),
-          ...CommonButtonStyles.approve
-        })
+        actions.push(
+          {
+            title: i18next.t('button.update_order_details'),
+            action: this._updateArrivalNotice.bind(this),
+            ...CommonButtonStyles.add
+          },
+          {
+            title: i18next.t('button.inspect_changes'),
+            action: this.openApproveProductPopup.bind(this),
+            ...CommonButtonStyles.approve
+          }
+        )
       }
 
       if (this._status !== ORDER_STATUS.PENDING.value && this._status !== ORDER_STATUS.PENDING_APPROVAL.value) {
@@ -316,27 +375,69 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
                 type="checkbox"
                 name="ownTransport"
                 ?checked="${this._ownTransport}"
-                @change="${e => (this._ownTransport = e.currentTarget.checked)}"
-                disabled
+                @change="${e => {
+                  this._ownTransport = e.currentTarget.checked
+                  if (this._ownTransport) {
+                    this._warehouseTransportInput.checked = false
+                    this._warehouseTransport = false
+                  } else {
+                    this._warehouseTransportInput.checked = true
+                    this._warehouseTransport = true
+                  }
+                  this._validateTransport()
+                }}"
+                ?disabled=${this.determineStatus() || this._disableTransport}
               />
-              <label>${i18next.t('label.own_transport')}</label>
+              <label for="ownTransport">${i18next.t('label.own_transport')}</label>
 
               <input
                 id="warehouseTransport"
                 type="checkbox"
                 name="warehouseTransport"
                 ?checked="${!this._ownTransport}"
-                disabled
+                ?disabled=${this.determineStatus() || this._disableTransport}
+                @change="${e => {
+                  this._warehouseTransport = e.currentTarget.checked
+                  if (this._warehouseTransport) {
+                    this._ownTransportInput.checked = false
+                    this._ownTransport = false
+                  } else {
+                    this._ownTransportInput.checked = true
+                    this._ownTransport = true
+                  }
+                  this._validateTransport()
+                }}"
               />
-              <label>${i18next.t('label.warehouse_transport')}</label>
+              <label for="warehouseTransport">${i18next.t('label.warehouse_transport')}</label>
 
-              <input id="container" type="checkbox" name="container" ?checked="${this._hasContainer}" disabled />
+              <input
+                id="container"
+                type="checkbox"
+                name="container"
+                ?checked="${this._hasContainer}"
+                @change="${e => {
+                  this._hasContainer = e.currentTarget.checked
+                }}"
+                ?disabled=${this.determineStatus()}
+              />
               <label for="container">${i18next.t('label.container')}</label>
 
-              <input id="looseItem" type="checkbox" name="looseItem" ?checked="${this._looseItem}" disabled />
+              <input
+                id="looseItem"
+                type="checkbox"
+                name="looseItem"
+                ?checked="${this._looseItem}"
+                ?disabled=${this.determineStatus()}
+              />
               <label for="looseItem">${i18next.t('label.loose_item')}</label>
 
-              <input id="importedOrder" type="checkbox" name="importCargo" ?checked="${this._importedOrder}" disabled />
+              <input
+                id="importedOrder"
+                type="checkbox"
+                name="importCargo"
+                ?checked="${this._importedOrder}"
+                ?disabled=${this.determineStatus()}
+              />
               <label for="importedOrder">${i18next.t('label.import_cargo')}</label>
 
               ${this._crossDocking
@@ -357,28 +458,47 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
             <input name="bizplaceName" value="${this._bizplaceName}" readonly />
 
             <label>${i18next.t('label.ref_no')}${`1`}</label>
-            <input name="refNo" readonly />
+            <input name="refNo" ?readonly=${this.determineStatus()} />
 
             <label>${i18next.t('label.ref_no')}${`2`}</label>
-            <input name="refNo2" readonly />
+            <input name="refNo2" ?readonly=${this.determineStatus()} />
 
             <label>${i18next.t('label.ref_no')}${`3`}</label>
-            <input name="refNo3" readonly />
+            <input name="refNo3" ?readonly=${this.determineStatus()} />
 
             <label>${i18next.t('label.eta_date')}</label>
-            <input name="etaDate" type="date" readonly />
+            <input name="etaDate" type="date" disabled />
 
             <label ?hidden="${!this._ownTransport}">${i18next.t('label.do_no')}</label>
-            <input name="deliveryOrderNo" ?hidden="${!this._ownTransport}" readonly />
+            <input name="deliveryOrderNo" ?hidden="${!this._ownTransport}" ?readonly=${this.determineStatus()} />
 
             <label ?hidden="${this._importedOrder || !this._ownTransport}">${i18next.t('label.truck_no')}</label>
-            <input ?hidden="${this._importedOrder || !this._ownTransport}" name="truckNo" readonly />
+            <input
+              ?hidden="${this._importedOrder || !this._ownTransport}"
+              name="truckNo"
+              ?readonly=${this.determineStatus()}
+            />
 
             <label ?hidden="${!this._hasContainer}">${i18next.t('label.container_no')}</label>
-            <input ?hidden="${!this._hasContainer}" type="text" name="containerNo" readonly />
+            <input
+              ?hidden="${!this._hasContainer}"
+              type="text"
+              name="containerNo"
+              ?readonly=${this.determineStatus()}
+            />
 
-            <label>${i18next.t('label.container_size')}</label>
-            <input type="text" name="containerSize" readonly />
+            <label ?hidden="${!this._hasContainer}">${i18next.t('label.container_size')}</label>
+            <select name="containerSize" ?hidden="${!this._hasContainer}" ?disabled=${this.determineStatus()}>
+              <option value="">--${i18next.t('label.please_select_a_container_size')}--</option>
+              ${(this.containerSizes || []).map(
+                containerSize =>
+                  html`
+                    <option value="${containerSize && containerSize.name}">
+                      ${containerSize && containerSize.name}
+                    </option>
+                  `
+              )}
+            </select>
 
             <label>${i18next.t('label.status')}</label>
             <select name="status" disabled>
@@ -458,12 +578,16 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
   constructor() {
     super()
     this.productData = { records: [] }
+    this.containerSizes = []
     this._downloadable = true
     this._attachments = []
     this.vasData = { records: [] }
     this._showAssignWarehouse = false
     this._vasExpanded = false
     this._strictProductSelection = false
+    this._disableTransport = false
+    this._importedOrder = false
+    this._enableTransportationServiceSetting = false
   }
 
   get arrivalNoticeForm() {
@@ -474,6 +598,14 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     return this.shadowRoot.querySelector('data-grist#product-grist')
   }
 
+  get _warehouseTransportInput() {
+    return this.shadowRoot.querySelector('input[name=warehouseTransport]')
+  }
+
+  get _ownTransportInput() {
+    return this.shadowRoot.querySelector('input[name=ownTransport]')
+  }
+
   get vasGrist() {
     return this.shadowRoot.querySelector('data-grist#vas-grist')
   }
@@ -483,6 +615,8 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
   }
 
   async pageInitialized() {
+    this.containerSizes = await getCodeByName('CONTAINER_SIZES')
+    this._enableTransportationServiceSetting = await fetchSettingRule('enable-transportation-service')
     this.isUserBelongsDomain = await this._checkUserBelongsDomain()
     this.vasGristConfig = {
       list: { fields: ['set', 'targetType', 'target', 'packingType', 'qty', 'vas', 'status', 'remark'] },
@@ -758,6 +892,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
                 id
               }
             }
+            container
             containerNo
             containerSize
             ownTransport
@@ -860,7 +995,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
 
       this.arrivalNoticeId = arrivalNotice.id
       this.orderBizplace = arrivalNotice.bizplace
-      this._hasContainer = arrivalNotice.containerNo ? true : false
+      this._hasContainer = arrivalNotice.container
       this._looseItem = arrivalNotice.looseItem
       this._ownTransport = arrivalNotice.ownTransport
       this._crossDocking = arrivalNotice.crossDocking
@@ -898,6 +1033,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       this._enableCartonLabel = await fetchSettingRule('enable-carton-label', partnerDomainId)
       this._strictProductSelection = await fetchSettingRule('strict-product-selection', partnerDomainId)
       let a = this._strictProductSelection
+      this._ganProcessingSetting = (await fetchSettingRule('gan-order-processing', partnerDomainId)) || '-1'
       this.updateContext()
     }
   }
@@ -943,6 +1079,61 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     }
   }
 
+  async _updateArrivalNotice() {
+    const arrivalNoticeInfo = this._getFormInfo()
+
+    arrivalNoticeInfo.name = this._ganNo
+    delete arrivalNoticeInfo.bizplaceName
+
+    if (!arrivalNoticeInfo.container) {
+      arrivalNoticeInfo.containerNo = ''
+      arrivalNoticeInfo.containerSize = ''
+    } else if (arrivalNoticeInfo.warehouseTransport) {
+      arrivalNoticeInfo.deliveryOrderNo = ''
+      arrivalNoticeInfo.truckNo = ''
+    }
+
+    delete arrivalNoticeInfo.warehouseTransport
+    delete arrivalNoticeInfo['buffer-location']
+
+    if (this._warehouseTransport) {
+      arrivalNoticeInfo.truckNo = ''
+      arrivalNoticeInfo.deliveryOrderNo = ''
+    }
+
+    const result = await CustomAlert({
+      title: i18next.t('title.are_you_sure'),
+      text: i18next.t('text.update_arrival_notice_details'),
+      confirmButton: { text: i18next.t('button.submit') },
+      cancelButton: { text: i18next.t('button.cancel') }
+    })
+
+    if (!result.value) return
+
+    try {
+      const response = await client.mutate({
+        mutation: gql`
+          mutation updateArrivalNoticeDetails($arrivalNotice: ArrivalNoticePatch!) {
+            updateArrivalNoticeDetails(arrivalNotice: $arrivalNotice) {
+              id
+            }
+          }
+        `,
+        variables: {
+          arrivalNotice: {
+            ...arrivalNoticeInfo
+          }
+        }
+      })
+      if (!response.errors) {
+        this._showToast({ message: i18next.t('text.arrival_notice_details_updated') })
+        await this._fetchGAN()
+      }
+    } catch (error) {
+      this._showToast(error)
+    }
+  }
+
   async _deleteArrivalNotice() {
     try {
       let result = await CustomAlert({
@@ -1093,8 +1284,14 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       })
 
       if (!response.errors) {
-        navigate(`arrival_notices`)
-        this._showToast({ message: i18next.t('text.arrival_notice_received') })
+        if (this._ganProcessingSetting == '2') {
+          this.pageReset()
+          this._showToast({ message: i18next.t('text.arrival_notice_received') })
+          this._openBufferSelector()
+        } else {
+          navigate(`arrival_notices`)
+          this._showToast({ message: i18next.t('text.arrival_notice_received') })
+        }
       }
     } catch (e) {
       this._showToast(e)
@@ -1160,8 +1357,8 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
 
       const response = await client.mutate({
         mutation: gql`
-          mutation generateArrivalNoticeWorksheet($arrivalNoticeNo: String!, $bufferLocation: ObjectRef!) {
-            generateArrivalNoticeWorksheet(arrivalNoticeNo: $arrivalNoticeNo, bufferLocation: $bufferLocation) {
+          mutation generateArrivalNoticeWorksheet($arrivalNoticeNo: [String!], $bufferLocation: ObjectRef!) {
+            generateArrivalNoticeWorksheet(arrivalNoticeNos: $arrivalNoticeNo, bufferLocation: $bufferLocation) {
               unloadingWorksheet {
                 name
               }
@@ -1169,7 +1366,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           }
         `,
         variables: {
-          arrivalNoticeNo: this._ganNo,
+          arrivalNoticeNo: [this._ganNo],
           bufferLocation: { id: this.bufferLocationField.getAttribute('location-id') }
         }
       })
@@ -1188,6 +1385,25 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       throw new Error(i18next.t('text.warehouse_is_not_assigned'))
   }
 
+  _validateTransport() {
+    //Check if warehouse provide transport
+    if (!this._importedOrder) {
+      if (!this._enableTransportationServiceSetting) {
+        this._disableTransport = true
+        this._ownTransportInput.checked = true
+        this._ownTransport = true
+      }
+    }
+
+    if (this._ownTransport || this._warehouseTransport) {
+      this._checkTransport = true
+      this._checkTransportCrossDocking = true
+      if (this._hideCrossDockingSetting) {
+        this._checkTransportCrossDocking = false
+      }
+    }
+  }
+
   async _confirmArrivalNotice() {
     let result = await CustomAlert({
       title: i18next.t('title.are_you_sure'),
@@ -1222,8 +1438,14 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
       })
 
       if (!response.errors) {
-        this._showToast({ message: i18next.t('text.gan_confirmed') })
-        navigate('arrival_notices')
+        if (this._ganProcessingSetting == '1') {
+          this._showToast({ message: i18next.t('text.gan_confirmed') })
+          this.pageReset()
+          this._openBufferSelector()
+        } else {
+          this._showToast({ message: i18next.t('text.gan_confirmed') })
+          navigate('arrival_notices')
+        }
       }
     } catch (e) {
       this._showToast(e)
@@ -1234,11 +1456,15 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     openPopup(
       html`
         <buffer-location-selector
-          @selected="${e => {
+          @selected="${async e => {
             this.bufferLocationField.value = `${e.detail.name} ${
               e.detail.description ? `(${e.detail.description})` : ''
             }`
             this.bufferLocationField.setAttribute('location-id', e.detail.id)
+
+            if (this._ganProcessingSetting == '1' || this._ganProcessingSetting == '2') {
+              await this._assignBufferLocation()
+            }
           }}"
         ></buffer-location-selector>
       `,
@@ -1295,6 +1521,16 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     }
   }
 
+  determineStatus() {
+    let status = false
+
+    if (ORDER_STATUS.DONE.value == this._status || ORDER_STATUS.REJECTED.value == this._status) {
+      status = true
+    }
+
+    return status
+  }
+
   async _openLotLabelPrintPopup() {
     await this._fetchWorksheet()
     let a = this.data
@@ -1308,7 +1544,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
           palletQty: record.palletQty,
           printQty: record.palletQty,
           packingType: record.packingType,
-          bizplace: this._bizplace
+          bizplace: this._bizplaceName
         }
       })
     }
@@ -1320,7 +1556,7 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
   }
 
   _openCartonLabelPrintPopup() {
-    openPopup(html` <carton-label-popup .bizplaceName="${this._bizplace}"></carton-label-popup> `, {
+    openPopup(html` <carton-label-popup .bizplaceName="${this._bizplaceName}"></carton-label-popup> `, {
       backdrop: true,
       size: 'small',
       title: i18next.t('title.carton_label')
@@ -1371,6 +1607,23 @@ class ArrivalNoticeDetail extends localize(i18next)(PageView) {
     )
   }
 
+  _getFormInfo() {
+    const formData = this._serializeForm(this.arrivalNoticeForm)
+    delete formData.importedOrder
+    return formData
+  }
+
+  _serializeForm(form) {
+    let obj = {}
+    Array.from(form.querySelectorAll('input, select')).forEach(field => {
+      if (!field.hasAttribute('hidden')) {
+        obj[field.name] = field.type === 'checkbox' ? field.checked : field.value
+      }
+    })
+
+    return obj
+  }
+
   openProductChangesPopup() {
     openPopup(html` <view-product-changes-popup .data="${this.productData}"></view-product-changes-popup> `, {
       backdrop: true,

package/client/pages/order/arrival-notice/arrival-notice-list.js

@@ -217,8 +217,10 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           'status',
           'createdAt',
           'updatedAt',
+          'acceptedAt',
           'acceptedBy',
-          'creator'
+          'creator',
+          'updater'
         ]
       },
       rows: { appendable: false, selectable: { multiple: true } },
@@ -342,6 +344,14 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           sortable: true,
           width: 160
         },
+        {
+          type: 'datetime',
+          name: 'acceptedAt',
+          header: i18next.t('field.accepted_at'),
+          label: true,
+          sortable: true,
+          width: 160
+        },
         {
           type: 'datetime',
           name: 'updatedAt',
@@ -365,6 +375,14 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
           label: true,
           sortable: true,
           width: 200
+        },
+        {
+          type: 'object',
+          name: 'updater',
+          header: i18next.t('field.updated_by'),
+          label: true,
+          sortable: true,
+          width: 200
         }
       ]
     }
@@ -404,6 +422,7 @@ class ArrivalNoticeList extends localize(i18next)(PageView) {
               importCargo
               createdAt
               updatedAt
+              acceptedAt
               updater {
                 id
                 name

package/client/pages/order/arrival-notice/create-arrival-notice.js

@@ -637,7 +637,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               display: '',
               value: ''
             },
-            ...this.packingTypes.map(type => {
+            ...(this.packingTypes || []).map(type => {
               return { display: type.name, value: type.name }
             })
           ]
@@ -662,7 +662,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               display: '',
               value: ''
             },
-            ...this.uomValueUnits.map(unit => {
+            ...(this.uomValueUnits || []).map(unit => {
               return { display: unit.name, value: unit.name }
             })
           ]