修改部分功能

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

src/dashoo.cn/frontend_web/src/components/VCode.vue

@@ -108,7 +108,7 @@ export default {
     },
     drawLine (ctx) {
       // 绘制干扰线
-      for (let i = 0; i < 2; i++) {
+      for (let i = 0; i < 0; i++) {
         ctx.strokeStyle = this.randomColor(
           this.lineColorMin,
           this.lineColorMax
@@ -127,7 +127,7 @@ export default {
     },
     drawDot (ctx) {
       // 绘制干扰点
-      for (let i = 0; i < 25; i++) {
+      for (let i = 0; i < 0; i++) {
         ctx.fillStyle = this.randomColor(0, 255)
         ctx.beginPath()
         ctx.arc(

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

@@ -97,7 +97,7 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="邮箱"  label-width="150px" style="width: 100%" prop="EMail">
-                    <el-input v-model="formData.EMail" placeholder="请输入邮箱"></el-input>
+                    <el-input v-model="formData.EMail" placeholder="用于接收电子发票"></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -175,7 +175,6 @@
 </template>
 
 <script>
-
   import Vue from 'vue'
   import Component from 'class-component'
   import Sticky from '@/components/Sticky'
@@ -186,7 +185,7 @@
 
   @Component({
     data () {
-        var checkemail= (rule, value, callback) => {
+      var checkemail = (rule, value, callback) => {
         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)) {
@@ -194,72 +193,71 @@
           } else {
             callback()
           }
-        }
-        else{
+        } else {
           callback(new Error('请输入邮箱地址'))
         }
-      };
-      var checkSupplierName =  (rule, value, 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()
-                }
+      }
+      var checkSupplierName = (rule, value, 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 === '') {
-          callback(new Error('请输入统一社会信用代码'));
+          callback(new Error('请输入统一社会信用代码'))
         } else {
           let re4 = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
           if (!re4.test(this.formData.CommercialNo)) {
-            callback(new Error('请填写正确的18位统一社会信用代码'));
+            callback(new Error('请填写正确的18位统一社会信用代码'))
           } else {
-        this.$axios.get('/register/getcommercialno?commercialno='+value, {})
-          .then(res => {
-               if(res.data.item){
-             callback(new Error('该统一社会信用代码与其他公司重复'));
-           }else{
-             callback()
-           }
-          })
-          .catch(err => {
-            console.error(err)
-          })
-         }
+            this.$axios.get('/register/getcommercialno?commercialno=' + value, {})
+              .then(res => {
+                if (res.data.item) {
+                  callback(new Error('该统一社会信用代码与其他公司重复'))
+                } else {
+                  callback()
+                }
+              })
+              .catch(err => {
+                console.error(err)
+              })
+          }
         }
-      };
+      }
       var checkLegalPersonId = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的法定代表人身份证号'));
+          callback(new Error('请输入正确格式的法定代表人身份证号'))
         } else {
           let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
           if (!re1.test(this.formData.LegalPersonId)) {
-            callback(new Error('请输入正确格式的法定代表人身份证号'));
+            callback(new Error('请输入正确格式的法定代表人身份证号'))
           } else {
-            callback();
+            callback()
           }
         }
-      };
+      }
       var checkContactId = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的联系人身份证号'));
+          callback(new Error('请输入正确格式的联系人身份证号'))
         } else {
           let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
           if (!re1.test(this.formData.ContactId)) {
-            callback(new Error('请输入正确格式的联系人身份证号'));
+            callback(new Error('请输入正确格式的联系人身份证号'))
           } else {
-            callback();
+            callback()
           }
         }
-      };
+      }
 
       // var checkUploadLegal = (rule, value, callback) => {
       // if(this.$refs.LegalPersonUpload.uploadFiles.length > 0){
@@ -285,70 +283,70 @@
       //         callback(new Error('请上传联系人身份证照片'));
       //   }
       // };
-      var userNameIsExist =  (rule, value, callback) => {
+      var userNameIsExist = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入登录用户名'));
+          callback(new Error('请输入登录用户名'))
         } else {
           let re1 = /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d]{6,}$/
           if (!re1.test(this.formData.UserName)) {
-            callback(new Error('请输入正确格式的用户名（大于6位的英文字母和数字组合）'));
+            callback(new Error('请输入正确格式的用户名（大于6位的英文字母和数字组合）'))
           } else {
-        let params = {
-          UserName: this.formData.UserName,
-        }
-        this.$axios.get('/register/usernameisexist', {params})
-          .then(res => {
-             if ( res.data.item) {
-                  callback(new Error('该用户名已被注册'));
+            let params = {
+              UserName: this.formData.UserName
+            }
+            this.$axios.get('/register/usernameisexist', {params})
+              .then(res => {
+                if (res.data.item) {
+                  callback(new Error('该用户名已被注册'))
                 } else {
-                  callback();
+                  callback()
                 }
-          })
-          .catch(err => {
-            console.error(err)
-          })
+              })
+              .catch(err => {
+                console.error(err)
+              })
           }
         }
-      };
+      }
       var checkUserTelephone = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的手机号'));
+          callback(new Error('请输入正确格式的手机号'))
         } else {
           let re3 = /^[1][3456789]\d{9}$/
           if (!re3.test(this.formData.UserTelephone)) {
-            callback(new Error('请填写正确格式的手机号'));
+            callback(new Error('请填写正确格式的手机号'))
           } else {
-            callback();
+            callback()
           }
         }
-      };
+      }
       var checkUserPass = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)'));
+          callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)'))
         } else {
           let re2 = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,20}$/
           if (!re2.test(this.formData.UserPass)) {
-            callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)'));
+            callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)'))
           } else {
-            callback();
+            callback()
           }
         }
-      };
+      }
       var checkUserPass2 = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入确认密码'));
+          callback(new Error('请输入确认密码'))
         } else {
           if (this.formData.UserPass != this.formData.UserPass2) {
-            callback(new Error('两次输入的密码不一致，请重新输入'));
+            callback(new Error('两次输入的密码不一致，请重新输入'))
           } else {
-            callback();
+            callback()
           }
         }
-      };
+      }
       return {
         activeIndex: '1',
         waituploads: [], // 等待上传的文件列表
-        limitNumb: 2, //文件上传限制数
+        limitNumb: 2, // 文件上传限制数
         orgOptions: [],
         auditorg: '',
         chooseAuditorVisible: false,
@@ -357,11 +355,11 @@
         legalImages: [],
         contactImages: [],
         formData: {
-          Id: '', //int
-          UserId: '', //int
-          UserName: '', //账号/Email
-          UserRealName: '', //用户真实姓名
-          UserTelephone: '', //用户手机号
+          Id: '', // int
+          UserId: '', // int
+          UserName: '', // 账号/Email
+          UserRealName: '', // 用户真实姓名
+          UserTelephone: '', // 用户手机号
           UserPass: '',
           UserPass2: '',
           SupplierName: '',
@@ -387,13 +385,13 @@
           LegalPersonURL: '',
           CategoryCode: '',
           CategoryName: '',
-          RegCapital: 0, //float32
+          RegCapital: 0, // float32
           Currency: '',
           ContactName: '',
           ContactId: '',
           ContactURL: '',
           CompanyType: '',
-          SetupTime: null, //time
+          SetupTime: null, // time
           DepositBank: '',
           BankAccount: '',
           EMail: '',
@@ -405,10 +403,10 @@
           QQ: '',
           CompanyUrl: '',
           Remark: '',
-          CheckStatus: 0, //二级单位审核状态，0：未通过，1：通过 默认0
-          CheckUserId: 0, //审核人Id
+          CheckStatus: 0, // 二级单位审核状态，0：未通过，1：通过 默认0
+          CheckUserId: 0, // 审核人Id
           CheckUserName: '',
-          IsDelete: 0, //删除状态，0正常，1已删除
+          IsDelete: 0, // 删除状态，0正常，1已删除
           LinkAddress: '',
           LinkProvince: '',
           LinkCity: '',
@@ -449,13 +447,13 @@
             { required: true, validator: checkContactId, trigger: 'change' }
           ],
           LegalPersonImg: [
-            { required:!this.legalHaspic,
+            { required: !this.legalHaspic,
               message: '请上传法定代表人身份证照片',
               trigger: 'change'
             }
           ],
           ContactImg: [
-            { required:!this.ContactImg,
+            { required: !this.ContactImg,
               message: '请上传联系人身份证照片',
               trigger: 'change'
             }
@@ -478,7 +476,7 @@
           ],
           CheckUserName: [
             { required: true, message: '请选择审核人', trigger: 'change' }
-          ],
+          ]
         }
       }
     },
@@ -491,35 +489,35 @@
       ChooseAuditor
     },
     methods: {
-      //上传成功后删除校验
-      onLegalSuccess(response, file, fileList){
-        this.legalImages["file"] = fileList;
-        this.legalHaspic = true;
+      // 上传成功后删除校验
+      onLegalSuccess (response, file, fileList) {
+        this.legalImages['file'] = fileList
+        this.legalHaspic = true
         // 如果上传了就不显示提示
-        if (typeof this.legalImages.file != "undefined") {
+        if (typeof this.legalImages.file !== 'undefined') {
           if (this.legalImages.file.length > 0) {
-             this.$refs['RegisterFormData'].clearValidate("LegalPersonImg");
+            this.$refs['RegisterFormData'].clearValidate('LegalPersonImg')
           }
         }
       },
-      removeLegalImage(file, fileList){
-      if (typeof this.legalImages.file != "undefined") {
-        if (this.legalImages.file.length > 0) {
-          this.$refs['RegisterFormData'].clearValidate("LegalPersonImg");
-        } else {
-          this.legalHaspic = false;
-          this.$refs['RegisterFormData'].validateField("LegalPersonImg");
-         }
-       }
+      removeLegalImage (file, fileList) {
+        if (typeof this.legalImages.file !== 'undefined') {
+          if (this.legalImages.file.length > 0) {
+            this.$refs['RegisterFormData'].clearValidate('LegalPersonImg')
+          } else {
+            this.legalHaspic = false
+            this.$refs['RegisterFormData'].validateField('LegalPersonImg')
+          }
+        }
       },
-     //上传成功后删除校验
-      onContactSuccess(response, file, fileList){
-        this.contactImages["file"] = fileList;
-        this.contactHaspic = true;
+      // 上传成功后删除校验
+      onContactSuccess (response, file, fileList) {
+        this.contactImages['file'] = fileList
+        this.contactHaspic = true
         // 如果上传了就不显示提示
-        if (typeof this.contactImages.file != "undefined") {
+        if (typeof this.contactImages.file !== 'undefined') {
           if (this.contactImages.file.length > 0) {
-             this.$refs['RegisterFormData'].clearValidate("ContactImg");
+            this.$refs['RegisterFormData'].clearValidate('ContactImg')
           }
         }
       },
@@ -554,94 +552,92 @@
           console.log(err)
         })
       },
-      removeContactImage(file, fileList){
-      if (typeof this.contactImages.file != "undefined") {
-        if (this.contactImages.file.length > 0) {
-          this.$refs['RegisterFormData'].clearValidate("ContactImg");
-        } else {
-          this.contactHaspic = false;
-          this.$refs['RegisterFormData'].validateField("ContactImg");
-         }
-       }
+      removeContactImage (file, fileList) {
+        if (typeof this.contactImages.file !== 'undefined') {
+          if (this.contactImages.file.length > 0) {
+            this.$refs['RegisterFormData'].clearValidate('ContactImg')
+          } else {
+            this.contactHaspic = false
+            this.$refs['RegisterFormData'].validateField('ContactImg')
+          }
+        }
       },
-      //选择审核人
-      selectOpera() {
+      // 选择审核人
+      selectOpera () {
         let _this = this
         _this.$refs['chooseAuditor'].getorgtreelist()
         _this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) { //val:用户Id， name:用户名
+      setAuditer (val, name) { // val:用户Id， name:用户名
         let _this = this
         _this.formData.CheckUserId = parseInt(val)
         _this.formData.CheckUserName = name
         _this.chooseAuditorVisible = false
       },
 
-      //注册
+      // 注册
       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)
-       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) //获取地址
-              _this.formData.LegalPersonURL = URL.join("&")
+        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) // 获取地址
+            _this.formData.LegalPersonURL = URL.join('&')
 
-              let URL2 = []
-              URL2 = _this.getFileURL(_this.$refs.ContactUpload.uploadFiles) //获取地址
-              _this.formData.ContactURL = URL2.join("&")
+            let URL2 = []
+            URL2 = _this.getFileURL(_this.$refs.ContactUpload.uploadFiles) // 获取地址
+            _this.formData.ContactURL = URL2.join('&')
 
-              _this.formData.UserRealName= _this.formData.SupplierName
+            _this.formData.UserRealName = _this.formData.SupplierName
             _this.formData.CheckUnitId = this.auditorg
             _this.formData.CheckUnitName = _this.$refs.auditorgselect.selectedLabel
-              //添加注册信息
+            // 添加注册信息
             console.log(_this.formData)
-              _this.$axios.post('/register/addentity', _this.formData)
-                .then(function (response) {
-                  if (response.data.code === 0) {
-                    _this.$notify({
-                      title: '成功',
-                      type: 'success',
-                      message: response.data.message,
-                      showClose: true,
-                      offset: 100,
-                      duration: 8000
-                    });
-                    _this.$router.push('/login') //跳转到登录页
-                  } else {
-                    _this.$alert(response.data.message, '提示', {
-                      confirmButtonText: '确定',
-                    })
-                  }
-                })
-                .catch(function (error) {
-                  console.log(error)
-                })
-            }
+            _this.$axios.post('/register/addentity', _this.formData)
+              .then(function (response) {
+                if (response.data.code === 0) {
+                  _this.$notify({
+                    title: '成功',
+                    type: 'success',
+                    message: response.data.message,
+                    showClose: true,
+                    offset: 100,
+                    duration: 8000
+                  })
+                  _this.$router.push('/login') // 跳转到登录页
+                } else {
+                  _this.$alert(response.data.message, '提示', {
+                    confirmButtonText: '确定'
+                  })
+                }
+              })
+              .catch(function (error) {
+                console.log(error)
+              })
+          }
         })
-    },
-
+      },
 
-      //上传超过限制数
-      uploadExceed(files, fileList) {
+      // 上传超过限制数
+      uploadExceed (files, fileList) {
         if (fileList.length == this.limitNumb) {
-          this.$alert("超出上传照片数，禁止上传", '提示', {
-            confirmButtonText: '确定',
+          this.$alert('超出上传照片数，禁止上传', '提示', {
+            confirmButtonText: '确定'
           })
         }
       },
 
-      //图片格式以及文件大小限制
-      beforeUpload(file) {
+      // 图片格式以及文件大小限制
+      beforeUpload (file) {
         let isLt10m = file.size / 1024 / 1024 / 10 < 1
         let isIMAGE1 = file.name.split('.')[1] === 'jpg'
         let isIMAGE2 = file.name.split('.')[1] === 'jpeg'
@@ -656,19 +652,19 @@
         return isIMAGE1 || isIMAGE2 || isIMAGE3 && isLt10m
       },
 
-      //判断是否上传成功
-      checkSuccess(uploadFiles) {
-          for (let i = 0; i < uploadFiles.length; i++) {
-            console.log(uploadFiles[i])
-            if (uploadFiles[i].status != 'success') {
-              return false
-            }
+      // 判断是否上传成功
+      checkSuccess (uploadFiles) {
+        for (let i = 0; i < uploadFiles.length; i++) {
+          console.log(uploadFiles[i])
+          if (uploadFiles[i].status != 'success') {
+            return false
           }
+        }
         return true
       },
 
-      //上传请求
-      uploadRequest(option) {
+      // 上传请求
+      uploadRequest (option) {
         let _this = this
         if (process.client) {
           const myDomain = window.location.host
@@ -704,8 +700,8 @@
         }
       },
 
-      //获取上传文件的路径
-      getFileURL(uploadFiles) {
+      // 获取上传文件的路径
+      getFileURL (uploadFiles) {
         let fileURL = []
         if (uploadFiles && uploadFiles.length > 0) {
           for (let i = 0; i < uploadFiles.length; i++) {
@@ -721,8 +717,8 @@
         return fileURL
       },
 
-      //格式化页面到数据库的时间格式
-      formatDateTime(date) {
+      // 格式化页面到数据库的时间格式
+      formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -734,8 +730,8 @@
         return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       },
 
-      //格式化时间
-      jstimehandle(val) {
+      // 格式化时间
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -755,11 +751,10 @@
 
   })
   export default class Register extends Vue {
-    layout() {
+    layout () {
       return 'empty'
     }
   }
-
 </script>
 
 <style lang="scss">