注册重复问题

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -106,14 +106,43 @@ func (this *OilCorporateInfoController) GetCompanyInfo() {
 // @Success	200	{object} controllers.Request
 // @router /getsuppliername [get]
 func (this *OilCorporateInfoController) GetSupplierName() {
-	sqlStr := "SELECT SupplierName,CommercialNo FROM OilCorporateInfo"
+	suppliername := this.GetString("suppliername")
+	sqlStr := "SELECT SupplierName FROM OilCorporateInfo where SupplierName='"+suppliername+"' and CheckStatus!='-1'";
 	svc := register.GetOilCorporateInfoService(utils.DBE)
 	list, _ := svc.DBE.QueryString(sqlStr)
+	var errorInfo ErrorDataInfo
+	if list!=nil{
+		errorInfo.Item = true
+		this.Data["json"] = &errorInfo
+		this.ServeJSON()
+	}else{
+		errorInfo.Item = false
+		this.Data["json"] = &errorInfo
+		this.ServeJSON()
+	}
 
-	var datainfo DataInfo
-	datainfo.Items = list
-	this.Data["json"] = &datainfo
-	this.ServeJSON()
+
+}
+
+// @Title 获取已注册的统一社会信用代码
+// @Description
+// @Success	200	{object} controllers.Request
+// @router /getcommercialno [get]
+func (this *OilCorporateInfoController) GetCommercialNo() {
+	commercialno := this.GetString("commercialno")
+	sqlStr := "SELECT CommercialNo FROM OilCorporateInfo where CommercialNo='"+commercialno+"' and CheckStatus!='-1'";
+	svc := register.GetOilCorporateInfoService(utils.DBE)
+	list, _ := svc.DBE.QueryString(sqlStr)
+	var errorInfo ErrorDataInfo
+	if list!=nil{
+		errorInfo.Item = true
+		this.Data["json"] = &errorInfo
+		this.ServeJSON()
+	}else{
+		errorInfo.Item = false
+		this.Data["json"] = &errorInfo
+		this.ServeJSON()
+	}
 }
 
 // @Title 判断新注册的账号是否存在

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -19,7 +19,7 @@
       <div class="top-wrapper">
         <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
           <el-menu-item index="1" style="font-size: large;">
-            <span>供方企业注册</span>
+            <span>企业用户注册</span>
           </el-menu-item>
           <!-- <el-menu-item index="2">
             <span>客服代表注册</span>
@@ -201,16 +201,15 @@
         if (value === '') {
           callback(new Error('请输入公司名称'));
         } else {
-          if (this.supplierNameList) {
-            for (let i = 0; i < this.supplierNameList.length; i++) {
-              if (value == this.supplierNameList[i].SupplierName) {
-                callback(new Error('该公司已被注册'));
-              }
-            }
-            callback();
-          }else {
-            callback();
+         
+          this.getSupplierNameList(value)
+          console.log(this.supplierNameflag)
+          if (this.supplierNameflag){
+             callback(new Error('该公司名称与其他公司重复'));
+          }else{
+            callback()
           }
+
         }
       };
       var checkCommercialNo = (rule, value, callback) => {
@@ -221,15 +220,11 @@
           if (!re4.test(this.formData.CommercialNo)) {
             callback(new Error('请填写正确的18位统一社会信用代码'));
           } else {
-           if (this.supplierNameList) {
-            for (let i = 0; i < this.supplierNameList.length; i++) {
-              if (value == this.supplierNameList[i].CommercialNo) {
-                callback(new Error('该统一社会信用代码与其他公司重复'));
-              }
-            }
-            callback();
-          }else {
-            callback();
+           this.getCommercialNoList(value)
+           if(this.commercialNoflag){
+             callback(new Error('该统一社会信用代码与其他公司重复'));
+           }else{
+             callback()
            }
          }
         }
@@ -337,8 +332,8 @@
       };
       return {
         activeIndex: '1',
-
-        supplierNameList: [], //公司名列表
+        commercialNoflag:false,
+        supplierNameflag:false,
         waituploads: [], // 等待上传的文件列表
         limitNumb: 2, //文件上传限制数
         orgOptions: [],
@@ -415,7 +410,7 @@
           SupplierName: [
             { required: true,
               validator: checkSupplierName,
-              trigger: 'change'
+              trigger: 'blur'
             }
           ],
           EMail: [{
@@ -424,7 +419,7 @@
             trigger: 'change'
           }],
           CommercialNo: [
-            { required: true, validator: checkCommercialNo, trigger: 'change' }
+            { required: true, validator: checkCommercialNo, trigger: 'blur' }
           ],
           LegalPerson: [
             { required: true, message: '请输入法定代表人姓名', trigger: 'change' }
@@ -475,7 +470,6 @@
     },
 
     created () {
-      this.getSupplierNameList() //获取已注册的公司
       this.GetorgOptions()
     },
     components: {
@@ -614,11 +608,21 @@
     },
 
       //获取已注册的公司
-      getSupplierNameList() {
+      getSupplierNameList(val) {
+         this.$axios.get('/register/getsuppliername?suppliername='+val, {})
+          .then(res => {
+            this.supplierNameflag=res.data.item
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+       //获取已注册的统一社会信用码
+      getCommercialNoList(val) {
         let _this = this
-        _this.$axios.get('/register/getsuppliername', {})
+        _this.$axios.get('/register/getcommercialno?commercialno='+val, {})
           .then(res => {
-            _this.supplierNameList = res.data.items
+             this.commercialNoflag=res.data.item
           })
           .catch(err => {
             console.error(err)