diff --git a/src/common/languages/locales/zh-CN.ts b/src/common/languages/locales/zh-CN.ts
index d5df57c..452c30f 100644
--- a/src/common/languages/locales/zh-CN.ts
+++ b/src/common/languages/locales/zh-CN.ts
@@ -246,12 +246,27 @@ export default {
input_price: "请输入单价",
input_currentCount: "请输入本次采购数量",
},
- purchaseorder: {
+ purchase_order: {
totalValue: "订单总额",
formCode: "单据编号",
formMark: "单据备注",
formStatus: "入库状态",
vendorName: "供应商",
+ storeName: "仓库",
+ searchCode: "单据编号/供应商",
+ inboundCode: "入库单号",
+ inboundCount: "本次入库",
+ orderCode: "采购订单编号",
+ },
+ purchase_order_item: {
+ partNumber: "物料编号",
+ productSpecs: "物料型号",
+ purchaseCount: "采购数量",
+ receiptCount: "已入库",
+ remainingCount: "剩余量",
+ price: "单价",
+ totalPrice: "总价",
+ purchaseMark: "备注",
},
finishedproductshipment: {
formCode: "单据编号",
@@ -390,6 +405,8 @@ export default {
print: "打印",
editVendors: "供应商列表",
printQrCode: "打印二维码",
+ inbound: "入库",
+ delete: "删除",
},
_message: {
common: {
@@ -656,8 +673,25 @@ export default {
generate_order_error: "生成采购订单失败",
vendor_priority_tip: "优先",
},
- purchaseorder: {
+ purchase_order: {
delete_message: "删除采购订单",
+ input_vendorName: "请选择供应商",
+ select_vendor: "请选择供应商",
+ select_store: "请选择仓库",
+ input_formMark: "请输入备注",
+ upload_items: "请上传采购明细",
+ get_items_error: "获取订单明细失败",
+ delete_confirm: "确定要删除该采购订单吗?",
+ delete_success: "删除成功",
+ delete_fail: "删除失败",
+ inbound_confirm: "确定要进行入库操作吗?",
+ inbound_success: "入库成功",
+ inbound_fail: "入库失败",
+ select_inbound_items: "请选择要入库的物料",
+ get_qrcode_error: "获取二维码数据失败",
+ input_partNumber: "请输入物料编号",
+ input_purchaseCount: "请输入采购数量",
+ input_price: "请输入单价",
},
finishedproductshipment: {
select_storeId: "请选择仓库",
@@ -833,9 +867,13 @@ export default {
totalPrice: "总价",
purchaseStatus: "采购状态",
},
- purchaseorder: {
+ purchase_order: {
add: "新建采购订单",
edit: "编辑采购订单",
+ inbound: "采购入库",
+ qrcode: "二维码打印",
+ baseTitle: "采购订单基本信息",
+ tableTitle: "采购明细",
},
},
sale: {
@@ -1118,4 +1156,8 @@ export default {
returned: "已退料",
},
},
+ _status: {
+ in_progress: "入库中",
+ completed: "已完成",
+ },
};
diff --git a/src/components/base/base-qrcode/QrCodeDialog.vue b/src/components/base/base-qrcode/QrCodeDialog.vue
index f3c3411..c63ca76 100644
--- a/src/components/base/base-qrcode/QrCodeDialog.vue
+++ b/src/components/base/base-qrcode/QrCodeDialog.vue
@@ -1,5 +1,6 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ new Decimal(row.totalValue ?? 0).toFixed(2) }}
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+ {{ new Decimal(row.price ?? 0).toFixed(2) }}
+
+
+
+
+ {{ new Decimal(row.totalPrice ?? 0).toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.productSpecs ?? "-" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ new Decimal(row.purchaseCount ?? 0).mul(row.price ?? 0).toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("_button.inbound") }}
+
+
+
+
+
diff --git a/src/views/purchase/purchase-plan/PurchasePlanView.vue b/src/views/purchase/purchase-plan/PurchasePlanView.vue
index 186aa9f..0a7510a 100644
--- a/src/views/purchase/purchase-plan/PurchasePlanView.vue
+++ b/src/views/purchase/purchase-plan/PurchasePlanView.vue
@@ -61,6 +61,7 @@ const generateOrderVisible = ref(false);
const generateOrderForm = reactive({
planId: 0,
planStatus: 0,
+ planNo: "",
});
const planItems = ref([] as any[]);
const allVendors = ref([] as any[]);
@@ -192,6 +193,7 @@ const buildVendorSuggestions = (item: any) => {
const showGenerateOrderDialog = async (row: any) => {
generateOrderForm.planId = row.id;
generateOrderForm.planStatus = row.planStatus;
+ generateOrderForm.planNo = row.planNo;
try {
const response = await get(getItemsUrl, { planId: row.id });