diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml index 116aad9..f0b12f5 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml @@ -253,8 +253,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid, d.erp_stockout_id, d.unit, d.spec, d.supplier_id, d.cargo_no, d.create_time, d.print_date, d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id, - d.product_name - from out_stockout_detail_finish d + p.product_name + from out_stockout_detail_finish d left join bas_product p on d.product_id = p.product_id where stockout_guid = #{stockoutGuid} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml index a066091..340b108 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml @@ -257,8 +257,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid, d.erp_stockout_id, d.unit, d.spec, d.supplier_id, d.cargo_no, d.create_time, d.print_date, d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id, - d.product_name - from out_stockout_detail d + p.product_name + from out_stockout_detail d left join bas_product p on d.product_id = p.product_id where d.stockout_guid = #{stockoutGuid} \ No newline at end of file diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue index 890494b..70c9467 100644 --- a/ruoyi-ui/src/views/out/addOutStockout.vue +++ b/ruoyi-ui/src/views/out/addOutStockout.vue @@ -454,11 +454,14 @@ export default { /** 数量变更 */ handleQuantityChange(row) { // 如果没有初始数量,则设置初始数量 - + console.log(row.quantityOrignal) // 如果修改后的数量大于初始数量,给出提示并重置为当前值 if (row.quantity > row.quantityOrignal) { this.$modal.msgError('修改后的数量不能大于初始数量'); - row.quantity = row.quantityOrignal; + // 使用 $nextTick 确保在下一个 DOM 更新周期中重置数量 + this.$nextTick(() => { + this.$set(row, 'quantity', row.quantityOrignal); + }); } }, /** 保存单据 */ diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue index 39e3ad7..987bf90 100644 --- a/ruoyi-ui/src/views/stock/management/index.vue +++ b/ruoyi-ui/src/views/stock/management/index.vue @@ -127,45 +127,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +