From 5ab5be5225fecbf23ea7db0fb3f342d7ee6a2e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 9 Mar 2023 17:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=8D=95=E6=8D=AE=E7=9B=B8?=
 =?UTF-8?q?=E5=90=8C=E4=BA=A7=E5=93=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inventory/invPorduct.js            |  8 ++++++++
 src/views/inout/DialogSelectInvProduct.vue | 19 +++++++++++--------
 src/views/inventory/InvProducts.vue        |  4 ++--
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/api/inventory/invPorduct.js b/src/api/inventory/invPorduct.js
index 4a7c30ac..70a293a1 100644
--- a/src/api/inventory/invPorduct.js
+++ b/src/api/inventory/invPorduct.js
@@ -8,6 +8,14 @@ export function getInvProduct(params) {
   });
 }
 
+export function getProduct(params) {
+  return axios({
+    url: "/spms/inv/product/filterProduct",
+    method: "get",
+    params: params
+  });
+}
+
 export function getInvProductDetail(params) {
   return axios({
     url: "/spms/inv/product/filterDetail",
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index 6f0e8bc9..5627582b 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -185,20 +185,23 @@ export default {
         this.$message.error('未选择产品');
         return;
       }
-      var ids = [];
+      var idster = [];
       if(this.codeArray.length>0){
         for(var i=0;i<this.codeArray.length;i++){
-             ids.push(this.codeArray[i].relIdFk);
+          idster.push(this.codeArray[i].relIdFk);
         }
       }
-      if(ids.length>0){
-        for(var i=0;i<ids.length;i++){
-          if(ids[i]==this.selection.relIdFk){
-            this.$message.error("该产品已录入！");
-            return
-          }
+      if(idster.length>0){
+        for(var i=0;i<idster.length;i++){
+            for(var j=0;j<selection.length;j++){
+              if(idster[i]==selection[j].relIdFk){
+                this.$message.error("该产品已录入！");
+                return
+              }
+            }
         }
       }
+      var ids = [];
       selection.forEach((obj, index) => {
         let data = {
           relId: obj.relIdFk,
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 8ce24eb3..b593793c 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -174,7 +174,7 @@
 
 <script>
 import {getInvListByUser} from "@/api/system/invWarehouse";
-import {getInvProduct, deleteInvProduct} from "@/api/inventory/invPorduct";
+import {getInvProduct, deleteInvProduct, getProduct} from "@/api/inventory/invPorduct";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {isBlank} from "@/utils/strUtil";
 import invProductsDetail from "@/views/inventory/InvProductsDetail.vue";
@@ -258,7 +258,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      getInvProduct(this.filterQuery).then((res) => {
+      getProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.list = res.data.list || [];