From d579a27562ce8da1c245948a7110b1882b7a408a Mon Sep 17 00:00:00 2001 From: chenhao Date: Mon, 1 Dec 2025 10:40:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(inventory):=20=E6=96=B0=E5=A2=9E=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在入库单界面增加产品类型和入库类型的字典标签显示 - 添加订单选择对话框组件，用于服务类入库关联订单信息 - 实现服务类入库与普通入库的界面切换逻辑 - 优化入库单详情展示，区分服务类和普通产品信息列表 - 后端增加warehouseType字段支持并完善数据查询逻辑 - 前端增加isServiceIn标识控制不同入库类型的表单展示 - 引入订单选择弹窗组件及相应API依赖 - 调整页面样式以适应新增内容的布局需求 --- .../src/views/inventory/inner/index.vue | 83 ++++++++++- .../order/components/OrderSelectDialog.vue | 131 ++++++++++++++++++ .../src/views/system/product/index.vue | 5 +- .../ruoyi/sip/domain/OmsInventoryInner.java | 1 + .../impl/OmsInventoryInnerServiceImpl.java | 4 +- .../inventory/OmsInventoryInnerMapper.xml | 2 +- 6 files changed, 215 insertions(+), 11 deletions(-) create mode 100644 oms_web/oms_vue/src/views/project/order/components/OrderSelectDialog.vue diff --git a/oms_web/oms_vue/src/views/inventory/inner/index.vue b/oms_web/oms_vue/src/views/inventory/inner/index.vue index 64fc9e8a..3aeb71df 100644 --- a/oms_web/oms_vue/src/views/inventory/inner/index.vue +++ b/oms_web/oms_vue/src/views/inventory/inner/index.vue @@ -55,12 +55,22 @@ - + + + + + + + @@ -80,6 +90,7 @@ + @@ -145,11 +156,29 @@ +

产品信息

 - + - + +
@@ -322,13 +361,15 @@ import { getProductByCode } from "@/api/system/product"; import { getToken } from "@/utils/auth"; import {exportProject} from "@/api/project/info"; import PurchaseOrderSelectDialog from '../../purchaseorder/components/PurchaseOrderSelectDialog.vue'; +import OrderSelectDialog from '../../project/order/components/OrderSelectDialog.vue'; import Dict from "@/views/system/dict/index.vue"; export default { name: "Inner", components: { Dict, - PurchaseOrderSelectDialog + PurchaseOrderSelectDialog, + OrderSelectDialog, }, dicts: ['product_type', 'warehouse_type'], data() { @@ -409,6 +450,8 @@ export default { }, snRange: '', purchaseOrderSelectVisible: false, + orderSelectVisible: false, + isServiceIn: false, }; }, created() { @@ -482,6 +525,7 @@ export default { }, // 表单重置 reset() { + this.isServiceIn = false; this.form = { id: null, innerCode: null, @@ -497,18 +541,37 @@ export default { handleAdd(type) { this.reset(); if (type==='maintenance'){ + this.isServiceIn = true; this.queryProductType=['11','22'] }else{ + this.isServiceIn = false; this.queryProductType=['1','2','99'] } this.purchaseOrderSelectVisible = true; }, + handleOrderSelect(order) { + this.form.orderCode = order.orderCode; + this.form.projectCode = order.projectCode; + this.form.projectName = order.projectName; + }, handlePurchaseOrderSelect(order) { this.form= Object.assign(this.form,order) this.form.totalAmount=order.amountTotal const warehouse = this.warehouseOptions.find(w => w.id === this.form.warehouseId); this.form.warehouseName = warehouse.warehouseName || ''; this.form.warehouseType = warehouse.warehouseType + if (this.isServiceIn) { + this.form.orderCode = null; + this.form.inventoryInfoList = [{ + productCode: order.productCode, + model: order.productModel, + productDesc: order.productDesc, + innerPrice: order.price, + quantity: order.quantity, + warehouseId: order.warehouseId, + }]; + + } this.open = true; this.isView = false; this.title = "添加入库单"; @@ -769,3 +832,9 @@ export default { } }; + diff --git a/oms_web/oms_vue/src/views/project/order/components/OrderSelectDialog.vue b/oms_web/oms_vue/src/views/project/order/components/OrderSelectDialog.vue new file mode 100644 index 00000000..fd1525f7 --- /dev/null +++ b/oms_web/oms_vue/src/views/project/order/components/OrderSelectDialog.vue @@ -0,0 +1,131 @@ + + + diff --git a/oms_web/oms_vue/src/views/system/product/index.vue b/oms_web/oms_vue/src/views/system/product/index.vue index 34c7be27..6f80cd35 100644 --- a/oms_web/oms_vue/src/views/system/product/index.vue +++ b/oms_web/oms_vue/src/views/system/product/index.vue @@ -111,7 +111,7 @@ - +