Merge branch 'zj' into dev

src/components/menu-permission.vue

@@ -14,15 +14,15 @@
             >
               <span class="el-checkbox__inner"></span>
             </span>
-            <span class="el-checkbox__label" v-text="first_item.name"></span>
+            <span class="el-checkbox__label" v-text="first_item.menu_name"></span>
           </label>
         </div>
         <ul
           class="floor_list second"
-          v-if="first_item.children && first_item.children.length"
+          v-if="first_item.Child && first_item.Child.length"
         >
           <li
-            v-for="(second_item, second_index) in first_item.children"
+            v-for="(second_item, second_index) in first_item.Child"
             :key="'p_' + first_index + '_' + second_index"
           >
             <div class="floor_item second">
@@ -39,16 +39,16 @@
                 </span>
                 <span
                   class="el-checkbox__label"
-                  v-text="second_item.name"
+                  v-text="second_item.menu_name"
                 ></span>
               </label>
             </div>
             <ul
               class="floor_list third"
-              v-if="second_item.children && second_item.children.length"
+              v-if="second_item.Child && second_item.Child.length"
             >
               <li
-                v-for="(third_item, third_index) in second_item.children"
+                v-for="(third_item, third_index) in second_item.Child"
                 :key="
                   'p_' + first_index + '_' + second_index + '_' + third_index
                 "
@@ -67,19 +67,19 @@
                     </span>
                     <span
                       class="el-checkbox__label"
-                      v-text="third_item.name"
+                      v-text="third_item.menu_name"
                     ></span>
                   </label>
                 </div>
                 <ul
                   class="floor_list fourth"
-                  v-if="third_item.children && third_item.children.length"
+                  v-if="third_item.Child && third_item.Child.length"
                 >
                   <li>
                     <div class="floor_item fourth">
                       <label
                         v-for="(fourth_item,
-                        fourth_index) in third_item.children"
+                        fourth_index) in third_item.Child"
                         :key="
                           'p_' +
                             first_index +
@@ -109,7 +109,7 @@
                         </span>
                         <span
                           class="el-checkbox__label"
-                          v-text="fourth_item.name"
+                          v-text="fourth_item.menu_name"
                         ></span>
                       </label>
                     </div>
@@ -152,7 +152,7 @@ export default {
       if (p_item) {
         let selectedAll = true;
 
-        p_item.children.forEach((item) => {
+        p_item.Child.forEach((item) => {
           selectedAll = selectedAll && item.selected;
         });
 
@@ -162,7 +162,7 @@ export default {
       if (gp_item) {
         let selectedAll = true;
 
-        gp_item.children.forEach((item) => {
+        gp_item.Child.forEach((item) => {
           selectedAll = selectedAll && item.selected;
         });
 
@@ -172,7 +172,7 @@ export default {
       if (ggp_item) {
         let selectedAll = true;
 
-        ggp_item.children.forEach((item) => {
+        ggp_item.Child.forEach((item) => {
           selectedAll = selectedAll && item.selected;
         });
 
@@ -184,8 +184,8 @@ export default {
     traverse(obj, cb) {
       cb(obj);
 
-      if (obj.children && obj.children.length) {
-        obj.children.forEach((item) => {
+      if (obj.Child && obj.Child.length) {
+        obj.Child.forEach((item) => {
           this.traverse(item, cb);
         });
       }

src/pages/authority/organizationuser.vue

@@ -221,6 +221,7 @@ export default {
             this.edit_flag = 2
             this.get_user()
         }
+        
     },
     tranform_flag(val){
       return val?true:false
@@ -313,7 +314,7 @@ export default {
                 this.$message.success('新增成功')
             })
             .catch((response)=> {
-                this.$message.success('新增失败')
+                this.$message.error('新增失败')
             });
     },
     set_user(){
@@ -339,7 +340,7 @@ export default {
                 this.$message.success('修改成功')
             })
             .catch((response)=> {
-                this.$message.success('修改失败')
+                this.$message.error('修改失败')
             });
     },
       onSubmit(formName) {