From ef482a470be3ce1f04b7894f65b240c19f8b5985 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 24 Sep 2022 16:46:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=83=A8=E5=88=86=E5=BC=B9=E7=AA=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=81=AE=E7=BD=A9=E5=B1=82=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E8=AF=AF=E6=93=8D=E4=BD=9C=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=BE=80=E6=9D=A5=E4=BF=A1=E6=81=AF=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E7=B2=BE=E7=A1=AE=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/bussinessType.js              | 13 ++++++
 src/views/warehouse/ioErrorOrder.vue        | 45 +++++++++++++------
 src/views/warehouse/ioNewOrder.vue          | 49 ++++++++++++++-------
 src/views/warehouse/stockOrderDelSearch.vue |  2 +
 src/views/warehouse/stockOrderSearch.vue    |  2 +
 5 files changed, 82 insertions(+), 29 deletions(-)

diff --git a/src/api/basic/bussinessType.js b/src/api/basic/bussinessType.js
index 47f721f..2ef6005 100644
--- a/src/api/basic/bussinessType.js
+++ b/src/api/basic/bussinessType.js
@@ -31,3 +31,16 @@ export function insertBussinessType(query) {
         data: query
     });
 }
+
+/**
+ * 查询单据往来单位信息类型
+ * @param query
+ * @returns {*}
+ */
+export function getCorpType(query) {
+    return axios({
+        url: "/udims/basic/busType/getCorpType",
+        method: 'get',
+        params: query,
+    });
+}
diff --git a/src/views/warehouse/ioErrorOrder.vue b/src/views/warehouse/ioErrorOrder.vue
index ec5a960..28d82db 100644
--- a/src/views/warehouse/ioErrorOrder.vue
+++ b/src/views/warehouse/ioErrorOrder.vue
@@ -129,7 +129,13 @@
             :total="total"
         ></el-pagination>
 
-        <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
+        <el-dialog
+            title="错误信息"
+            :visible.sync="dialogVisible"
+            width="30%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
             <span>{{ errorDetail }}</span>
             <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible = false"
@@ -149,13 +155,10 @@
                     <el-input v-model="unitquery.key" placeholder="搜索" clearable></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button
-                        type="primary"
-                        icon="search"
-                        @click.native.stop="getUnitList(1)"
-                    >查询
-                    </el-button
-                    >
+                    <el-button-group>
+                        <el-button type="primary" icon="el-icon-refresh" @click="resetUnitQuery()"></el-button>
+                        <el-button type="primary" icon="search" @click.native.stop="getUnitList()">查询</el-button>
+                    </el-button-group>
                 </el-form-item>
             </el-form>
 
@@ -203,6 +206,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
@@ -223,6 +228,7 @@ import {unitListBykey} from "../../api/warehouse/unit";
 import draggable from "vuedraggable";
 import codeDetail from "./errorCode";
 import {getBusTypeByUser} from "../../api/warehouse/BusRole";
+import {getCorpType} from "@/api/basic/bussinessType";
 
 const formJson = {
     site_id: "",
@@ -326,12 +332,19 @@ export default {
             this.curIndex = row.id;
             this.dialogTableVisible = true;
             this.curOrderId = row.orderId;
-            this.unitquery = {
-                key: "",
-                page: 1,
-                limit: 10
-            }
-            this.getUnitList();
+            getCorpType({action: row.action}).then((res) => {
+                if (res.code === 20000) {
+                    this.unitquery = {
+                        key: "",
+                        corpType: res.data,
+                        page: 1,
+                        limit: 10
+                    }
+                    this.getUnitList();
+                } else {
+                    this.$message.error("查询往来单位错误");
+                }
+            })
         },
         closeDetailDialog(val) {
             this.codeDetailVisible = false;
@@ -343,6 +356,10 @@ export default {
             }).catch((error) => {
             });
         },
+        resetUnitQuery() {
+            this.unitlist = [];
+            this.unitquery = {key: "", page: 1, limit: 20};
+        },
         getUnitList(page) {
             this.loading = true;
             if (page != null) {
diff --git a/src/views/warehouse/ioNewOrder.vue b/src/views/warehouse/ioNewOrder.vue
index 3d7d9c1..e78cee7 100644
--- a/src/views/warehouse/ioNewOrder.vue
+++ b/src/views/warehouse/ioNewOrder.vue
@@ -111,7 +111,13 @@
             </el-table-column>
         </el-table>
 
-        <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
+        <el-dialog
+            title="错误信息"
+            :visible.sync="dialogVisible"
+            width="30%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
             <span>{{ errorDetail }}</span>
             <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible = false"
@@ -123,19 +129,18 @@
             title="选择往来单位"
             :visible.sync="dialogTableVisible"
             width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
-                    <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+                    <el-input v-model="unitquery.key" placeholder="搜索" clearable></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button
-                        type="primary"
-                        icon="search"
-                        @click.native.stop="getUnitList()"
-                    >查询
-                    </el-button
-                    >
+                    <el-button-group>
+                        <el-button type="primary" icon="el-icon-refresh" @click="resetUnitQuery()"></el-button>
+                        <el-button type="primary" icon="search" @click.native.stop="getUnitList()">查询</el-button>
+                    </el-button-group>
                 </el-form-item>
             </el-form>
 
@@ -179,6 +184,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
@@ -206,6 +213,7 @@ import {getBusTypeByUser} from "../../api/warehouse/BusRole";
 import {unitListBykey} from "../../api/warehouse/unit";
 import draggable from "vuedraggable";
 import codeDetail from "./errorCode";
+import {getCorpType} from "@/api/basic/bussinessType";
 
 const formJson = {
     site_id: "",
@@ -298,16 +306,27 @@ export default {
             this.curIndex = row.id;
             this.dialogTableVisible = true;
             this.curOrderId = row.orderId;
-            this.unitquery = {
-                key: "",
-                page: 1,
-                limit: 10
-            }
-            this.getUnitList();
+            getCorpType({action: row.action}).then((res) => {
+                if (res.code === 20000) {
+                    this.unitquery = {
+                        key: "",
+                        corpType: res.data,
+                        page: 1,
+                        limit: 10
+                    }
+                    this.getUnitList();
+                } else {
+                    this.$message.error("查询往来单位错误");
+                }
+            })
         },
         closeDetailDialog(val) {
             this.codeDetailVisible = false;
         },
+        resetUnitQuery() {
+            this.unitlist = [];
+            this.unitquery = {key: "", page: 1, limit: 20};
+        },
         getUnitList() {
             this.loading = true;
             unitListBykey(this.unitquery)
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 20d9561..1438648 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -285,6 +285,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 166a3a8..0643e39 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -420,6 +420,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"