Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/views/zuihou/lineSideLibrary/goodsShelvesMgr/components/Edit.vue

@@ -71,12 +71,14 @@ export default {
     }
   },
   data () {
-    let validate = (rule, value, callback) => {
+    let validateExsit = (rule, value, callback) => {
       //后台方法
       this.checkExist(value).then(res => {
         res = res.data               
         if (res && res.data) {         
-          callback('名称已存在')
+          callback(new Error('名称已存在'))
+        }else{
+          callback()
         }
       })
     }
@@ -104,7 +106,7 @@ export default {
       rules: {
         name: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
-          { validator: validate, trigger: 'blur'}
+          { validator: validateExsit, trigger: 'blur'}
         ],
         no: [
         	{ required: true, message: this.$t("lineSide.rules.no"), trigger: 'blur' }

imcs-ui/src/views/zuihou/lineSideLibrary/locationMgr/components/Edit.vue

@@ -57,16 +57,16 @@ export default {
     }
   },
   data () {
-    let validate = (rule, value, callback) => {
+    let validateExsit = (rule, value, callback) => {
       //后台方法
       this.checkExist(value).then(res => {
         res = res.data;       
         // console.log("check验证：", res);
-        if (res && res.data) {         
-          callback('名称已存在');
-        } else {
-		      callback();
-		    }
+        if (res && res.data) { 
+          callback(new Error('名称已存在'))
+        }else{
+          callback()
+        }
       })
     }
     return {
@@ -87,7 +87,7 @@ export default {
         ],
         name: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
-          { validator: validate, trigger: 'blur'}
+          { validator: validateExsit, trigger: 'blur'}
         ],
         storgeTypeId: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'change' }

imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/components/TenantEdit.vue

@@ -51,12 +51,14 @@ export default {
     }
   },
   data () {
-    let validate = (rule, value, callback) => {
+    let validateExsit = (rule, value, callback) => {
       //后台方法
       this.checkExist(value).then(res => {
         res = res.data               
-        if (res && res.data) {         
-          callback('名称已存在')
+        if (res && res.data) { 
+          callback(new Error('名称已存在'))
+        }else{
+          callback()
         }
       })
     }
@@ -74,7 +76,7 @@ export default {
       rules: {
         name: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
-          { validator: validate, trigger: 'blur'}
+          { validator: validateExsit, trigger: 'blur'}
         ]
       }
     }