注册部分修改

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

src/dashoo.cn/backend/api/controllers/base.go

@@ -290,6 +290,7 @@ func (this *BaseController) Prepare() {
 		"/api/suppliercert/auditcallback",
 		"/api/register/addentity",
 		"/api/register/getsuppliername",
+		"/api/register/getcommercialno",
 		"/api/register/getdictlist",
 		"/api/register/usernameisexist",
 		"/api/rtx/call",

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

@@ -198,19 +198,19 @@
         }
       };
       var checkSupplierName =  (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请输入公司名称'));
-        } else {
-         
-          this.getSupplierNameList(value)
-          console.log(this.supplierNameflag)
-          if (this.supplierNameflag){
-             callback(new Error('该公司名称与其他公司重复'));
-          }else{
-            callback()
-          }
-
-        }
+      if (value === '') {
+           callback(new Error('请输入公司名称'));
+         } else {
+            this.$axios.get('/register/getsuppliername?suppliername='+value, {}).then(res => {
+               if (res.data.item){
+                  callback(new Error('该公司名称与其他公司重复'));
+                }else{
+                  callback()
+                }
+          }).catch(err => {
+            console.error(err)
+          })
+         }
       };
       var checkCommercialNo = (rule, value, callback) => {
         if (value === '') {
@@ -219,13 +219,18 @@
           let re4 = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
           if (!re4.test(this.formData.CommercialNo)) {
             callback(new Error('请填写正确的18位统一社会信用代码'));
-          } else {
-           this.getCommercialNoList(value)
-           if(this.commercialNoflag){
+          } else {      
+        this.$axios.get('/register/getcommercialno?commercialno='+value, {})
+          .then(res => {
+               if(res.data.item){
              callback(new Error('该统一社会信用代码与其他公司重复'));
            }else{
              callback()
            }
+          })
+          .catch(err => {
+            console.error(err)
+          })         
          }
         }
       };
@@ -332,8 +337,6 @@
       };
       return {
         activeIndex: '1',
-        commercialNoflag:false,
-        supplierNameflag:false,
         waituploads: [], // 等待上传的文件列表
         limitNumb: 2, //文件上传限制数
         orgOptions: [],
@@ -565,15 +568,16 @@
       register () {
         // this.formData.CheckUserId = this.formData.CheckUserId.slice(0, this.formData.CheckUserId.length - 1)
         // this.formData.CheckUserName = this.formData.CheckUserName.slice(0, this.formData.CheckUserName.length - 1)
-        if (this.formData.CheckUserId === '' || this.formData.CheckUserId === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该单位没有审核人！'
-          })
-        }
-        console.log(this.formData, 'formData')
        this.$refs['RegisterFormData'].validate((valid) => {
           if(valid){
+
+               if (this.formData.CheckUserId === '' || this.formData.CheckUserId === 0) {
+                  this.$message({
+                    type: 'warning',
+                    message: '该单位没有审核人！'
+                  })
+               return
+              }
               let _this = this
               let URL = []
               URL = _this.getFileURL(_this.$refs.LegalPersonUpload.uploadFiles) //获取地址
@@ -607,28 +611,6 @@
         })
     },
 
-      //获取已注册的公司
-      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/getcommercialno?commercialno='+val, {})
-          .then(res => {
-             this.commercialNoflag=res.data.item
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-
       //判断用户名是否存在
       checkUserNameIsExist() {
         let _this = this