Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/views/systemManagement/EditSystem/index.vue

@@ -293,7 +293,7 @@ export default {
       handler(val) {
         if (val.length == 0) {
           const res = this.FormData.Unuselists;
-          this.FormData.Unuselist = res;
+          this.FormData.Unuselist = JSON.parse(JSON.stringify(res));
         }
       },
     },
@@ -301,8 +301,7 @@ export default {
       handler(val) {
         if (val.length == 0) {
           const res = this.FormData.UseLists;
-          this.FormData.UseList = res;
-          console.log(this.FormData.UseLists);
+          this.FormData.UseList = JSON.parse(JSON.stringify(res));
         }
       },
     },
@@ -332,7 +331,7 @@ export default {
       const search = this.keyWordsUp;
       if (search) {
         let res = this.FormData.UseLists;
-        this.FormData.UseList = res;
+        this.FormData.UseList = JSON.parse(JSON.stringify(res));
         this.FormData.UseList = findarrays(
           this.FormData.UseList,
           "UserName",
@@ -340,7 +339,7 @@ export default {
         );
       } else {
         const res = this.FormData.UseLists;
-        this.FormData.UseList = res;
+        this.FormData.UseList = JSON.parse(JSON.stringify(res));
       }
     },
     queryData() {
@@ -348,7 +347,7 @@ export default {
       const search = this.keyWords;
       if (search) {
         let res = this.FormData.Unuselists;
-        this.FormData.Unuselist = res;
+        this.FormData.Unuselist = JSON.parse(JSON.stringify(res));
         this.FormData.Unuselist = findarrays(
           this.FormData.Unuselist,
           "UserName",
@@ -468,8 +467,9 @@ export default {
                 res.indexname = index;
               });
               const res = that.FormData.UseList;
-              that.FormData.UseLists = res;
-              that.FormData.Unuselists = that.FormData.Unuselist;
+              that.FormData.UseLists = JSON.parse(JSON.stringify(res));
+              const rel = that.FormData.Unuselist;
+              that.FormData.Unuselists = JSON.parse(JSON.stringify(rel));
               that.Unuselist = that.FormData.Unuselist;
               that.boxArr = _.cloneDeep(that.FormData.Unuselist);
             }
@@ -492,7 +492,9 @@ export default {
       // });
       // const res = this.FormData.UseList;
       // this.FormData.UseLists = res;
-      this.FormData.Unuselist.splice(index, 1);
+      this.FormData.Unuselist = this.FormData.Unuselist.filter(
+        (i) => i.UserId !== val.UserId
+      );
       this.FormData.Unuselists = this.FormData.Unuselists.filter(
         (i) => i.UserId !== val.UserId
       );
@@ -505,6 +507,8 @@ export default {
         this.compare("indexname")
       );
       this.FormData.Unuselists.push(val);
+      // this.FormData.Unuselist = this.RemoveArr(this.FormData.Unuselist);
+      // this.FormData.Unuselists = this.RemoveArr(this.FormData.Unuselists);
       this.FormData.Unuselists = this.FormData.Unuselists.sort(
         this.compare("indexname")
       );

src/views/systemManagement/addSystem/index.vue

@@ -307,7 +307,7 @@ export default {
     keyWordsUp() {
       if (this.keyWordsUp.length == 0) {
         const res = this.FormData.UseLists;
-        this.FormData.UseList = res;
+        this.FormData.UseList = JSON.parse(JSON.stringify(res));
       }
     },
   },
@@ -442,7 +442,9 @@ export default {
       this.FormData.UseLists.push(val);
       // const res = this.FormData.UseList;
       // this.FormData.UseLists = res;
-      this.FormData.Unuselist.splice(index, 1);
+      this.FormData.Unuselist = this.FormData.Unuselist.filter(
+        (i) => i.UserId !== val.UserId
+      );
       // this.FormData.Unuselists.splice(index, 1);
       this.FormData.Unuselists = this.FormData.Unuselists.filter(
         (i) => i.UserId !== val.UserId
@@ -494,14 +496,16 @@ export default {
       const search = this.keyWordsUp;
       if (search) {
         let res = this.FormData.UseLists;
-        this.FormData.UseList = res;
+        this.FormData.UseList = JSON.parse(JSON.stringify(res));
         this.FormData.UseList = findarrays(
           this.FormData.UseList,
           "UserName",
           search
         );
       } else {
-        this.FormData.UseList = this.FormData.UseLists;
+        this.FormData.UseList = JSON.parse(
+          JSON.stringify(this.FormData.UseLists)
+        );
       }
     },
     getUserData(val) {