bug修复

src/utils/myValidate.js

@@ -117,7 +117,7 @@ export function pathValid (rule, value, callback) {
  //定义金额校验
 export function money(rule, value, callback) {
   let RegExp = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/;
-  if(value.toString() === '') {
+  if(value === null || value === undefined || value === '') {
     callback(new Error('金额不能为空'))
   }else if (RegExp.test(value)) {
     callback();
@@ -129,8 +129,8 @@ export function money(rule, value, callback) {
 //校验账号密码，只允许数字和字母
 export function account_password_valid(rule, value, callback){
     let reg = /^[a-zA-Z0-9]*$/
-    if(value.toString() === '') {
-      callback(new Error('不能为空'))
+    if(value === null || value === undefined || value === '') {
+      callback(new Error('请填写正确信息，不能为空'))
     }else if (reg.test(value)) {
       callback();
     } else {
@@ -141,7 +141,7 @@ export function account_password_valid(rule, value, callback){
 //只允许数字
 export function number_valid(rule, value, callback){
   let reg = /^[0-9]*$/
-  if(value.toString() === '') {
+  if(value === null || value === undefined || value === '') {
     return callback(new Error('不能为空'))
   }else if (reg.test(value)) {
     callback();

src/views/company/addcompany.vue

@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import {chinaIdentityValid,bankAccountValid,checkPhone} from '@/utils/myValidate'
+import {chinaIdentityValid,bankAccountValid,checkPhone, account_password_valid} from '@/utils/myValidate'
 import {register} from '@/api/company'
 
 export default {
@@ -127,10 +127,10 @@ export default {
           { required: true, message: '请选择性别', trigger: 'change' },
         ],
         userAdmin:[
-          { required: true, message: '请输入账号', trigger: 'blur' },
+          { required: true, validator:account_password_valid, trigger: 'blur' },
         ],
         userPassword:[
-          { required: true, message: '请输入密码', trigger: 'blur' },
+          { required: true, validator:account_password_valid, trigger: 'blur' },
         ],
         userPhone:[
           {required:true, validator:checkPhone, trigger: ['blur', 'change']},

src/views/contract/components/addContract.vue

@@ -173,7 +173,7 @@
                 <br />
                 <el-form-item>
                     <el-button type="primary" @click="addContract">{{ !isEdit ? '立即创建' : '修改' }}</el-button>
-                    <el-button @click="$router.back();">返回</el-button>
+                    <el-button @click="$store.dispatch('tagsView/delView', $route);$router.back();">返回</el-button>
                     <!-- <el-button @click="closeDrawer">取消</el-button> -->
                 </el-form-item>
             </el-form>
@@ -299,6 +299,7 @@ export default {
                                 this.$message.success("成功添加合同")
                                 this.addContractFile(res.data)
                                 setTimeout(() => {
+                                    this.$store.dispatch("tagsView/delView", this.$route);
                                     this.$router.push({ path: '/contractList' })
                                 }, 1000);
                             } else {
@@ -311,6 +312,7 @@ export default {
                             if (res.success) {
                                 this.$message.success("成功修改合同")
                                 setTimeout(() => {
+                                    this.$store.dispatch("tagsView/delView", this.$route);
                                     this.$router.push({ path: '/contractList' })
                                 }, 1000);
                             } else {

src/views/personal/personal.vue

@@ -77,7 +77,7 @@
 </template>
 
 <script>
-import {chinaIdentityValid,checkPhone} from '@/utils/myValidate'
+import {chinaIdentityValid,checkPhone, account_password_valid} from '@/utils/myValidate'
 import {getOneself,update,passwordReset} from "@/api/user"
 
 export default {
@@ -121,7 +121,7 @@ export default {
           { required: true, message: '请选择性别', trigger: 'change' },
         ],
         userAdmin:[
-          { required: true, message: '请输入账号', trigger: 'blur' },
+          { required: true, validator:account_password_valid, trigger: 'blur' },
         ],
         userPhone:[
           {required:true, validator:checkPhone, trigger: ['blur', 'change']},

src/views/staff/addStaff.vue

@@ -82,9 +82,9 @@ export default {
           { required: true, message: "请输入员工姓名", trigger: "blur" },
         ],
         userSex: [{ required: true, message: "请选择员工性别", trigger: "change" }],
-        userAdmin: [{ required: true, message: "请输入员工账号", trigger: "blur" }],
+        userAdmin: [{ required: true, validator:account_password_valid, trigger: "blur" }],
         userPassword: [
-          { required: true, message: "请输入员工密码", trigger: "blur" },
+          { required: true,validator:account_password_valid, trigger: "blur" },
         ],
         userPhone: [
           { required: true, validator: checkPhone, trigger: ['blur', 'change'] },