From 2d35f4005da5cc23c45190902bdcd16a6122af79 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 2 Mar 2022 15:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4=EF=BC=8C=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=80=89=E6=8B=A9=E4=BB=93=E5=BA=93=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BussinessTypeModify.vue       |  2 +-
 .../warehouse/DialogSelectInvStorage.vue      |  6 ++-
 src/views/warehouse/IOErrorOrder.vue          | 38 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 161f9f5..0d924a9 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -67,7 +67,7 @@
                     <div class="itemTag">
                         <span>本地业务单据:&nbsp;</span>
                     </div>
-                    <el-select v-model="inputQuery.localAction" placeholder="请选择">
+                    <el-select v-model="inputQuery.localAction" placeholder="请选择" clearable>
                         <el-option
                             v-for="item in localTypes"
                             :key="item.action"
diff --git a/src/views/warehouse/DialogSelectInvStorage.vue b/src/views/warehouse/DialogSelectInvStorage.vue
index 6c9de5e..3e5b175 100644
--- a/src/views/warehouse/DialogSelectInvStorage.vue
+++ b/src/views/warehouse/DialogSelectInvStorage.vue
@@ -62,6 +62,10 @@ export default {
         return {
             query: {key: "", page: 1, limit: 20},
             list: [],
+            enableMap: {
+                true: "寄售",
+                false: "仓库",
+            },
         }
     },
     methods: {
@@ -70,7 +74,7 @@ export default {
             filterAll(this.query)
                 .then((response) => {
                     this.loading = false;
-                    this.list = response.data.list || [];
+                    this.list = response.data || [];
                 })
                 .catch(() => {
                     this.loading = false;
diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue
index 18f2ea6..9cc5d67 100644
--- a/src/views/warehouse/IOErrorOrder.vue
+++ b/src/views/warehouse/IOErrorOrder.vue
@@ -203,6 +203,18 @@
             </el-table>
         </el-dialog>
 
+        <el-dialog
+            title="选择仓库信息"
+            :visible.sync="dialogStorageVisible"
+            width="70%"
+            append-to-body
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="dialogStorageVisible"
+        >
+            <dialogSelectInvStorage  v-on:selectStorage="selectStorage"></dialogSelectInvStorage>
+        </el-dialog>
+
         <el-dialog
             title="单号详情"
             :visible.sync="codeDetailVisible"
@@ -238,6 +250,7 @@ import {
 import draggable from "vuedraggable";
 import {saveAs} from "file-saver";
 import codeDetail from "./errorCode";
+import dialogSelectInvStorage from "./DialogSelectInvStorage";
 import addOrder from "./addOrder";
 import store from "../../store";
 import {getBussinessType} from "../../api/basic/bussinessType";
@@ -295,6 +308,7 @@ export default {
             adListNoDataText: "无数据",
             queryAdIdAsyncLoading: false,
             codeDetailVisible: false,
+            dialogStorageVisible:false,
             total: 0,
             loading: true,
             index: null,
@@ -318,6 +332,7 @@ export default {
     components: {
         draggable,
         codeDetail,
+        dialogSelectInvStorage,
         addOrder,
     },
     methods: {
@@ -346,8 +361,12 @@ export default {
         handleUnitClick(row) {
             this.curIndex = row.id;
             let actionItem = this.getActionItem(row.action);
-            // if(actionItem.co)
-            this.dialogTableVisible = true;
+            if (actionItem.corpType == 0) {//选择供应商
+                this.dialogTableVisible = true;
+            } else {
+                this.dialogStorageVisible = true;
+            }
+
         },
         closeDetailDialog(val) {
             this.codeDetailVisible = false;
@@ -382,6 +401,21 @@ export default {
                     this.dialogTableVisible = false;
                 });
         },
+        selectStorage(row) {
+            console.log(row.id);
+            this.unitUpdateQuery.id = this.curIndex;
+            this.unitUpdateQuery.fromCorp = row.name;
+            this.unitUpdateQuery.fromCorpId = row.code;
+            updateUnit(this.unitUpdateQuery)
+                .then((response) => {
+                    this.dialogStorageVisible = false;
+                    this.getList();
+                })
+                .catch(() => {
+                    this.dialogStorageVisible = false;
+                });
+        },
+
         //获取订单列表
         getList() {
             this.loading = true;