注册界面修改

node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

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

@@ -277,7 +277,7 @@ func (this *BaseController) Prepare() {
 		"/api/webinterface/preparelist", "/api/webinterface/prepareinfo",
 		"/api/sampletest_v/sampletest", "/api/sampletest_v/getpass", "/api/sampletest_v/editpass/",
 		"/api/sampletest_v/donorsdetail", "/api/sampletest_v/testdetail", "/api/uploads/samplesinput", "/api/doctemplate_onlyoffice/callback", "/api/doctemplate_onlyoffice/viewcallback", "/api/limsupload/usersignimg",
-		"/api/uploads/samplestypeimg", "/api/workflow/historyimg/", "/api/document/getdocumentnameandtime", "/api/annualaudit/auditcallback", "/api/suppliercert/auditcallback", "/api/register/addentity"}
+		"/api/uploads/samplestypeimg", "/api/workflow/historyimg/", "/api/document/getdocumentnameandtime", "/api/annualaudit/auditcallback", "/api/suppliercert/auditcallback", "/api/register/addentity", "/api/register/getsuppliername", "/api/supplier/dictlist/"}
 	for _, v := range urls {
 		fmt.Println("**this.Ctx.Input.URL()**", this.Ctx.Input.URL())
 		if this.Ctx.Input.URL() == v {

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

@@ -2,9 +2,9 @@ package register
 
 import (
 	"encoding/json"
-	"fmt"
 	"time"
 
+	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/register"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/business2/userRole"
@@ -15,6 +15,21 @@ type OilCorporateInfoController struct {
 	BaseController
 }
 
+// @Title 获取已注册的公司名称
+// @Description 获取已注册的公司名称
+// @Success	200	{object} controllers.Request
+// @router /getsuppliername [get]
+func (this *OilCorporateInfoController) GetSupplierName() {
+	sqlStr := "SELECT SupplierName FROM OilCorporateInfo"
+	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
+	list, _ := svcSupplier.DBE.QueryString(sqlStr)
+
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
 // @Title 注册
 // @Description 新增公司以及用户信息
 // @Success	200	{object} controllers.Request
@@ -52,13 +67,10 @@ func (this *OilCorporateInfoController) AddEntity() {
 	userentity.Publickey = key
 	userentity.Auditstatus = 1
 	userentity.AccCode = "s5OVE"
-	userentity.Code = "Administrator"
 
 	userSvc := userRole.GetUserService(utils.DBE)
 	err := userSvc.AddUser(&userentity)
 
-	fmt.Println("****注册----userentity****", userentity)
-
 	if err == nil {
 		//开始添加公司信息
 		model.UserId = userentity.Id
@@ -66,13 +78,9 @@ func (this *OilCorporateInfoController) AddEntity() {
 		model.CreateBy = userentity.Realname
 		model.CreateUserId = userentity.Id
 
-		fmt.Println("****账号注册成功----model.UserId****", model.UserId)
-
 		svc := register.GetOilCorporateInfoService(utils.DBE)
 		_, err2 := svc.InsertEntityBytbl("OilCorporateInfo", &model)
 
-		fmt.Println("****公司信息----model****", model)
-
 		if err2 == nil {
 			errinfo.Message = "注册成功！"
 			errinfo.Code = 0
@@ -91,7 +99,7 @@ func (this *OilCorporateInfoController) AddEntity() {
 		}
 
 	} else {
-		errinfo.Message = "账户注册失败，账号已存在！"
+		errinfo.Message = "注册失败，账号已存在！"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

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

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; overflow-y: auto; background-color: white" >
+  <div style="width: 100%; background-color: white" >
     <sticky class-name="sub-navbar2">
       <div class="top-wrapper">
         <div style="margin-top: 5px; float: left;">
@@ -7,13 +7,18 @@
             <img src="../assets/img/title_gongfang.png" style="height:35px;" />
           </router-link>
         </div>
+        <div style="float: right;">
+          <router-link :to="'/login'">
+            <el-button type="info" size="small" round>登录供方管理系统</el-button>
+          </router-link>
+        </div>
       </div>
     </sticky>
 
-    <div style="background-color: white">
+    <div style="background-color: white;">
       <div class="top-wrapper">
         <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
-          <el-menu-item index="1">
+          <el-menu-item index="1" style="font-size: large;">
             <span>供方企业注册</span>
           </el-menu-item>
           <!-- <el-menu-item index="2">
@@ -22,192 +27,195 @@
         </el-menu>
       </div>
       
-      <el-card class="box-card">
-        <div class="components-container home-wrapper" style="background-color: white" v-if="activeIndex==1">
-          <el-form label-width="135px" ref="formData" :model="formData" :rules="rulesform" size="mini">
-            <el-row>
-              <el-col :span="10">
-                <el-form-item label="公司名称" style="width: 100%" prop="SupplierName">
-                  <el-input v-model="formData.SupplierName"  placeholder="请输入公司名称"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="14">
-                <el-form-item label="公司所在地" style="width: 100%" prop="Address">
-                  <el-cascader
-                    expand-trigger="hover"
-                    :options="countryoptions"
-                    :props="countryprops"
-                    change-on-select
-                    v-model="addressOptions"
-                    style="width: 100%">
-                  </el-cascader>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="详细地址" style="width: 100%" prop="DetailAddress">
-                  <el-input v-model="formData.DetailAddress"  placeholder="请输入详细地址"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="中石油供应商证书号"   label-width="150px" style="width: 100%" prop="OilCertificateNo">
-                  <el-input v-model="formData.OilCertificateNo"  placeholder="中石油供应商证书号"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="工商注册号"  label-width="100px" style="width: 100%" prop="CommercialNo">
-                  <el-input v-model="formData.CommercialNo"  placeholder="工商注册号"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="组织机构代码"   style="width: 100%" prop="OrganCode">
-                  <el-input v-model="formData.OrganCode"  placeholder="组织机构代码"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="税务登记证国税号"   style="width: 100%" prop="CountryTaxNo">
-                  <el-input v-model="formData.CountryTaxNo"  placeholder="税务登记证国税号"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="税务登记证地税号"   style="width: 100%" prop="LocalTaxNo">
-                  <el-input v-model="formData.LocalTaxNo"  placeholder="税务登记证地税号"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="营业范围"  style="width: 100%" prop="BusinessScope">
-                  <el-input v-model="formData.BusinessScope" placeholder="请输入营业范围" type="textarea" autosize></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="法定代表人姓名"   style="width: 100%" prop="LegalPerson">
-                  <el-input v-model="formData.LegalPerson"  placeholder="法定代表人姓名"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="行业类别代码"   style="width: 100%" prop="CategoryCode">
-                  <el-input v-model="formData.CategoryCode"  placeholder="行业类别代码"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="行业类别名称"   style="width: 100%" prop="CategoryName">
-                  <el-input v-model="formData.CategoryName"  placeholder="行业类别名称"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="注册资本"   style="width: 100%" prop="RegCapital" >
-                  <el-input type="number" v-model="formData.RegCapital" :min="1" placeholder="请输入注册资本">
-                    <template slot="append">万元</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="联系人姓名"   style="width: 100%" prop="ContactName">
-                  <el-input v-model="formData.ContactName"  placeholder="联系人姓名"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="公司类型"   style="width: 100%" prop="CompanyType">
-                  <el-input v-model="formData.CompanyType"  placeholder="请输入公司类型"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="开户银行"   style="width: 100%" prop="DepositBank">
-                  <el-input v-model="formData.DepositBank"  placeholder="请输入开户银行"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="银行账号"   style="width: 100%" prop="BankAccount">
-                  <el-input v-model="formData.BankAccount"  placeholder="请输入银行账号"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="成立时间"   style="width: 100%" prop="SetupTime">
-                  <el-date-picker v-model="formData.SetupTime" type="datetime" placeholder="请选择成立时间">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="电子邮箱"   style="width: 100%" prop="EMail" >
-                  <el-input v-model="formData.EMail" placeholder="请输入电子邮箱"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="银行信用等级"   style="width: 100%" prop="BankCreditRating">
-                  <el-input v-model="formData.BankCreditRating"  placeholder="请输入银行信用等级"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="公司电话"   style="width: 100%" prop="CompanyTel">
-                  <el-input v-model="formData.CompanyTel"  placeholder="请输入公司电话"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="公司网址"   style="width: 100%" prop="CompanyUrl">
-                  <el-input v-model="formData.CompanyUrl"  placeholder="请输入公司网址"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="移动电话"   style="width: 100%" prop="Mobile">
-                  <el-input v-model="formData.Mobile"  placeholder="请输入移动电话"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="固定电话"   style="width: 100%" prop="Telphone">
-                  <el-input v-model="formData.Telphone"  placeholder="请输入固定电话"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真"   style="width: 100%" prop="fax">
-                  <el-input v-model="formData.fax"  placeholder="请输入传真"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="QQ号码"   style="width: 100%" prop="QQ">
-                  <el-input v-model="formData.QQ"  placeholder="请输入QQ号码"></el-input>           
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="备注"  style="width: 100%" prop="Remark">
-                  <el-input v-model="formData.Remark" placeholder="请输入备注" type="textarea" autosize></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="6">
-                <el-form-item label="账号/Email"   style="width: 100%" prop="UserName">
-                  <el-input v-model="formData.UserName" placeholder="请输入账号"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="用户名"   style="width: 100%" prop="Realname">
-                  <el-input v-model="formData.Realname" placeholder="请输入用户名"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">              
-                <el-form-item label="密码"  style="width: 100%" prop="UserPass" >
-                  <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="确认密码"  style="width: 100%" prop="UserPass2" >
-                  <el-input type="password" v-model="formData.UserPass2" auto-complete="off" placeholder="请输入确认密码"></el-input>
-                </el-form-item>
-              </el-col>
-              <!-- <el-form-item label="验证码" prop="telep"  style="width: 100%">
-                </el-form-item>                           
-                <el-form-item label="短信验证码" prop="phober"  style="width: 100%">
-                </el-form-item>             
-                <el-checkbox v-model="checked1" style="margin-left: 80px">阅读并同意</el-checkbox>
-              <router-link to="#">《麦吉轮用户注册协议》</router-link><router-link to="#">《隐私政策》</router-link> -->
-            </el-row>
-            <el-row style="margin-left: 40%; margin-top: 10px; margin-bottom: 20px;">
-              <el-button type="primary" @click="register" style="width: 30%">立即注册</el-button>
-            </el-row>
-
-          </el-form>
+      <el-card>
+        <div class="home-wrapper" v-if="activeIndex==1">
+            <el-form label-width="135px" ref="formData" :model="formData" :rules="rules" size="mini">
+              <el-row>
+                <el-col :span="10">
+                  <el-form-item label="公司名称" style="width: 100%" prop="SupplierName">
+                    <el-input v-model="formData.SupplierName"  placeholder="请输入公司名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="14">
+                  <el-form-item label="公司所在地" style="width: 100%" prop="Address">
+                    <el-cascader
+                      expand-trigger="hover"
+                      :options="countryoptions"
+                      :props="countryprops"
+                      v-model="addressOptions"
+                      @change="getAreaChange"
+                      style="width: 100%">
+                    </el-cascader>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10">
+                  <el-form-item label="详细地址" style="width: 100%" prop="DetailAddress">
+                    <el-input v-model="formData.DetailAddress"  placeholder="请输入详细地址"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="中石油供应商证书号"   label-width="150px" style="width: 100%" prop="OilCertificateNo">
+                    <el-input v-model="formData.OilCertificateNo"  placeholder="中石油供应商证书号"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="工商注册号"  label-width="100px" style="width: 100%" prop="CommercialNo">
+                    <el-input v-model="formData.CommercialNo"  placeholder="工商注册号"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="组织机构代码"   style="width: 100%" prop="OrganCode">
+                    <el-input v-model="formData.OrganCode"  placeholder="组织机构代码"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="税务登记证国税号"   style="width: 100%" prop="CountryTaxNo">
+                    <el-input v-model="formData.CountryTaxNo"  placeholder="税务登记证国税号"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="税务登记证地税号"   style="width: 100%" prop="LocalTaxNo">
+                    <el-input v-model="formData.LocalTaxNo"  placeholder="税务登记证地税号"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="营业范围"  style="width: 100%" prop="BusinessScope">
+                    <el-input v-model="formData.BusinessScope" placeholder="请输入营业范围" type="textarea" autosize></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="法定代表人姓名"   style="width: 100%" prop="LegalPerson">
+                    <el-input v-model="formData.LegalPerson"  placeholder="法定代表人姓名"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="行业类别代码"   style="width: 100%" prop="CategoryCode">
+                    <el-input v-model="formData.CategoryCode"  placeholder="行业类别代码"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="行业类别名称"   style="width: 100%" prop="CategoryName">
+                    <el-input v-model="formData.CategoryName"  placeholder="行业类别名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="注册资本"   style="width: 100%" prop="RegCapital" >
+                    <el-input type="number" v-model="formData.RegCapital" :min="1" placeholder="请输入注册资本">
+                      <template slot="append">万元</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="联系人姓名"   style="width: 100%" prop="ContactName">
+                    <el-input v-model="formData.ContactName"  placeholder="联系人姓名"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="公司类型"   style="width: 100%" prop="CompanyType">
+                    <el-select v-model="formData.CompanyType" filterable allow-create placeholder="请输入公司类型" style="width: 100%">
+                      <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value" style="width: 100%"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="开户银行"   style="width: 100%" prop="DepositBank">
+                    <el-input v-model="formData.DepositBank"  placeholder="请输入开户银行"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="银行账号"   style="width: 100%" prop="BankAccount">
+                    <el-input v-model="formData.BankAccount"  placeholder="请输入银行账号"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="成立时间"  style="width: 100%" prop="SetupTime">
+                    <el-date-picker v-model="formData.SetupTime" style="width: 100%" type="datetime" placeholder="请选择成立时间">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="电子邮箱"   style="width: 100%" prop="EMail" >
+                    <el-input v-model="formData.EMail" placeholder="请输入电子邮箱"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="银行信用等级"   style="width: 100%" prop="BankCreditRating">
+                    <el-input v-model="formData.BankCreditRating"  placeholder="请输入银行信用等级"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="公司电话"   style="width: 100%" prop="CompanyTel">
+                    <el-input v-model="formData.CompanyTel"  placeholder="请输入公司电话"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="公司网址"   style="width: 100%" prop="CompanyUrl">
+                    <el-input v-model="formData.CompanyUrl"  placeholder="请输入公司网址"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="移动电话"   style="width: 100%" prop="Mobile">
+                    <el-input v-model="formData.Mobile"  placeholder="请输入移动电话"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="固定电话"   style="width: 100%" prop="Telphone">
+                    <el-input v-model="formData.Telphone"  placeholder="请输入固定电话"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="传真"   style="width: 100%" prop="Fax">
+                    <el-input v-model="formData.Fax"  placeholder="请输入传真"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="QQ号码"   style="width: 100%" prop="QQ">
+                    <el-input v-model="formData.QQ"  placeholder="请输入QQ号码"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="备注"  style="width: 100%" prop="Remark">
+                    <el-input v-model="formData.Remark" placeholder="请输入备注" type="textarea" autosize></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="6">
+                  <el-form-item label="账号/Email"   style="width: 100%" prop="UserName">
+                    <el-input v-model="formData.UserName" placeholder="请输入账号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="用户名"   style="width: 100%" prop="Realname">
+                    <el-input v-model="formData.Realname" placeholder="请输入用户名"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">              
+                  <el-form-item label="密码"  style="width: 100%" prop="UserPass" >
+                    <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="确认密码"  style="width: 100%" prop="UserPass2" >
+                    <el-input type="password" v-model="formData.UserPass2" auto-complete="off" placeholder="请输入确认密码"></el-input>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-form-item label="验证码" prop="telep"  style="width: 100%">
+                  </el-form-item>                           
+                  <el-form-item label="短信验证码" prop="phober"  style="width: 100%">
+                  </el-form-item>             
+                  <el-checkbox v-model="checked1" style="margin-left: 80px">阅读并同意</el-checkbox>
+                <router-link to="#">《麦吉轮用户注册协议》</router-link><router-link to="#">《隐私政策》</router-link> -->
+              </el-row>
+              <el-row style="margin-left: 40%; margin-top: 10px; margin-bottom: 20px;">
+                <el-button type="primary" @click="register" style="width: 30%">立即注册</el-button>
+              </el-row>
+            </el-form>
         </div>
       </el-card>
 
-      <!-- <div class="components-container home-wrapper" style="background-color: white" v-if="activeIndex==2">    
+      <!-- <div class="home-wrapper" style="background-color: white" v-if="activeIndex==2">    
       </div> -->
 
     </div>
@@ -224,21 +232,44 @@
 </template>
 
 <script>
+
   import Vue from 'vue'
   import Component from 'class-component'
   import Sticky from '@/components/Sticky'
   import axios from 'axios'
+  import api from '@/api/oilsupplier/supplier'
+
   @Component({
     data () {
+      var checkSupplierName =  (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入公司名称！'));
+        } else {
+          for (let i = 0; i < this.supplierNameList.length; i++) {
+            if (value == this.supplierNameList[i].SupplierName) {
+              this.$alert('该公司已注册！', '提示:', {
+                confirmButtonText: '确定',
+              })
+              // callback(new Error('该公司已注册！'));
+            } else {
+              callback();
+            }
+          }
+        }
+      };
       return {
         activeIndex: '1',
 
+        countryoptions: [],//全国省市列表
         countryprops: {
           value: 'name',
           label: 'name',
           children: 'districts'
         },
         addressOptions: [],
+        dictData: null, //字典信息
+        supplierNameList: [], //公司名列表
+        CompanyTypeOptions: [], //公司类型列表
 
         formData: {
           Id: '', //int
@@ -294,9 +325,12 @@
           HseTraining: ''
         },
 
-        rulesform: {
+        rules: {
           SupplierName: [
-            { required: true, message: '请输入公司名称', trigger: 'blur' }
+            { required: true, 
+              validator: checkSupplierName,
+              trigger: 'blur'
+            }
           ],
           Address: [
             { required: true, message: '请输入公司所在地', trigger: 'blur' }
@@ -304,9 +338,9 @@
           DetailAddress: [
             { required: true, message: '请输入公司详细地址', trigger: 'blur' }
           ],
-          OilCertificateNo: [
-            { required: true, message: '请输入中石油供应商证书号', trigger: 'blur' }
-          ],
+          // OilCertificateNo: [
+          //   { required: true, message: '请输入中石油供应商证书号', trigger: 'blur' }
+          // ],
           CommercialNo: [
             { required: true, message: '请输入工商注册号', trigger: 'blur' }
           ],
@@ -369,7 +403,7 @@
           Telphone: [
             { required: true, message: '请输入固定电话', trigger: 'blur' }
           ],
-          fax: [
+          Fax: [
             { required: true, message: '请输入传真', trigger: 'blur' }
           ],
           // QQ: [
@@ -395,7 +429,8 @@
     },
 
     created () {
-      
+      this.getDictOptions() //获取字典信息
+      this.getSupplierNameList() //获取已注册的公司
     },
     components: {
       Sticky
@@ -408,7 +443,7 @@
         //邮箱验证
         let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
         if (!re.test(_this.formData.EMail)) {
-          this.$alert('请输入正确的邮箱地址!', '提示', {
+          this.$alert('请输入正确的电子邮箱!', '提示', {
             confirmButtonText: '确定',
           })
           return
@@ -421,7 +456,14 @@
         //   })
         //   return
         // }
-        //密码验证
+        //密码验证 字母数字组成6-16位 正向断言
+        let re2 = /^(?=.*[0-9])[0-9A-Za-z!@#$_&*]{6,20}$/g
+        if (!re2.test(_this.formData.UserPass)) {
+          this.$alert('请输入正确格式的密码(6——20位，包含数字)！', '提示', {
+            confirmButtonText: '确定',
+          })
+          return
+        }
         if (_this.formData.UserPass != _this.formData.UserPass2) {
           this.$alert('两次输入的密码不一致，请重新输入!', '提示', {
             confirmButtonText: '确定',
@@ -434,7 +476,7 @@
         _this.formData.RegCapital = parseFloat(_this.formData.RegCapital)
         _this.formData.Currency = '万元' //币种
 
-        // console.log("****_this.formData*****",_this.formData)
+        console.log("****_this.formData*****",_this.formData)
 
         _this.$axios.post('/register/addentity', _this.formData)
           .then(function (response) {
@@ -442,7 +484,7 @@
               _this.$alert(response.data.message, '提示', {
                 confirmButtonText: '确定',
               })
-              _this.$router.push('/login') //跳转到登录页
+              // _this.$router.push('/login') //跳转到登录页
             } else {
               _this.$alert(response.data.message, '提示', {
                 confirmButtonText: '确定',
@@ -454,6 +496,44 @@
           })
       },
 
+      //获取已注册的公司
+      getSupplierNameList() {
+        let _this = this
+        _this.$axios.get('/register/getsuppliername', {})
+          .then(res => {
+            _this.supplierNameList = res.data.items
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
+      //获取具体的省市县
+      getAreaChange(value) {
+        this.formData.Province = value[0]
+        this.formData.City = value[1]
+        this.formData.Street = value[2]
+      },
+
+      //获取字典信息：
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          this.dictData = res.data.items
+          this.getCityList(this.dictData['GaodeMapChinaAreas'])
+          this.CompanyTypeOptions = this.dictData['CompanyType']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      //获取全国城市列表
+      getCityList(val) {
+        let resultData = JSON.parse(val)
+        let countstr = JSON.stringify(resultData.districts[0].districts)
+        countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+        this.countryoptions = JSON.parse(countstr)
+      },
+
       //格式化页面到数据库的时间格式
       formatDateTime(date) {
         var y = date.getFullYear()
@@ -491,26 +571,16 @@
     layout() {
       return 'empty'
     }
-    countryoptions = []
-    asyncData({ req, params }) {
-      return axios.get('http://restapi.amap.com/v3/config/district?key=13f54664eb5a883195604db09d3fba5c&subdistrict=3')
-        .then((res) => {
-          let countstr = JSON.stringify(res.data.districts[0].districts)
-          countstr = countstr.replace(/\,\"districts\"\:\[\]/g,'')
-          return { countryoptions: JSON.parse(countstr) }
-        })
-    }
   }
 
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
   @import '../assets/styles/base/variables';
 
-  // .components-container div {
-  //   margin-top: 20px;
-  // }
-
+  body {
+    overflow: auto;
+  }
   .top-wrapper {
     margin: 0px auto;
     width: 1004px;
@@ -523,13 +593,15 @@
     width: 1004px;
     flex-direction: column;
     margin-bottom: 45px;
+    background-color: white;
+    overflow: auto;
   }
 
   .foot-wrapper{
     margin:0px auto;
     width: 1004px;
     display: flex;
-    alignment: center;
+    // alignment: center;
     align-items: center;
     flex-direction: column;
   }