@things-factory/operato-wms 3.7.6 → 3.7.10

package/client/pages/order/goods-received-note/received-note-list.js

@@ -71,6 +71,7 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
 
   async pageInitialized() {
     const _grnStatus = await getCodeByName('GRN_STATUS')
+    const _ganStatus = await getCodeByName('GAN_REQUESTS_STATUS')
     const _partners = await this._fetchPartners()
 
     this._searchFields = [
@@ -98,20 +99,32 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
         props: { searchOper: 'eq' }
       },
       {
-        name: 'arrivalNoticeRefNo',
+        name: 'arrivalNoticeNo',
+        label: i18next.t('field.gan'),
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
         label: i18next.t('field.ref_no'),
+        name: 'refNo',
         type: 'text',
         props: { searchOper: 'i_like' }
       },
       {
-        name: 'arrivalNoticeNo',
-        label: i18next.t('field.gan'),
+        label: i18next.t('field.ref_no_2'),
+        name: 'refNo2',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.ref_no_3'),
+        name: 'refNo3',
         type: 'text',
         props: { searchOper: 'i_like' }
       },
       {
-        label: i18next.t('field.status'),
-        name: 'status',
+        label: i18next.t('field.grn_status'),
+        name: 'grnStatus',
         type: 'select',
         options: [
           { value: '' },
@@ -120,6 +133,46 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
           })
         ],
         props: { searchOper: 'eq' }
+      },
+      {
+        label: i18next.t('field.from'),
+        name: 'fromDate',
+        type: 'date',
+        props: {
+          searchOper: 'eq'
+        },
+        value: (() => {
+          let date = new Date()
+          date.setMonth(date.getMonth() - 6)
+          return date.toISOString().split('T')[0]
+        })(),
+        handlers: { change: this._modifyDateRange.bind(this) }
+      },
+      {
+        label: i18next.t('field.to'),
+        name: 'toDate',
+        type: 'date',
+        props: {
+          searchOper: 'eq',
+          min: (() => {
+            let date = new Date()
+            date.setMonth(date.getMonth() - 6)
+            return date.toISOString().split('T')[0]
+          })()
+        },
+        value: new Date().toISOString().split('T')[0]
+      },
+      {
+        label: i18next.t('field.gan_status'),
+        name: 'ganStatus',
+        type: 'select',
+        options: [
+          { value: '' },
+          ..._ganStatus.map(status => {
+            return { name: i18next.t(`label.${status.description}`), value: status.name }
+          })
+        ],
+        props: { searchOper: 'eq' }
       }
     ]
 
@@ -144,6 +197,7 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'name',
           header: i18next.t('field.grn'),
+          imex: { header: i18next.t('field.grn'), key: 'name', width: 25, type: 'string' },
           sortable: true,
           width: 180,
           handlers: {
@@ -158,6 +212,7 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          imex: { header: i18next.t('field.company'), key: 'bizplace.name', width: 25, type: 'string' },
           sortable: true,
           width: 230
         },
@@ -165,13 +220,31 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo',
           header: i18next.t('field.ref_no'),
+          imex: { header: i18next.t('field.ref_no'), key: 'refNo', width: 25, type: 'string' },
           sortable: true,
           width: 160
         },
+        {
+          type: 'string',
+          name: 'refNo2',
+          header: i18next.t('field.ref_no_2'),
+          imex: { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 25, type: 'string' },
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'refNo3',
+          header: i18next.t('field.ref_no_3'),
+          imex: { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 25, type: 'string' },
+          sortable: true,
+          width: 150
+        },
         {
           type: 'object',
           name: 'arrivalNotice',
           header: i18next.t('field.gan'),
+          imex: { header: i18next.t('field.arrivalNotice'), key: 'arrivalNotice.name', width: 25, type: 'string' },
           sortable: true,
           width: 180
         },
@@ -179,6 +252,7 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'ganStatus',
           header: i18next.t('field.gan_status'),
+          imex: { header: i18next.t('field.gan_status'), key: 'ganStatus', width: 25, type: 'string' },
           sortable: true,
           width: 180
         },
@@ -186,6 +260,7 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'status',
           header: i18next.t('field.grn_status'),
+          imex: { header: i18next.t('field.grn_status'), key: 'status', width: 25, type: 'string' },
           sortable: true,
           width: 180
         },
@@ -193,6 +268,7 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
+          imex: { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 25, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -200,6 +276,7 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
           type: 'object',
           name: 'updater',
           header: i18next.t('field.updater'),
+          imex: { header: i18next.t('field.updater'), key: 'updater.name', width: 25, type: 'string' },
           sortable: true,
           width: 160
         }
@@ -215,6 +292,28 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
     return this.shadowRoot.querySelector('data-grist')
   }
 
+  get _fromDateInput() {
+    return this.searchForm.shadowRoot.querySelector('input[name=fromDate]')
+  }
+
+  get _toDateInput() {
+    return this.searchForm.shadowRoot.querySelector('input[name=toDate]')
+  }
+
+  _modifyDateRange(e) {
+    const fromDate = e.currentTarget.value
+
+    if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
+
+    let min = new Date(fromDate)
+    let today = new Date()
+    today.setHours(0, 0, 0, 0)
+
+    min = min.toISOString().split('T')[0]
+
+    this._toDateInput.min = min
+  }
+
   async fetchHandler({ page, limit, sorters = [{ name: 'createdAt', desc: true }] }) {
     const response = await client.query({
       query: gql`
@@ -233,6 +332,8 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
                 description
                 status
                 refNo
+                refNo2
+                refNo3
               }
               status
               description
@@ -269,6 +370,8 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
             return {
               ...grn,
               refNo: grn.arrivalNotice.refNo || '',
+              refNo2: grn.arrivalNotice.refNo2 || '',
+              refNo3: grn.arrivalNotice.refNo3 || '',
               ganStatus: grn.arrivalNotice.status
             }
           }) || []
@@ -321,7 +424,36 @@ class ReceivedNoteList extends localize(i18next)(PageView) {
   }
 
   _exportableData() {
-    return this.dataGrist.exportRecords()
+    let records = []
+    if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+      records = this.dataGrist.selected
+    } else {
+      records = this.dataGrist.data.records
+    }
+
+    var headerSetting = this.dataGrist._config.columns
+      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .map(column => {
+        return column.imex
+      })
+
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this._columns
+          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .reduce((record, column) => {
+            record[column.imex.key] = column.imex.key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            if (column.type === 'datetime') {
+              record[column.imex.key] = new Date(parseInt(record[column.imex.key])).toLocaleString()
+            }
+            return record
+          }, {})
+      }
+    })
+    return { header: headerSetting, data: data }
   }
 }
 

package/client/pages/order/release-order/b2b/b2b-order-list.js

@@ -354,7 +354,7 @@ class B2bOrderList extends localize(i18next)(PageView) {
     return this.config.columns
   }
 
-  async fetchHandler({ page, limit, sorters = [{ name: 'createdAt', desc: true }] }) {
+  async fetchHandler({ page, limit, sorters = [] }) {
     const response = await client.query({
       query: gql`
         query releaseGoodRequests($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {

package/client/pages/order/release-order/b2b/b2b-order-requests.js

@@ -349,7 +349,7 @@ class B2bOrderRequests extends localize(i18next)(PageView) {
     return this.shadowRoot.querySelector('data-grist')
   }
 
-  async fetchHandler({ page, limit, sorters = [{ name: 'updatedAt', desc: true }] }) {
+  async fetchHandler({ page, limit, sorters = [] }) {
     const response = await client.query({
       query: gql`
         query releaseGoodRequests($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {

package/client/pages/order/release-order/b2c/b2c-order-requests.js

@@ -113,18 +113,6 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
         ],
         props: { searchOper: 'eq' }
       },
-      {
-        label: i18next.t('field.release_date'),
-        name: 'releaseDate',
-        type: 'date',
-        props: { searchOper: 'i_like' }
-      },
-      {
-        label: i18next.t('field.ref_no'),
-        name: 'refNo',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
       {
         label: i18next.t('field.status'),
         name: 'status',
@@ -136,6 +124,52 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           })
         ],
         props: { searchOper: 'eq' }
+      },
+      {
+        label: i18next.t('field.ref_no'),
+        name: 'refNo',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.ref_no_2'),
+        name: 'refNo2',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.ref_no_3'),
+        name: 'refNo3',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.from'),
+        name: 'fromDate',
+        type: 'date',
+        props: {
+          searchOper: 'eq'
+        },
+        value: (() => {
+          let date = new Date()
+          date.setMonth(date.getMonth() - 6)
+          return date.toISOString().split('T')[0]
+        })(),
+        handlers: { change: this._modifyDateRange.bind(this) }
+      },
+      {
+        label: i18next.t('field.to'),
+        name: 'toDate',
+        type: 'date',
+        props: {
+          searchOper: 'eq',
+          min: (() => {
+            let date = new Date()
+            date.setMonth(date.getMonth() - 6)
+            return date.toISOString().split('T')[0]
+          })()
+        },
+        value: new Date().toISOString().split('T')[0]
       }
     ]
 
@@ -168,6 +202,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           type: 'string',
           name: 'name',
           header: i18next.t('field.ro'),
+          imex: { header: i18next.t('field.ro'), key: 'name', width: 25, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -175,6 +210,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          imex: { header: i18next.t('field.company'), key: 'bizplace.name', width: 25, type: 'string' },
           sortable: true,
           width: 200
         },
@@ -182,6 +218,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo',
           header: i18next.t('field.ref_no'),
+          imex: { header: i18next.t('field.ref_no'), key: 'refNo', width: 25, type: 'string' },
           sortable: true,
           width: 160
         },
@@ -189,6 +226,15 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo2',
           header: i18next.t('field.ref_no_2'),
+          imex: { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 25, type: 'string' },
+          sortable: true,
+          width: 160
+        },
+        {
+          type: 'string',
+          name: 'refNo3',
+          header: i18next.t('field.ref_no_3'),
+          imex: { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 25, type: 'string' },
           sortable: true,
           width: 160
         },
@@ -210,6 +256,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           type: 'date',
           name: 'releaseDate',
           header: i18next.t('field.release_date'),
+          imex: { header: i18next.t('field.release_date'), key: 'releaseDate', width: 25, type: 'string' },
           sortable: true,
           width: 120
         },
@@ -223,7 +270,8 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
         {
           type: 'string',
           name: 'status',
-          header: i18next.t('field.warehouse_status'),
+          header: i18next.t('field.status'),
+          imex: { header: i18next.t('field.grn_status'), key: 'status', width: 25, type: 'string' },
           sortable: true,
           width: 120
         },
@@ -231,6 +279,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
+          imex: { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 25, type: 'datetime' },
           sortable: true,
           width: 160
         },
@@ -238,6 +287,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
           type: 'object',
           name: 'acceptedBy',
           header: i18next.t('field.accepted_by'),
+          imex: { header: i18next.t('field.accepted_by'), key: 'acceptedBy.name', width: 25, type: 'string' },
           sortable: true,
           width: 200
         }
@@ -253,7 +303,7 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
     return this.shadowRoot.querySelector('data-grist')
   }
 
-  async fetchHandler({ page, limit, sorters = [{ name: 'updatedAt', desc: true }] }) {
+  async fetchHandler({ page, limit, sorters = [] }) {
     const response = await client.query({
       query: gql`
         query releaseGoodRequests($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
@@ -451,6 +501,53 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
       this._showToast(e)
     }
   }
+
+  _modifyDateRange(e) {
+    const fromDate = e.currentTarget.value
+
+    if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
+
+    let min = new Date(fromDate)
+    let today = new Date()
+    today.setHours(0, 0, 0, 0)
+
+    min = min.toISOString().split('T')[0]
+
+    this._toDateInput.min = min
+  }
+
+  _exportableData() {
+    let records = []
+    if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+      records = this.dataGrist.selected
+    } else {
+      records = this.dataGrist.data.records
+    }
+
+    var headerSetting = this.dataGrist._config.columns
+      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .map(column => {
+        return column.imex
+      })
+
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this._columns
+          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .reduce((record, column) => {
+            record[column.imex.key] = column.imex.key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            if (column.type === 'datetime') {
+              record[column.imex.key] = new Date(parseInt(record[column.imex.key])).toLocaleString()
+            }
+            return record
+          }, {})
+      }
+    })
+    return { header: headerSetting, data: data }
+  }
 }
 
 window.customElements.define('b2c-order-requests', B2cOrderRequests)