From 35b64cd23c3f88b70a22482fce0f904b6b8f2f61 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 2 Jun 2022 13:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicEntrutsRece.vue       | 2 ++
 src/views/basic/BasicEntrutsReceModify.vue | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue
index f596304..d0197d2 100644
--- a/src/views/basic/BasicEntrutsRece.vue
+++ b/src/views/basic/BasicEntrutsRece.vue
@@ -25,6 +25,7 @@
             <el-table v-loading="loading" :data="list" style="width: 100%">
                 <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
                 <el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
+                <el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
                 <el-table-column label="委托验收仓库" prop="entrustInvName" fixed>
                 </el-table-column>
                 <el-table-column label="委托验收人" prop="employeeName" fixed>
@@ -129,6 +130,7 @@ export default {
                 entrustUser: "",
                 entrustAction: null,
                 finishRece: false,
+                curInv: "",
             },
             enableMap: {
                 true: "是",
diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index b82d484..1cd13e8 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -10,9 +10,9 @@
                     <el-select v-model="inputQuery.action" placeholder="请选择" clearable  @change="actionChange">
                         <el-option
                             v-for="item in busTypes"
-                            :key="item.action"
+                            :key="item.localAction"
                             :label="item.name"
-                            :value="item.action">
+                            :value="item.localAction">
                             <span style="float: left">{{ item.localName }}</span>
                         </el-option>
                     </el-select>
@@ -23,7 +23,7 @@
                     <div class="itemTag">
                         <span>当前仓库:&nbsp;</span>
                     </div>
-                    <el-select v-model="inputQuery.entrustInv" placeholder="当前仓库" @change="invChange" clearable>
+                    <el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
                         <el-option
                             v-for="item in storageList"
                             :key="item.code"