From da3a91fabfedcd621dbc6e85eed2406b0de34783 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 3 Oct 2022 08:55:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=202.=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=A4=8D=E5=88=B6=E5=8D=95=E6=8D=AE=E6=9C=AA=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E5=9B=9E=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=80=99=E9=80=89=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/unit.js                    | 34 --------------------
 src/views/product/udiRelevance.vue           | 21 ++++++++++++
 src/views/warehouse/AdditionalOrder.vue      |  2 +-
 src/views/warehouse/DialogChangeNewOrder.vue | 14 ++++++++
 src/views/warehouse/code.vue                 |  9 ++++--
 src/views/warehouse/errorCode.vue            |  3 +-
 src/views/warehouse/ioUdiTrace.vue           |  5 ---
 7 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/api/warehouse/unit.js b/src/api/warehouse/unit.js
index a7f0470..0e5700d 100644
--- a/src/api/warehouse/unit.js
+++ b/src/api/warehouse/unit.js
@@ -1,21 +1,5 @@
 import axios from "../../utils/axios";
 
-export function saveUnits(query) {
-    return axios({
-        url: "/warehouse/unit/save",
-        method: "post",
-        data: query
-    });
-}
-
-export function unitList(query) {
-    return axios({
-        url: "/warehouse/unit/list",
-        method: "get",
-        params: query
-    });
-}
-
 export function unitListBykey(query) {
     return axios({
         url: "/warehouse/unitMaintain/filter",
@@ -23,21 +7,3 @@ export function unitListBykey(query) {
         params: query
     });
 }
-
-export function customerUnit(query) {
-    return axios({
-        url: "/warehouse/unit/customerUnit",
-        method: "get",
-        params: query
-    });
-}
-
-
-export function ucloudUnit(query) {
-    return axios({
-        url: "/warehouse/ucloud/filter",
-        method: "get",
-        params: query
-    });
-}
-
diff --git a/src/views/product/udiRelevance.vue b/src/views/product/udiRelevance.vue
index 073d9dc..117184a 100644
--- a/src/views/product/udiRelevance.vue
+++ b/src/views/product/udiRelevance.vue
@@ -72,6 +72,11 @@
                         </el-form-item>
                         <el-form-item class="query-form-item">
                             <el-button-group>
+                                <el-button
+                                    type="primary"
+                                    icon="el-icon-refresh"
+                                    @click="onReset"
+                                ></el-button>
                                 <el-button type="primary" icon="search" @click="searchList" size="mini"
                                 >查询
                                 </el-button
@@ -221,6 +226,22 @@ export default {
         };
     },
     methods: {
+        onReset() {
+            this.unionQuery = {
+                page: 1,
+                limit: 10,
+                udiCode: "",
+                nameCode: "",
+                cpmctymc: "",
+                ylqxzcrbarmc: "",
+                ggxh: "",
+                zczbhhzbapzbh: "",
+                isCheck: 1
+            }
+            this.udidlList = [];
+            this.total = 0;
+            this.getList();
+        },
         searchList() {
             this.unionQuery.page = 1;
             this.getList();
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index 970c340..7c9cb54 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -59,7 +59,7 @@
                         <span>{{ getActionName(scope.row.action) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="订单号" prop="orderId"></el-table-column>
+                <el-table-column label="单据号" prop="orderId"></el-table-column>
                 <!--                <el-table-column label="来源订单号" prop="corpOrderId"></el-table-column>-->
                 <el-table-column label="来源" prop="fromType"></el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
diff --git a/src/views/warehouse/DialogChangeNewOrder.vue b/src/views/warehouse/DialogChangeNewOrder.vue
index e11f6e2..87cbda9 100644
--- a/src/views/warehouse/DialogChangeNewOrder.vue
+++ b/src/views/warehouse/DialogChangeNewOrder.vue
@@ -327,6 +327,20 @@ export default {
                 limit: 100
             };
 
+            if (this.curAction.corpType == 0) {
+                //供应商
+                cQuery.corpType = 2;
+            } else if (this.curAction.corpType  == 1) {
+                //仓库
+                cQuery.corpTyp = 1;
+            } else if (this.curAction.corpType  == 2) {
+                //客户信息
+                cQuery.corpTyp = 1;
+            } else if (this.curAction.corpType  == 3) {
+                //特殊往来
+                cQuery.corpTyp = 4;
+            }
+
             unitListBykey(cQuery)
                 .then((response) => {
                     this.loading = false;
diff --git a/src/views/warehouse/code.vue b/src/views/warehouse/code.vue
index e79df77..3095d49 100644
--- a/src/views/warehouse/code.vue
+++ b/src/views/warehouse/code.vue
@@ -7,7 +7,8 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                    <el-button type="primary" icon="search" @click="search"
                     >查询
                     </el-button
                     >
@@ -88,7 +89,6 @@ export default {
             });
             this.query = {
                 code: "",
-                corpOrderId: "",
                 page: 1,
                 limit: 20,
             };
@@ -109,7 +109,10 @@ export default {
             this.query.page = val;
             this.getCodeList();
         },
-
+        search() {
+            this.query.page = 1;
+            this.getCodeList();
+        },
         getCodeList() {
             this.loading = true;
             // this.query.corpOrderId = this.idQuery.id;
diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue
index fa04350..35d2ff8 100644
--- a/src/views/warehouse/errorCode.vue
+++ b/src/views/warehouse/errorCode.vue
@@ -7,6 +7,7 @@
 
             <el-form-item>
                 <el-button-group>
+                    <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                     <el-button type="primary" icon="search" @click="onSubmit"
                     >查询
                     </el-button
@@ -160,7 +161,6 @@ export default {
             });
             this.query = {
                 code: "",
-                corpOrderId: "",
                 page: 1,
                 limit: 20,
             };
@@ -171,6 +171,7 @@ export default {
                 path: "",
                 query: this.query,
             });
+            this.query.page = 1;
             this.getCodeList();
         },
         handleSizeChange(val) {
diff --git a/src/views/warehouse/ioUdiTrace.vue b/src/views/warehouse/ioUdiTrace.vue
index 613b601..cdc6176 100644
--- a/src/views/warehouse/ioUdiTrace.vue
+++ b/src/views/warehouse/ioUdiTrace.vue
@@ -511,11 +511,6 @@ export default {
         },
 
         intentDetail(row) {
-            // this.$router.push({
-            //   path: "../inout/detail",
-            //   query: { id: row.id },
-            // });
-
             this.codeDetailVisible = true;
             this.idQuery.id = row.orderId;
         },