2
3
Преглед на файлове

解决企业用户无法查询到问题

ljm преди 6 години
родител
ревизия
2c7e538076

+ 1 - 1
src/dashoo.cn/backend/api/business/register/oilcorporateinfo.go

@@ -13,7 +13,7 @@ type OilCorporateInfo struct {
 	MgrUnit          string    `xorm:"comment('管理单位') VARCHAR(50)"`
 	OperType         string    `xorm:"comment('经营方式') CHAR(1)"`
 	Country          string    `xorm:"comment('国家') VARCHAR(20)"`
-	CommercialNo     string    `xorm:"comment('工商注册号') VARCHAR(50)"`
+	CommercialNo     string    `xorm:"comment('工商注册号/统一社会信用代码') VARCHAR(50)"`
 	OrganCode        string    `xorm:"comment('组织机构代码') VARCHAR(50)"`
 	CountryTaxNo     string    `xorm:"comment('税务登记证国税编号') VARCHAR(50)"`
 	LocalTaxNo       string    `xorm:"comment('税务登记证地税编号') VARCHAR(50)"`

+ 1 - 0
src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -91,6 +91,7 @@ func (this *OilCorporateInfoController) AddEntity() {
 	userentity.IsCompanyUser = 1
 	userentity.Departmentid = "100000171"
 	userentity.Departmentname = "供方企业"
+	userentity.Createuserid = 284
 
 	//处理密码
 	pwd, key, errrk := utils.TripleDesEncrypt(userInfo.UserPass)

+ 19 - 65
src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -31,75 +31,29 @@
         <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="8">
+                <el-col :span="24">
                   <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="8">
-                  <el-form-item label="公司所在地" style="width: 100%" prop="Address">
-                    <el-cascader
-                      expand-trigger="hover"
-                      :options="countryoptions"
-                      :props="countryprops"
-                      v-model="addressOptions"
-                      style="width: 100%">
-                    </el-cascader>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <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="邮编" style="width: 100%" prop="ZipCode">
-                    <el-input v-model="formData.ZipCode"  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="8">
-                  <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 label="统一社会信用代码"  label-width="140px" 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="LegalPerson">
-                    <el-input v-model="formData.LegalPerson"  placeholder="法定代表人姓名"></el-input>           
+                    <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-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-input v-model="formData.CategoryName"  placeholder="请输入行业类别名称"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -111,7 +65,7 @@
                 </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-input v-model="formData.ContactName"  placeholder="请输入联系人姓名"></el-input>           
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -349,7 +303,7 @@
           //   { required: true, message: '请输入中石油供应商证书号', trigger: 'blur' }
           // ],
           CommercialNo: [
-            { required: true, message: '请输入工商注册号', trigger: 'blur' }
+            { required: true, message: '请输入统一社会信用代码', trigger: 'blur' }
           ],
           OrganCode: [
             { required: true, message: '请输入组织机构代码', trigger: 'blur' }
@@ -436,7 +390,7 @@
     },
 
     created () {
-      this.getDictOptions() //获取字典信息
+      // this.getDictOptions() //获取字典信息
       this.getSupplierNameList() //获取已注册的公司
     },
     components: {
@@ -456,17 +410,17 @@
           return
         }
         //手机号验证
-        // let re1 = /^[1][3456789]\d{9}$/
-        // if (!re.test(_this.formData.Mobile)) {
-        //   this.$alert('请填写正确的手机号!', '提示', {
-        //     confirmButtonText: '确定',
-        //   })
-        //   return
-        // }
+        let re1 = /^[1][3456789]\d{9}$/
+        if (!re.test(_this.formData.Mobile)) {
+          this.$alert('请填写正确的手机号!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return
+        }
         //密码验证 字母数字组成6-16位 正向断言
-        let re2 = /^(?=.*[0-9])[0-9A-Za-z!@#$_&*]{6,20}$/g
+        let re2 = /^(?=.*[0-9])[0-9A-Za-z!@#$_&*]{6,10}$/g
         if (!re2.test(_this.formData.UserPass)) {
-          this.$alert('请输入正确格式的密码(6——20位,包含数字)!', '提示', {
+          this.$alert('请输入正确格式的密码(6——10位,包含数字)!', '提示', {
             confirmButtonText: '确定',
           })
           return
@@ -503,7 +457,7 @@
               _this.$alert(response.data.message, '提示', {
                 confirmButtonText: '确定',
               })
-              // _this.$router.push('/login') //跳转到登录页
+              _this.$router.push('/login') //跳转到登录页
             } else {
               _this.$alert(response.data.message, '提示', {
                 confirmButtonText: '确定',