注册显示信息等

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

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

@@ -93,6 +93,9 @@ func (this *OilCorporateInfoController) GetCompanyInfo() {
 
 	if len(model) < 1 { //若供方表没有公司信息
 		model, _ = svcRegister.DBE.QueryString(sql2)
+		if model!= nil{
+			model[0]["Remark"]=""
+		}
 	}
 
 	var datainfo DataInfo

src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -426,7 +426,6 @@
 
     data() {
       var checkemail= (rule, value, callback) => {
-        console.log(value)
         if (value) {
           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(value)) {
@@ -440,7 +439,6 @@
         }
       };
       var checkCommercialNo =  (rule, value, callback) => {
-        console.log("showorhidflag"+this.showorhidflag)
         if (!value) {
           callback(new Error('请输入统一社会信用代码'));
         } else {
@@ -590,7 +588,7 @@
           Province: [{
             required: true,
             message: '请选择省市区',
-            trigger: 'change'
+            trigger: 'blur'
           }, ],
           Address: [{
             required: true,
@@ -664,7 +662,7 @@
           LinkProvince: [{
             required: true,
             message: '请选择省市区',
-            trigger: 'change'
+            trigger: 'blur'
           }, ],
           LinkAddress: [{
             required: true,
@@ -679,7 +677,12 @@
         },
       }
     },
-    created() {},
+    created() {
+        if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
+        this.formData.SupplierName=this.authUser.Profile.Realname
+        this.searchSupplierName()
+      }
+    },
     watch: {
       dictData: {
         handler(newName, oldName) {
@@ -690,7 +693,6 @@
     },
     methods: {
       showorhid(val){
-        console.log(val)
         if(val=='1'||val=='2'){
           this.showorhidflag='hid'
         }
@@ -739,7 +741,11 @@
               _this.formData.DepositBank = res.data.items[0].DepositBank
               _this.formData.BankAccount = res.data.items[0].BankAccount
               _this.formData.ContactName = res.data.items[0].ContactName
-              _this.formData.Mobile = res.data.items[0].Mobile
+              if(res.data.items[0].Mobile!=null&&res.data.items[0].Mobile!=""){
+                  _this.formData.Mobile = res.data.items[0].Mobile
+              }else{
+                 _this.formData.Mobile = res.data.items[0].UserTelephone
+              }
               _this.formData.Telphone = res.data.items[0].Telphone
               _this.formData.Fax = res.data.items[0].Fax
               _this.formData.CompanyTel = res.data.items[0].CompanyTel

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -481,12 +481,10 @@
         default: true
       }
     },
-
     data () {
 
 
       var checkemail= (rule, value, callback) => {
-        console.log(value)
           if (value) {
             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(value)) {
@@ -501,7 +499,6 @@
         };
 
       var checkCommercialNo =  (rule, value, callback) => {
-         console.log("showorhidflag"+this.showorhidflag)
         if (!value) {
           callback(new Error('请输入统一社会信用代码'));
         } else {
@@ -685,7 +682,7 @@
           Province: [{
             required: true,
             message: '请选择省市区',
-            trigger: 'change'
+            trigger: 'blur'
           }],
           Address: [{
             required: true,
@@ -732,7 +729,7 @@
           LinkProvince: [{
             required: true,
             message: '请选择省市区',
-            trigger: 'change'
+            trigger: 'blur'
           }],
           LinkAddress: [{
             required: true,
@@ -748,6 +745,10 @@
       }
     },
     created () {
+      if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
+        this.formData.SupplierName=this.authUser.Profile.Realname
+        this.searchSupplierName()
+      }
     },
     watch: {
       dictData: {
@@ -779,7 +780,6 @@
       },
 
       showorhid(val){
-          console.log(val)
           if(val=='1'||val=='2'){
             this.showorhidflag='hid'
           }
@@ -830,7 +830,11 @@
               _this.formData.DepositBank = res.data.items[0].DepositBank
               _this.formData.BankAccount = res.data.items[0].BankAccount
               _this.formData.ContactName = res.data.items[0].ContactName
-              _this.formData.Mobile = res.data.items[0].Mobile
+              if(res.data.items[0].Mobile!=null&&res.data.items[0].Mobile!=""){
+                  _this.formData.Mobile = res.data.items[0].Mobile
+              }else{
+                 _this.formData.Mobile = res.data.items[0].UserTelephone
+              }
               _this.formData.Telphone = res.data.items[0].Telphone
               _this.formData.Fax = res.data.items[0].Fax
               _this.formData.CompanyTel = res.data.items[0].CompanyTel

src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -408,7 +408,6 @@
     },
     data () {
         var checkemail= (rule, value, callback) => {
-        console.log(value)
           if (value) {
             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(value)) {
@@ -422,7 +421,6 @@
           }
         };
         var checkCommercialNo =  (rule, value, callback) => {
-         console.log("showorhidflag"+this.showorhidflag)
         if (!value) {
           callback(new Error('请输入统一社会信用代码'));
         } else {
@@ -571,7 +569,7 @@
           Province: [{
             required: true,
             message: '请选择省市区',
-            trigger: 'change'
+            trigger: 'blur'
           }, ],
           Address: [{
             required: true,
@@ -645,7 +643,7 @@
           LinkProvince: [{
             required: true,
             message: '请选择省市区',
-            trigger: 'change'
+            trigger: 'blur'
           }, ],
           LinkAddress: [{
             required: true,
@@ -662,6 +660,10 @@
     },
 
     created () {
+        if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
+        this.formData.SupplierName=this.authUser.Profile.Realname
+        this.searchSupplierName()
+      }
     },
     watch: {
       dictData: {
@@ -673,7 +675,6 @@
     },
     methods: {
        showorhid(val){
-          console.log(val)
           if(val=='1'||val=='2'){
             this.showorhidflag='hid'
           }
@@ -722,7 +723,11 @@
               _this.formData.DepositBank = res.data.items[0].DepositBank
               _this.formData.BankAccount = res.data.items[0].BankAccount
               _this.formData.ContactName = res.data.items[0].ContactName
-              _this.formData.Mobile = res.data.items[0].Mobile
+              if(res.data.items[0].Mobile!=null&&res.data.items[0].Mobile!=""){
+                  _this.formData.Mobile = res.data.items[0].Mobile
+              }else{
+                 _this.formData.Mobile = res.data.items[0].UserTelephone
+              }
               _this.formData.Telphone = res.data.items[0].Telphone
               _this.formData.Fax = res.data.items[0].Fax
               _this.formData.CompanyTel = res.data.items[0].CompanyTel

src/dashoo.cn/frontend_web/src/pages/oilsupplier/companyaudit/index.vue

@@ -67,22 +67,22 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="公司名称" label-width="150px" style="width: 100%" prop="SupplierName">
-              <el-input v-model="formData.SupplierName" disabled></el-input>
+              <el-input v-model="formData.SupplierName" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="统一社会信用代码" label-width="150px" style="width: 100%" prop="CommercialNo">
-              <el-input v-model="formData.CommercialNo" disabled></el-input>
+              <el-input v-model="formData.CommercialNo" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="法定代表人姓名" label-width="150px" style="width: 100%" prop="LegalPerson">
-              <el-input v-model="formData.LegalPerson" disabled></el-input>
+              <el-input v-model="formData.LegalPerson" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
-              <el-input v-model="formData.LegalPersonId"  disabled></el-input>
+              <el-input v-model="formData.LegalPersonId"  readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -102,12 +102,12 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="联系人姓名" label-width="150px" style="width: 100%" prop="ContactName">
-              <el-input v-model="formData.ContactName" disabled></el-input>
+              <el-input v-model="formData.ContactName" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
-              <el-input v-model="formData.ContactId" disabled></el-input>
+              <el-input v-model="formData.ContactId" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -129,17 +129,17 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="账号/Email" label-width="150px" style="width: 100%" prop="UserName">
-              <el-input v-model="formData.UserName" disabled></el-input>
+              <el-input v-model="formData.UserName" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="用户名"  label-width="150px" style="width: 100%" prop="UserRealName">
-              <el-input v-model="formData.UserRealName" disabled></el-input>
+              <el-input v-model="formData.UserRealName" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="手机号"   style="width: 100%" prop="UserTelephone">
-              <el-input v-model="formData.UserTelephone" disabled></el-input>
+              <el-input v-model="formData.UserTelephone" readonly></el-input>
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -291,12 +291,20 @@
           if (!re1.test(this.formData.UserName)) {
             callback(new Error('请输入正确格式的用户名（大于6位的英文字母和数字组合）'));
           } else {
-                this.checkUserNameIsExist()
-                if (this.userIsExist) {
+        let params = {
+          UserName: this.formData.UserName,
+        }
+        this.$axios.get('/register/usernameisexist', {params})
+          .then(res => {
+             if ( res.data.item) {
                   callback(new Error('该用户名已被注册'));
                 } else {
                   callback();
                 }
+          })
+          .catch(err => {
+            console.error(err)
+          })     
           }
         }
       };
@@ -342,7 +350,6 @@
         orgOptions: [],
         auditorg: '',
         chooseAuditorVisible: false,
-        userIsExist: false, //默认新用户不存在
         legalHaspic: false,
         contactHaspic: false,
         legalImages: [],
@@ -611,20 +618,6 @@
         })
     },
 
-      //判断用户名是否存在
-      checkUserNameIsExist() {
-        let _this = this
-        let params = {
-          UserName: _this.formData.UserName,
-        }
-        _this.$axios.get('/register/usernameisexist', {params})
-          .then(res => {
-            _this.userIsExist = res.data.item
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
 
       //上传超过限制数
       uploadExceed(files, fileList) {