From f504a1a0eaaeb39ffcb9e92920c6a9ce82947e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 3 Dec 2021 00:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7=E7=9A=84=E6=A0=A1=E9=AA=8C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/api/api.js                             | 2 +-
 jshERP-web/src/views/system/modules/CustomerModal.vue | 1 +
 jshERP-web/src/views/system/modules/MemberModal.vue   | 1 +
 jshERP-web/src/views/system/modules/VendorModal.vue   | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js
index f644d2cb..01ea31fb 100644
--- a/jshERP-web/src/api/api.js
+++ b/jshERP-web/src/api/api.js
@@ -91,7 +91,7 @@ const checkUnit = (params)=>getAction("/unit/checkIsNameExist",params);
 //供应商|客户|会员
 const addSupplier = (params)=>postAction("/supplier/add",params);
 const editSupplier = (params)=>putAction("/supplier/update",params);
-const checkSupplier = (params)=>getAction("/supplier/checkIsNameExist",params);
+const checkSupplier = (params)=>getAction("/supplier/checkIsNameAndTypeExist",params);
 const findBySelectSup = (params)=>postAction("/supplier/findBySelect_sup",params);
 const findBySelectCus = (params)=>postAction("/supplier/findBySelect_cus",params);
 const findBySelectRetail = (params)=>postAction("/supplier/findBySelect_retail",params);
diff --git a/jshERP-web/src/views/system/modules/CustomerModal.vue b/jshERP-web/src/views/system/modules/CustomerModal.vue
index f7cb16b4..1e5fc184 100644
--- a/jshERP-web/src/views/system/modules/CustomerModal.vue
+++ b/jshERP-web/src/views/system/modules/CustomerModal.vue
@@ -182,6 +182,7 @@
       validateSupplierName(rule, value, callback){
         let params = {
           name: value,
+          type: '客户',
           id: this.model.id?this.model.id:0
         };
         checkSupplier(params).then((res)=>{
diff --git a/jshERP-web/src/views/system/modules/MemberModal.vue b/jshERP-web/src/views/system/modules/MemberModal.vue
index f28e593e..2635a771 100644
--- a/jshERP-web/src/views/system/modules/MemberModal.vue
+++ b/jshERP-web/src/views/system/modules/MemberModal.vue
@@ -141,6 +141,7 @@
       validateSupplierName(rule, value, callback){
         let params = {
           name: value,
+          type: '会员',
           id: this.model.id?this.model.id:0
         };
         checkSupplier(params).then((res)=>{
diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue
index 80e25ab5..35ba659a 100644
--- a/jshERP-web/src/views/system/modules/VendorModal.vue
+++ b/jshERP-web/src/views/system/modules/VendorModal.vue
@@ -177,6 +177,7 @@
       validateSupplierName(rule, value, callback){
         let params = {
           name: value,
+          type: '供应商',
           id: this.model.id?this.model.id:0
         };
         checkSupplier(params).then((res)=>{