From 07c12382be90b379cccddb4d4ed115f470c36f53 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 29 Jul 2022 17:14:47 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8CUDI=E5=9B=BD?=
 =?UTF-8?q?=E5=AE=B6=E5=BA=93=E6=9B=B4=E6=96=B0=E4=B8=8B=E8=BD=BD=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/udiInfo.js                  | 10 ++++
 src/views/basic/UdiInfoRelevance.vue      | 44 ++++++++++-------
 src/views/basic/UdiInfoSelectLocalUdi.vue | 43 ++++++++++-------
 src/views/basic/UdiinfoSelectVersion.vue  | 57 +++++++++++++++++++++--
 src/views/inventory/InvProductsDetail.vue |  2 +-
 src/views/warehouse/selectThrOrder.vue    |  2 +-
 6 files changed, 119 insertions(+), 39 deletions(-)

diff --git a/src/api/basic/udiInfo.js b/src/api/basic/udiInfo.js
index 23eb696..b14450c 100644
--- a/src/api/basic/udiInfo.js
+++ b/src/api/basic/udiInfo.js
@@ -7,6 +7,7 @@ export function getUdiInfos(query) {
         params: query
     });
 }
+
 export function filterCompany(query) {
     return axios({
         url: "/udiwms/udiinfo/filterCompany",
@@ -22,6 +23,7 @@ export function filterByUuid(query) {
         params: query
     });
 }
+
 export function filterByVersion(query) {
     return axios({
         url: "/udiwms/syncdi/version",
@@ -38,6 +40,14 @@ export function superSearch(query) {
     });
 }
 
+export function dlLastVersionByDi(query) {
+    return axios({
+        url: "/udiwms/udiinfo/dlLastVersionByDi",
+        method: "get",
+        params: query
+    });
+}
+
 
 
 
diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index ca82ae8..2dc7e4c 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -258,6 +258,7 @@ import {combineUdi} from "../../api/basic/udiRelevance";
 import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
 import {getInvbasdoc} from "../../api/basic/getErps";
 import selectDiDetail from "@/views/basic/SelectDIDetailDialog";
+import {deleteLog} from "@/api/basic/corpExport";
 
 export default {
     name: "closeDialog",
@@ -349,27 +350,38 @@ export default {
                 });
         },
         getSuperSeaech() {
-            if (this.unionQuery.nameCode == "") {
-                this.$message.warning("请输入查询条件");
-                return;
-            }
-            this.loading = true;
-            superSearch(this.unionQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.udidlList = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
+
+            this.$confirm("此操作将访问国家库查询DI数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    if (this.unionQuery.nameCode == "") {
+                        this.$message.warning("请输入完成DI信息进行查询！");
+                        return;
                     }
+                    this.loading = true;
+                    superSearch(this.unionQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.udidlList = response.data.list || [];
+                                this.total = response.data.total || 0;
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                            this.udidlList = [];
+                            this.total = 0;
+                        });
                 })
                 .catch(() => {
-                    this.loading = false;
-                    this.udidlList = [];
-                    this.total = 0;
                 });
 
+
         },
         checkSelectable(row) {
             return !row.check;
diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue
index 9c940a8..fdcb546 100644
--- a/src/views/basic/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/UdiInfoSelectLocalUdi.vue
@@ -477,27 +477,38 @@ export default {
         },
 
         getSuperSeaech() {
-            if (this.unionQuery.nameCode == "") {
-                this.$message.warning("请输入查询条件");
-                return;
-            }
-            this.loading = true;
-            superSearch(this.unionQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.udidlList = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
+
+            this.$confirm("此操作将访问国家库查询DI数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    if (this.unionQuery.nameCode == "") {
+                        this.$message.warning("请输入完成DI信息进行查询！");
+                        return;
                     }
+                    this.loading = true;
+                    superSearch(this.unionQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.udidlList = response.data.list || [];
+                                this.total = response.data.total || 0;
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                            this.udidlList = [];
+                            this.total = 0;
+                        });
                 })
                 .catch(() => {
-                    this.loading = false;
-                    this.udidlList = [];
-                    this.total = 0;
                 });
 
+
         },
 
         combineUdiAll() {
diff --git a/src/views/basic/UdiinfoSelectVersion.vue b/src/views/basic/UdiinfoSelectVersion.vue
index 317f5bf..03864f0 100644
--- a/src/views/basic/UdiinfoSelectVersion.vue
+++ b/src/views/basic/UdiinfoSelectVersion.vue
@@ -2,8 +2,20 @@
     <div>
         <el-card class="el-card">
             <div>
-
-
+                <el-form>
+                    <el-form-item class="query-form-item">
+                        <el-button-group>
+                            <el-button type="primary" icon="search" @click="dlLastVersion" size="mini"
+                            >国家同步库更新查询
+                            </el-button
+                            >
+                            <el-button type="primary" icon="search" @click="getList" size="mini"
+                            >刷新
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-form>
                 <el-table
                     :data="udidlList"
                     style="width: 100%"
@@ -95,7 +107,7 @@
 </template>
 
 <script>
-import {filterByVersion, filterCompany,} from "../../api/basic/udiInfo";
+import {filterByVersion, dlLastVersionByDi, superSearch,} from "../../api/basic/udiInfo";
 import {changeVersion, checkExitUdi} from "../../api/basic/udiRelevance";
 import selectDiDetail from "./SelectDIDetailDialog"
 
@@ -153,8 +165,45 @@ export default {
     methods: {
 
 
+        dlLastVersion() {
+
+            this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.loading = true;
+                    let query = {nameCode: this.udidlList[0].nameCode};
+                    dlLastVersionByDi(query)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.getList();
+                                this.$message.success("更新成功！");
+                            } else {
+                                this.getList()
+                                this.$message.error(response.message);
+                            }
+
+
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                            this.udidlList = [];
+                            this.total = 0;
+                        });
+                })
+                .catch(() => {
+                });
+
+
+        },
+
+
         getList() {
             this.loading = true;
+
             filterByVersion(this.unionQuery)
                 .then((response) => {
                     this.loading = false;
@@ -164,8 +213,6 @@ export default {
                     } else {
                         this.$message.error(response.message);
                     }
-
-
                 })
                 .catch(() => {
                     this.loading = false;
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index 28409e8..9591f1b 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -144,7 +144,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next,total"
             :total="total"
-            :current-page="quer.page"
+            :current-page="query.page"
         >
         </el-pagination>
     </div>
diff --git a/src/views/warehouse/selectThrOrder.vue b/src/views/warehouse/selectThrOrder.vue
index f54d6fe..9a8e67b 100644
--- a/src/views/warehouse/selectThrOrder.vue
+++ b/src/views/warehouse/selectThrOrder.vue
@@ -112,7 +112,7 @@
                     @current-change="handleErpPageChange"
                     layout="prev, pager, next"
                     :total="pageTotal"
-                    :current-page="filterQuery.page"
+                    :current-page="listQuery.page"
                 ></el-pagination>
             </div>
         </el-card>