diff --git a/src/locales/en.ts b/src/locales/en.ts
index 5f7cc3c8..be85d31b 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -487,6 +487,7 @@ export default {
inventoryUnit: 'Inventory Unit',
purchaseUnit: 'Purchase Unit',
purchaseUnitConvertQuantity: 'Purchase Convert Qty',
+ defaultSupplier: 'Supplier (Default)',
inputUnitType: 'Unit Input Type',
inputCount: 'Input Count',
count: 'Quantity',
@@ -549,10 +550,19 @@ export default {
}
},
Record: {
+ id: 'ID',
product: 'Product',
warehouse: 'Warehouse',
bizType: 'Type',
bizNo: 'Business No',
+ bizDirection: 'Direction',
+ categoryType: 'Business Type',
+ productId: 'Product ID',
+ warehouseId: 'Warehouse ID',
+ areaId: 'Area ID',
+ bizId: 'Business ID',
+ bizItemId: 'Business Item ID',
+ creator: 'Creator',
categoryProduct: 'Product',
categoryMaterial: 'Material',
categorySpare: 'Spare Part',
@@ -562,10 +572,11 @@ export default {
productName: 'Product Name',
categoryName: 'Product Category',
unitName: 'Unit',
- warehouseName: 'Warehouse Code',
+ warehouseName: 'Warehouse Name',
+ areaName: 'Area Name',
count: 'In/Out Quantity',
totalCount: 'Stock Quantity',
- recordTime: 'In/Out Date',
+ recordTime: 'Operation Time',
createTime: 'Create Date',
creatorName: 'Operator',
placeholderProduct: 'Please select product',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index a9a19f23..04d09cd1 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -487,6 +487,7 @@ export default {
inventoryUnit: '库存单位',
purchaseUnit: '采购单位',
purchaseUnitConvertQuantity: '采购换算数量',
+ defaultSupplier: '供应商(默认)',
inputUnitType: '单位输入方式',
inputCount: '录入数量',
count: '数量',
@@ -549,10 +550,19 @@ export default {
}
},
Record: {
+ id: '编号',
product: '产品',
warehouse: '仓库',
bizType: '类型',
bizNo: '业务单号',
+ bizDirection: '方向',
+ categoryType: '业务类型',
+ productId: '产品编号',
+ warehouseId: '仓库编号',
+ areaId: '库区编号',
+ bizId: '业务编号',
+ bizItemId: '业务项编号',
+ creator: '创建人',
categoryProduct: '产品',
categoryMaterial: '原料',
categorySpare: '备件',
@@ -562,10 +572,11 @@ export default {
productName: '产品名称',
categoryName: '产品分类',
unitName: '产品单位',
- warehouseName: '仓库编号',
+ warehouseName: '仓库名称',
+ areaName: '库区名称',
count: '出入库数量',
totalCount: '库存量',
- recordTime: '出入库日期',
+ recordTime: '操作时间',
createTime: '创建日期',
creatorName: '操作人',
placeholderProduct: '请选择产品',
diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue
index e939214f..3899508d 100644
--- a/src/views/erp/product/product/ProductForm.vue
+++ b/src/views/erp/product/product/ProductForm.vue
@@ -73,6 +73,18 @@
/>
+
+
+
+
+
+
+
@@ -165,18 +177,6 @@
-
-
-
-
-
-
-
diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index 661ef9c3..c9f7a26e 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -74,6 +74,13 @@
+
+
+
+
+
+
+
{{ t('ErpStock.Item.purchaseUnitConvertQuantity') }}
@@ -183,6 +190,11 @@
+
+
+ {{ getDefaultSupplierName(row) || '-' }}
+
+