注册页面第2版

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

@@ -26,11 +26,15 @@ type OilCorporateInfo struct {
 	ZipCode          string    `xorm:"comment('邮编') VARCHAR(20)"`
 	BusinessScope    string    `xorm:"comment('营业范围') TEXT"`
 	LegalPerson      string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
+	LegalPersonId    string    `xorm:"comment('法定代表人身份证号') VARCHAR(18)"`
+	LegalPersonURL   string    `xorm:"comment('法定代表人身份证扫描件地址') VARCHAR(500)"`
 	CategoryCode     string    `xorm:"comment('行业类别代码') VARCHAR(10)"`
 	CategoryName     string    `xorm:"comment('行业类别名称') VARCHAR(20)"`
 	RegCapital       float32   `xorm:"default 0 comment('注册资本') FLOAT"`
 	Currency         string    `xorm:"comment('币种') VARCHAR(10)"`
 	ContactName      string    `xorm:"comment('联系人姓名') VARCHAR(20)"`
+	ContactId        string    `xorm:"comment('联系人身份证号') VARCHAR(18)"`
+	ContactURL       string    `xorm:"comment('联系人身份证扫描件地址') VARCHAR(500)"`
 	CompanyType      string    `xorm:"comment('公司类型') VARCHAR(20)"`
 	SetupTime        time.Time `xorm:"comment('成立时间') Date"`
 	DepositBank      string    `xorm:"comment('开户银行') VARCHAR(50)"`
@@ -44,6 +48,7 @@ type OilCorporateInfo struct {
 	QQ               string    `xorm:"comment('QQ号码') VARCHAR(20)"`
 	CompanyUrl       string    `xorm:"comment('公司网址') VARCHAR(20)"`
 	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
+	CheckStatus      int       `xorm:"default 0 comment('二级单位审核状态，0：未通过，1：通过') INT(1)"`
 	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	LinkAddress      string    `xorm:"comment('通信地址-单位地址') VARCHAR(500)"`
 	LinkProvince     string    `xorm:"comment('通信地址-省直辖市') VARCHAR(20)"`

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

@@ -108,10 +108,11 @@ func (this *OilCorporateInfoController) AddEntity() {
 	userentity.AccCode = "s5OVE"
 
 	userSvc := userRole.GetUserService(utils.DBE)
+	// 添加新用户
 	err := userSvc.AddUser(&userentity)
 
 	if err == nil {
-		//开始添加公司信息
+		// 添加公司信息
 		model.UserId = userentity.Id
 		model.CreateOn = time.Now()
 		model.CreateBy = userentity.Realname

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

@@ -37,20 +37,30 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="统一社会信用代码"  label-width="140px" style="width: 100%" prop="CommercialNo">
-                    <el-input v-model="formData.CommercialNo"  placeholder="请输入统一社会信用代码"></el-input>           
+                  <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="24">
-                  <el-form-item label="法定代表人姓名"   style="width: 100%" prop="LegalPerson">
-                    <el-input v-model="formData.LegalPerson"  placeholder="请输入法定代表人姓名"></el-input>           
+                <el-col :span="7">
+                  <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="24">
+                <el-col :span="17">
+                  <el-form-item label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
+                    <el-input v-model="formData.LegalPersonId"  placeholder="法定代表人身份证号"></el-input>           
+                  </el-form-item>
+                </el-col>
+                <el-col :span="7">
                   <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="17">
+                  <el-form-item label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
+                    <el-input v-model="formData.ContactId"  placeholder="请输入联系人身份证号"></el-input>           
+                  </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
                 <el-col :span="6">
@@ -132,13 +142,6 @@
       return {
         activeIndex: '1',
 
-        countryoptions: [],//全国省市列表
-        countryprops: {
-          value: 'adcode',
-          label: 'name',
-          children: 'districts'
-        },
-        addressOptions: [], //已选择的省市区
         dictData: null, //字典信息
         supplierNameList: [], //公司名列表
         CompanyTypeOptions: [], //公司类型列表
@@ -169,11 +172,15 @@
           ZipCode: '',
           BusinessScope: '',
           LegalPerson: '',
+          LegalPersonId: '',
+          LegalPersonURL: '',
           CategoryCode: '',
           CategoryName: '',
           RegCapital: 0, //float32
           Currency: '',
           ContactName: '',
+          ContactId: '',
+          ContactURL: '',
           CompanyType: '',
           SetupTime: '', //time
           DepositBank: '',
@@ -187,6 +194,7 @@
           QQ: '',
           CompanyUrl: '',
           Remark: '',
+          CheckStatus: 0, //二级单位审核状态，0：未通过，1：通过
           IsDelete: 0, //删除状态，0正常，1已删除
           LinkAddress: '',
           LinkProvince: '',
@@ -204,86 +212,21 @@
               trigger: 'blur'
             }
           ],
-          Address: [
-            { required: true, message: '请输入公司所在地', trigger: 'blur' }
-          ],
-          DetailAddress: [
-            { required: true, message: '请输入公司详细地址', trigger: 'blur' }
-          ],
-          ZipCode: [
-            { required: true, message: '请输入邮编', trigger: 'blur' }
-          ],
-          // OilCertificateNo: [
-          //   { required: true, message: '请输入中石油供应商证书号', trigger: 'blur' }
-          // ],
-          CommercialNo: [
-            { required: true, message: '请输入统一社会信用代码', trigger: 'blur' }
-          ],
           OrganCode: [
             { required: true, message: '请输入组织机构代码', trigger: 'blur' }
           ],
-          CountryTaxNo: [
-            { required: true, message: '请输入税务登记证国税编号', trigger: 'blur' }
-          ],
-          LocalTaxNo: [
-            { required: true, message: '请输入税务登记证地税编号', trigger: 'blur' }
-          ],
-          BusinessScope: [
-            { required: true, message: '请输入营业范围', trigger: 'blur' }
-          ],
           LegalPerson: [
             { required: true, message: '请输入法定代表人姓名', trigger: 'blur' }
           ],
-          CategoryCode: [
-            { required: true, message: '请输入行业类别代码', trigger: 'blur' }
-          ],
-          CategoryName: [
-            { required: true, message: '请输入行业类别名称', trigger: 'blur' }
-          ],
-          RegCapital: [
-            { required: true, message: '请输入注册资本', trigger: 'blur' }
+          LegalPersonId: [
+            { required: true, message: '请输入法定代表人身份证号', trigger: 'blur' }
           ],
           ContactName: [
             { required: true, message: '请输入联系人姓名', trigger: 'blur' }
           ],
-          CompanyType: [
-            { required: true, message: '请输入公司类型', trigger: 'blur' }
-          ],
-          DepositBank: [
-            { required: true, message: '请输入开户银行', trigger: 'blur' }
-          ],
-          BankAccount: [
-            { required: true, message: '请输入银行账号', trigger: 'blur' }
-          ],
-          SetupTime: [
-            { required: true, message: '请输入成立时间', trigger: 'blur' }
+          ContactId: [
+            { required: true, message: '请输入联系人身份证号', trigger: 'blur' }
           ],
-          EMail: [{
-            required: true,
-            message: '请输入邮箱',
-            trigger: 'blur'
-          }],
-          BankCreditRating: [
-            { required: true, message: '请输入银行信用等级', trigger: 'blur' }
-          ],
-          CompanyTel: [
-            { required: true, message: '请输入公司电话', trigger: 'blur' }
-          ],
-          CompanyUrl: [
-            { required: true, message: '请输入公司网址', trigger: 'blur' }
-          ],
-          Mobile: [
-            { required: true, message: '请输入移动电话', trigger: 'blur' }
-          ],
-          Telphone: [
-            { required: true, message: '请输入固定电话', trigger: 'blur' }
-          ],
-          Fax: [
-            { required: true, message: '请输入传真', trigger: 'blur' }
-          ],
-          // QQ: [
-          //   { required: true, message: '请输入QQ号码', trigger: 'blur' }
-          // ],
           UserName: [
             { required: true, message: '请输入账号', trigger: 'blur' }
           ],
@@ -304,7 +247,6 @@
     },
 
     created () {
-      // this.getDictOptions() //获取字典信息
       this.getSupplierNameList() //获取已注册的公司
     },
     components: {
@@ -314,27 +256,26 @@
       //注册
       register () {
         let _this = this
-        
-        //邮箱验证
-        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('请输入正确的电子邮箱!', '提示', {
+
+        //身份证号验证
+        let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+        if (!re1.test(_this.formData.LegalPersonId)) {
+          this.$alert('请填写正确的法定代表人身份证号！', '提示', {
             confirmButtonText: '确定',
           })
           return
         }
-        //手机号验证
-        let re1 = /^[1][3456789]\d{9}$/
-        if (!re.test(_this.formData.Mobile)) {
-          this.$alert('请填写正确的手机号！', '提示', {
+        if (!re1.test(_this.formData.ContactId)) {
+          this.$alert('请填写正确的联系人身份证号！', '提示', {
             confirmButtonText: '确定',
           })
           return
         }
-        //密码验证 字母数字组成6-16位 正向断言
+
+        //密码验证 字母数字组成6-10位 正向断言
         let re2 = /^(?=.*[0-9])[0-9A-Za-z!@#$_&*]{6,10}$/g
         if (!re2.test(_this.formData.UserPass)) {
-          this.$alert('请输入正确格式的密码(6——10位，包含数字)！', '提示', {
+          this.$alert('请输入正确格式的密码(6——10位，包含英文字母、数字)！', '提示', {
             confirmButtonText: '确定',
           })
           return
@@ -345,25 +286,6 @@
           })
           return
         }
-      
-        
-        _this.formData.Address =  _this.formData.DetailAddress
-        if (_this.addressOptions[0]) {
-          _this.formData.Province = _this.addressOptions[0]
-          _this.formData.LinkProvince = _this.addressOptions[0]
-        }
-        if (_this.addressOptions[1]) {
-          _this.formData.City = _this.addressOptions[1]
-          _this.formData.LinkCity = _this.addressOptions[1]
-        }
-        if (_this.addressOptions[2]) {
-          _this.formData.Street = _this.addressOptions[2]
-          _this.formData.LinkStreet = _this.addressOptions[2]
-        }
-        _this.formData.LinkAddress =  _this.formData.DetailAddress
-        _this.formData.LinkZipCode =  _this.formData.ZipCode
-        _this.formData.RegCapital = parseFloat(_this.formData.RegCapital)
-        _this.formData.Currency = '万元' //币种
 
         _this.$axios.post('/register/addentity', _this.formData)
           .then(function (response) {
@@ -395,37 +317,6 @@
           })
       },
 
-      //获取具体的省市县
-      getAreaChange(value) {
-        this.formData.Province = value[0]
-        this.formData.City = value[1]
-        this.formData.Street = value[2]
-        this.formData.LinkProvince = value[0]
-        this.formData.LinkCity = value[1]
-        this.formData.LinkStreet = value[2]
-      },
-
-      //获取字典信息：
-      getDictOptions() {
-        let _this = this
-        _this.$axios.get('/register/getdictlist', {})
-        .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()