diff --git a/src/common/languages/locales/en-US.ts b/src/common/languages/locales/en-US.ts
index d36d3d7..ad79339 100644
--- a/src/common/languages/locales/en-US.ts
+++ b/src/common/languages/locales/en-US.ts
@@ -58,6 +58,12 @@ export default {
sysrecord: "Record",
sysrole: "Role",
},
+ _enum: {
+ outStockType: {
+ material: "Material",
+ finishedProduct: "Finished Product",
+ },
+ },
_prop: {
common: {
tel: "Tel",
@@ -240,6 +246,15 @@ export default {
formName: "Form Name",
formMark: "Mark",
storeName: "Store",
+ storeId: "Store",
+ storeNo: "Store No",
+ formStatus: "Status",
+ outStockType: "Out Stock Type",
+ partNumber: "Part Number",
+ productSpecs: "Product Specs",
+ productCount: "Count",
+ productMark: "Remark",
+ createDate: "Create Date",
},
},
sale: {
@@ -508,6 +523,28 @@ export default {
delete_message: "Delete Order",
},
finishedproductshipment: {
+ select_storeId: "Please select store",
+ select_outStockType: "Please select out stock type",
+ input_formName: "Please enter form name",
+ input_formMark: "Please enter form mark",
+ input_formCode: "Please enter form code",
+ input_partNumber: "Please enter part number",
+ input_productCount: "Please enter count",
+ input_productMark: "Please enter remark",
+ approve_confirm: "Confirm to approve?",
+ approve_success: "Approve success",
+ approve_fail: "Approve failed",
+ reject_confirm: "Confirm to reject?",
+ reject_success: "Reject success",
+ reject_fail: "Reject failed",
+ already_approved: "Already approved",
+ not_approved: "Not approved",
+ no_shipment_items: "No shipment items",
+ duplicate_part_number_in_request: "Duplicate part number in request",
+ part_number_not_found: "Part number not found",
+ insufficient_stock: "Insufficient stock",
+ import_success: "Import success",
+ import_fail: "Import failed",
delete_message: "Delete Shipment",
},
},
@@ -602,6 +639,9 @@ export default {
finishedproductshipment: {
add: "Add Shipment",
edit: "Edit Shipment",
+ showItem: "Shipment Details",
+ baseTitle: "Shipment Basic Info",
+ tableTitle: "Shipment Details",
},
},
purchase: {
diff --git a/src/common/languages/locales/zh-CN.ts b/src/common/languages/locales/zh-CN.ts
index 7f25b41..4f1325c 100644
--- a/src/common/languages/locales/zh-CN.ts
+++ b/src/common/languages/locales/zh-CN.ts
@@ -58,6 +58,12 @@ export default {
sysrecord: "日志列表",
sysrole: "角色管理",
},
+ _enum: {
+ outStockType: {
+ material: "物料",
+ finishedProduct: "成品",
+ },
+ },
_prop: {
common: {
tel: "电话",
@@ -197,6 +203,21 @@ export default {
storeName: "仓库",
returnQty: "退料数量",
},
+ finishedproductshipment: {
+ formCode: "单据编号",
+ formName: "单据名称",
+ formMark: "单据备注",
+ storeName: "仓库",
+ storeId: "仓库",
+ storeNo: "仓库编号",
+ formStatus: "单据状态",
+ outStockType: "出库类型",
+ partNumber: "物料编号",
+ productSpecs: "物料型号",
+ productCount: "数量",
+ productMark: "备注",
+ createDate: "创建时间",
+ },
finishedproductreceipt: {
totalValue: "入库数量",
formCode: "单据编号",
@@ -279,17 +300,13 @@ export default {
formMark: "单据备注",
storeName: "仓库",
storeId: "仓库",
+ storeNo: "仓库编号",
formStatus: "单据状态",
- productType: "型号",
- productSn: "SN号",
- mac: "MAC地址",
- serialNum: "序列号",
- softVersion: "软件版本",
- alVersion: "算法版本",
- alNum: "算法标志",
- alTxt: "激活状态",
- manufacturingDate: "时间",
- mark: "备注",
+ outStockType: "出库类型",
+ partNumber: "物料编号",
+ productSpecs: "物料型号",
+ productCount: "数量",
+ productMark: "备注",
createDate: "创建时间",
},
},
@@ -636,19 +653,13 @@ export default {
},
finishedproductshipment: {
select_storeId: "请选择仓库",
+ select_outStockType: "请选择出库类型",
input_formName: "请输入单据名称",
input_formMark: "请输入单据备注",
input_formCode: "请输入单据编号",
- input_productType: "请输入型号",
- input_productSn: "请输入SN号",
- input_mac: "请输入MAC地址",
- input_serialNum: "请输入序列号",
- input_softVersion: "请输入软件版本",
- input_alVersion: "请输入算法版本",
- input_alNum: "请输入算法标志",
- input_alTxt: "请输入激活状态",
- input_manufacturingDate: "请输入时间",
- input_mark: "请输入备注",
+ input_partNumber: "请输入物料编号",
+ input_productCount: "请输入数量",
+ input_productMark: "请输入备注",
approve_confirm: "是否审核通过",
approve_success: "审核成功",
approve_fail: "审核失败",
@@ -657,10 +668,10 @@ export default {
reject_fail: "反审失败",
already_approved: "成品出库单已经审核",
not_approved: "成品出库单不是已审核状态,不能反审",
- no_module_sn_items: "成品出库单没有明细",
- duplicate_sn_in_request: "导入数据中存在重复SN号",
- sn_not_found: "系统中不存在的SN号:",
- sn_already_shipped: "已经出货的SN号:",
+ no_shipment_items: "成品出库单没有明细",
+ duplicate_part_number_in_request: "导入数据中存在重复物料编号",
+ part_number_not_found: "系统中不存在的物料编号",
+ insufficient_stock: "库存不足",
import_success: "导入成功",
import_fail: "导入失败",
delete_message: "删除成品出货单",
diff --git a/src/views/production/finished-product-shipment/FinishedProductShipmentView.vue b/src/views/production/finished-product-shipment/FinishedProductShipmentView.vue
index df973da..62f0016 100644
--- a/src/views/production/finished-product-shipment/FinishedProductShipmentView.vue
+++ b/src/views/production/finished-product-shipment/FinishedProductShipmentView.vue
@@ -1,18 +1,20 @@
-
+
-
+
+
+
+ {{ getOutStockTypeLabelByFormType(row.formType) }}
+
+
-
-
+
-
+
+
+
+
+
+
+
+
+
{
:base-title="$t('_title.production.finishedproductshipment.baseTitle')"
:table-title="$t('_title.production.finishedproductshipment.tableTitle')"
:item-array-name="itemArrayName"
- upload-desc="设备信息"
- :import-url="importItemsUrl"
+ upload-desc="物料信息"
+ :mapping-config="mappingConfig"
@reset="handleReset"
>
@@ -221,6 +327,21 @@ const handleReset = () => {
+
+
+
+
+
+
+
{
-
+
-
+
-
+
+
+ {{ row.productSpecs }}
+
+
+
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -349,15 +400,18 @@ const handleReset = () => {
v-model:parent-param-value="itemParentId"
>
-
-
-
-
-
-
-
-
-
+
+
+
+