@things-factory/sales-ui 4.0.10 → 4.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -461,6 +461,12 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
|
|
|
461
461
|
},
|
|
462
462
|
width: 350
|
|
463
463
|
},
|
|
464
|
+
{
|
|
465
|
+
type: 'string',
|
|
466
|
+
name: 'brand',
|
|
467
|
+
header: i18next.t('field.brand'),
|
|
468
|
+
width: 150
|
|
469
|
+
},
|
|
464
470
|
{
|
|
465
471
|
type: 'select',
|
|
466
472
|
name: 'packingType',
|
|
@@ -832,6 +838,7 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
|
|
|
832
838
|
product {
|
|
833
839
|
id
|
|
834
840
|
name
|
|
841
|
+
brand
|
|
835
842
|
description
|
|
836
843
|
}
|
|
837
844
|
adjustedBatchId
|
|
@@ -901,7 +908,7 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
|
|
|
901
908
|
|
|
902
909
|
this.productData = {
|
|
903
910
|
records: response.data.purchaseOrder.orderProducts.map(itm => {
|
|
904
|
-
return { ...itm, ...this._calcPrice(itm) }
|
|
911
|
+
return { ...itm, brand: itm.product.brand, ...this._calcPrice(itm) }
|
|
905
912
|
})
|
|
906
913
|
}
|
|
907
914
|
|
|
@@ -530,16 +530,23 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
|
|
|
530
530
|
{ name: 'id', hidden: true },
|
|
531
531
|
{ name: 'sku', header: i18next.t('field.sku') },
|
|
532
532
|
{ name: 'name', header: i18next.t('field.name') },
|
|
533
|
+
{ name: 'brand', header: i18next.t('field.brand') },
|
|
533
534
|
{ name: 'description', header: i18next.t('field.description') },
|
|
534
535
|
{ name: 'packingType', header: i18next.t('field.packing_type') },
|
|
535
536
|
{ name: 'primaryUnit', header: i18next.t('field.uom') },
|
|
536
537
|
{ name: 'primaryValue', header: i18next.t('field.uom_value') }
|
|
537
538
|
],
|
|
538
|
-
list: { fields: ['sku', 'name', 'description', 'packingType'] }
|
|
539
|
+
list: { fields: ['sku', 'name', 'brand', 'description', 'packingType'] }
|
|
539
540
|
}
|
|
540
541
|
},
|
|
541
542
|
width: 350
|
|
542
543
|
},
|
|
544
|
+
{
|
|
545
|
+
type: 'string',
|
|
546
|
+
name: 'brand',
|
|
547
|
+
header: i18next.t('field.brand'),
|
|
548
|
+
width: 150
|
|
549
|
+
},
|
|
543
550
|
{
|
|
544
551
|
type: 'select',
|
|
545
552
|
name: 'packingType',
|
|
@@ -722,6 +729,8 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
|
|
|
722
729
|
changeRecord.uom = primaryUnit ? changeRecord.product.primaryUnit : ''
|
|
723
730
|
let packingType = !!changeRecord.product?.packingType
|
|
724
731
|
changeRecord.packingType = packingType ? changeRecord.product.packingType : ''
|
|
732
|
+
let brand = !!changeRecord.product?.brand
|
|
733
|
+
changeRecord.brand = brand ? changeRecord.product.brand : ''
|
|
725
734
|
}
|
|
726
735
|
|
|
727
736
|
const priceAmtChangeColumn = ['packQty', 'unitPrice', 'miscAmt', 'discountAmt', 'taxRate']
|
|
@@ -1009,6 +1018,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1009
1018
|
product {
|
|
1010
1019
|
id
|
|
1011
1020
|
name
|
|
1021
|
+
brand
|
|
1012
1022
|
description
|
|
1013
1023
|
}
|
|
1014
1024
|
adjustedBatchId
|
|
@@ -1084,7 +1094,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1084
1094
|
|
|
1085
1095
|
this.productData = {
|
|
1086
1096
|
records: response.data.purchaseOrder.orderProducts.map(itm => {
|
|
1087
|
-
return { ...itm, ...this._calcPrice(itm) }
|
|
1097
|
+
return { ...itm, brand: itm.product.brand, ...this._calcPrice(itm) }
|
|
1088
1098
|
})
|
|
1089
1099
|
}
|
|
1090
1100
|
this.purchaseOrderExtraData = {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-ui",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.14",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,15 +24,15 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/code-base": "^4.0.
|
|
28
|
-
"@things-factory/form-ui": "^4.0.
|
|
29
|
-
"@things-factory/grist-ui": "^4.0.
|
|
30
|
-
"@things-factory/i18n-base": "^4.0.
|
|
31
|
-
"@things-factory/import-ui": "^4.0.
|
|
32
|
-
"@things-factory/sales-base": "^4.0.
|
|
33
|
-
"@things-factory/setting-ui": "^4.0.
|
|
34
|
-
"@things-factory/shell": "^4.0.
|
|
35
|
-
"@things-factory/warehouse-ui": "^4.0.
|
|
27
|
+
"@things-factory/code-base": "^4.0.14",
|
|
28
|
+
"@things-factory/form-ui": "^4.0.14",
|
|
29
|
+
"@things-factory/grist-ui": "^4.0.14",
|
|
30
|
+
"@things-factory/i18n-base": "^4.0.14",
|
|
31
|
+
"@things-factory/import-ui": "^4.0.14",
|
|
32
|
+
"@things-factory/sales-base": "^4.0.14",
|
|
33
|
+
"@things-factory/setting-ui": "^4.0.14",
|
|
34
|
+
"@things-factory/shell": "^4.0.14",
|
|
35
|
+
"@things-factory/warehouse-ui": "^4.0.14"
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "956c782b5b2a6ff4c4e18f4a1bdcf778814f1b52"
|
|
38
38
|
}
|