From 214524da05337c79a139d5572ea770a7500a5d12 Mon Sep 17 00:00:00 2001 From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com> Date: Sat, 29 Oct 2022 22:59:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/wm/productsalse/index.vue | 5 +++- src/views/mes/wm/rtsalse/index.vue | 2 +- src/views/mes/wm/rtsalse/line.vue | 36 ++++++++++++++++++++----- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/views/mes/wm/productsalse/index.vue b/src/views/mes/wm/productsalse/index.vue index 8babee9..ca6cee3 100644 --- a/src/views/mes/wm/productsalse/index.vue +++ b/src/views/mes/wm/productsalse/index.vue @@ -136,7 +136,7 @@ @click="handleExecute(scope.row)" v-if="scope.row.status == 'PREPARE'" v-hasPermi="['mes:wm:productsalse:edit']" - >执行入库 + >执行出库 @@ -325,6 +325,9 @@ export default { ], clientCode: [ { required: true, message: "请指定客户", trigger: "blur" } + ], + salseDate: [ + { required: true, message: "请选择出库日期", trigger: "blur" } ] } }; diff --git a/src/views/mes/wm/rtsalse/index.vue b/src/views/mes/wm/rtsalse/index.vue index 6e13b49..6efb219 100644 --- a/src/views/mes/wm/rtsalse/index.vue +++ b/src/views/mes/wm/rtsalse/index.vue @@ -134,7 +134,7 @@ @click="handleExecute(scope.row)" v-if="scope.row.status == 'PREPARE'" v-hasPermi="['mes:wm:productsalse:edit']" - >执行入库 + >执行退货 diff --git a/src/views/mes/wm/rtsalse/line.vue b/src/views/mes/wm/rtsalse/line.vue index cdda943..af90c01 100644 --- a/src/views/mes/wm/rtsalse/line.vue +++ b/src/views/mes/wm/rtsalse/line.vue @@ -27,9 +27,9 @@ - - - + + + @@ -75,9 +75,12 @@ - - + + + + + @@ -109,7 +112,7 @@ - + import { listRtsalseline, getRtsalseline, delRtsalseline, addRtsalseline, updateRtsalseline } from "@/api/mes/wm/rtsalseline"; +import ItemSelect from "@/components/itemSelect/single.vue"; import {getTreeList} from "@/api/mes/wm/warehouse" export default { name: "Rtsalseline", + components: {ItemSelect}, props: { rtId: null, optType: null, @@ -194,6 +199,9 @@ export default { itemId: [ { required: true, message: "产品不能为空", trigger: "blur" } ], + warehouseId: [ + { required: true, message: "请选择入库仓库", trigger: "blur" } + ], quantityRted: [ { required: true, message: "退货数量不能为空", trigger: "blur" } ], @@ -239,6 +247,20 @@ export default { this.form.areaId = obj[2]; } }, + handleSelectProduct(){ + this.$refs.itemSelect.showFlag = true; + }, + //物料选择弹出框 + onItemSelected(obj){ + debugger; + if(obj != undefined && obj != null){ + this.form.itemId = obj.itemId; + this.form.itemCode = obj.itemCode; + this.form.itemName = obj.itemName; + this.form.specification = obj.specification; + this.form.unitOfMeasure = obj.unitOfMeasure; + } + }, // 取消按钮 cancel() { this.open = false; @@ -248,7 +270,7 @@ export default { reset() { this.form = { lineId: null, - rtId: null, + rtId: this.rtId, itemId: null, itemCode: null, itemName: null,