From f2dc7f7b043b973dd2a8556b867004cd9255b4bd Mon Sep 17 00:00:00 2001
From: qqkj <qqkj@163.com>
Date: Mon, 1 Mar 2021 03:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=83=A8=E9=97=A8=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/branch.js             |  4 ++--
 src/views/login/BranchAdd.vue | 28 ++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/api/branch.js b/src/api/branch.js
index 73c3744f..10690fd2 100644
--- a/src/api/branch.js
+++ b/src/api/branch.js
@@ -11,7 +11,7 @@ let base=config.getSysBasePath();
  **/
  
 //普通查询 条件之间and关系  
-export const listBranch = params => { return axios.get(`${base}/mdp/sys/branch/list`, { params: params }); };
+export const listBranchNoAuth = params => { return axios.get(`${base}/mdp/sys/branch/listBranchNoAuth`, { params: params }); };
 
 //模糊查询管理端机构表（机构下面若干部门） 条件之间or关系  
 //export const listBranchKey = params => { return axios.get(`${base}/mdp/sys/branch/listKey`, { params: params }); };
@@ -26,4 +26,4 @@ export const batchDelBranch = params => { return axios.post(`${base}/mdp/sys/bra
 export const editBranch = params => { return axios.post(`${base}/mdp/sys/branch/edit`, params); };
 
 //新增一条管理端机构表（机构下面若干部门）
-export const addBranch = params => { return axios.post(`${base}/mdp/sys/branch/add`, params); };
\ No newline at end of file
+export const addBranchNoAuth = params => { return axios.post(`${base}/mdp/sys/branch/addBranchNoAuth`, params); };
\ No newline at end of file
diff --git a/src/views/login/BranchAdd.vue b/src/views/login/BranchAdd.vue
index 83fe5612..327a777a 100644
--- a/src/views/login/BranchAdd.vue
+++ b/src/views/login/BranchAdd.vue
@@ -5,10 +5,12 @@
 			<!--新增界面 Branch 管理端机构表（机构下面若干部门）--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="" prop="branchName">
-					<el-tag>亲，您不在任何一个公司或者部门中，需要【先创建公司】 或者请【管理员加您进入公司】哦</el-tag>
+					<el-tag>您不在任何一个公司或者部门中，需要【先创建公司】 或者请【管理员加您进入公司】</el-tag>
 				</el-form-item>
 				<el-form-item label="机构名称" prop="branchName">
-					<el-input v-model="addForm.branchName" auto-complete="off"></el-input>
+					<el-input v-model="addForm.branchName" auto-complete="off">
+						<el-button slot="append" @click.prevent="checkBranchExists">查询机构是否存在</el-button> 
+					</el-input>
 				</el-form-item> 
 
 				<el-form-item label="行业分类" prop="industryCategory"> 
@@ -52,7 +54,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import { listOption } from '@/api/itemOption';//下拉框数据查询
-	import { addBranch } from '@/api/branch';
+	import { addBranchNoAuth,listBranchNoAuth } from '@/api/branch';
 	import { mapGetters } from 'vuex'
 	
 	export default {
@@ -102,7 +104,7 @@
 							console.log("dddddddddddddddddddddddddddddddddddddddddddddddd")
 							console.log(this.userInfo)
 							params.cuserid=this.userInfo.userid
-							addBranch(params).then((res) => {
+							addBranchNoAuth(params).then((res) => {
 								this.load.add=false
 								var tips=res.data.tips;
 								if(tips.isOk){
@@ -114,6 +116,24 @@
 						});
 					}
 				});
+			},
+			checkBranchExists:function(){
+				if(this.addForm.branchName.length>=2){
+					var params={
+						key:this.addForm.branchName
+					}
+					listBranchNoAuth(params).then(res=>{
+						if(res.data.tips.isOk){
+							if(res.data.total<=0){
+								this.$message({ message: "该公司名未注册，可以使用", type: 'success' }); 
+								return;
+							}else{
+								this.$message({ message: "该公司名已注册，不可以使用", type: 'error' }); 
+								return;
+							}
+						}
+					})
+				}
 			}
 			/**begin 在下面加自定义方法,记得补上面的一个逗号**/