From 703e78b06a69d91f799f8fc549a54d39ff683be7 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 7 Jul 2022 11:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=85=B3=E8=81=94=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoRelevance.vue  | 58 +++++++++++++++------------
 src/views/warehouse/selectProduct.vue |  2 -
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index bea6eae..5adaa63 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -165,10 +165,10 @@
                                 </el-button
                                 >
 
-                              <el-button type="primary" icon="search" @click="getSuperSeaech" size="mini"
-                              >国家同步库查询
-                              </el-button
-                              >
+                                <el-button type="primary" icon="search" @click="getSuperSeaech" size="mini"
+                                >国家同步库查询
+                                </el-button
+                                >
                             </el-button-group>
                         </el-form-item>
                     </el-row>
@@ -256,6 +256,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";
+
 export default {
     name: "closeDialog",
     props: {
@@ -291,6 +292,10 @@ export default {
                 thirdId: "",
                 keys: [],
                 thirdSys: null,
+                manufactory: null,
+                price: null,
+                erpName: null,
+                measname: null,
             },
             fromOptions: [],
             checked: true,
@@ -341,29 +346,29 @@ export default {
                     this.total = 0;
                 });
         },
-      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);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-              this.udidlList = [];
-              this.total = 0;
-            });
+        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);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.udidlList = [];
+                    this.total = 0;
+                });
 
-      },
+        },
         checkSelectable(row) {
             return !row.check;
         },
@@ -436,6 +441,7 @@ export default {
             }
             this.combineQuery.manufactory = this.currentRow.manufactory;
             this.combineQuery.price = this.currentRow.price;
+            this.combineQuery.measname = this.currentRow.measname;
             combineUdi(this.combineQuery)
                 .then((response) => {
                     if (response.code == 20000) {
diff --git a/src/views/warehouse/selectProduct.vue b/src/views/warehouse/selectProduct.vue
index 5bcc72d..71244d7 100644
--- a/src/views/warehouse/selectProduct.vue
+++ b/src/views/warehouse/selectProduct.vue
@@ -301,9 +301,7 @@
 
 <script>
 import {getBasicInstrumentMaintains, getBasicInstrumentMaintainsFilterProduct} from "../../api/basic/basicInstrumentMaintain";
-import {combineUdi} from "../../api/basic/basicInstrumentMaintainRelevance";
 import store from "../../store";
-import {insertCompanySalesman, updateCompanySalesman} from "../../api/warehouse/companySalesman";
 import {insertCompanyProductRelevance, updateCompanyProductRelevance} from "../../api/warehouse/companyProductRelevance";
 
 export default {