Merge branch 'zj' into dev

src/pages/authority/organizationuser.vue

@@ -257,7 +257,7 @@ export default {
                   desc:data.description,
                   person:data.create_user,
                   date:data.create_date,
-                  ip:data.ip_whitelist,
+                  ip:transform_func(data.ip_whitelist),
                   domain:data.domain_name
                 }
             })
@@ -265,6 +265,13 @@ export default {
                 
             });
     },
+    transform_func(arr){
+      var temp = ''
+      arr.forEach(e => {
+        temp = temp + e + ';'
+      });
+      return temp
+    },
     getOriginArr(){
       this.originoptions = []
       this.$http
@@ -326,7 +333,7 @@ export default {
         "is_admin":this.form.type,
         "state":this.form.able,  // 用户状态，1——启用，0 禁用
         "domain_name":this.form.domain,//
-        "ip_whitelist":this.form.ip.split(';'),//
+        "ip_whitelist":this.form.ip&&this.form.ip.length?this.form.ip.split(';'):[],//
         "description":this.form.desc, //描述
         "link_man":this.form.contact
       }